diff --git a/README.md b/README.md index 4c78c9a..8982d40 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +测控点类型，2-电，3-蒸汽，4-水，5-压缩空气，16-物联网环境，20-振动，30-温度阵列，40-噪声 + 一、海威演示测温、阵列、能源管理系统 二、 新疆昆仑工程轮胎有限责任公司 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java index 482c878..5ac5d3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java @@ -49,6 +49,16 @@ public class TemAndHumReportController extends BaseController { return prefix + "/TemAndHumLQXHS"; } + /** + * 振动数据曲线 + * @return + */ + @GetMapping("/VibrationDataCurve") + public String VibrationDataCurveHtml() + { + return prefix + "/VibrationDataCurve"; + } + /** * 获取第一个点位 * @return diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java index 4e995f2..99c18be 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java @@ -138,4 +138,18 @@ public class TVibrationsensorDataController extends BaseController { return AjaxResult.success(tVibrationsensorData1); } + + + /** + * 振动数据曲线 + * @param tVibrationsensorData + * @return + */ + @PostMapping("/sensorList") + @ResponseBody + public AjaxResult sensorList(TVibrationsensorData tVibrationsensorData) { + List list = tVibrationsensorDataService.selectTVibrationsensorDataList(tVibrationsensorData); + return AjaxResult.success(list); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java index a886b0b..d464662 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_MonitorController.java @@ -49,7 +49,7 @@ public class T_MonitorController extends BaseController { // private ITempertureMonitorService itempertureMonitorService; /** - * 2点、3水、16温度、20震动、30阵列 + * 测控点类型，2-电，3-蒸汽，4-水，5-压缩空气，16-物联网环境，20-振动，30-温度阵列，40-噪声 * @param id * @return */ @@ -85,6 +85,9 @@ public class T_MonitorController extends BaseController { case 30: url = "/arrayMonitor"; break; + case 40: + url = "/noiseMonitor"; + break; } return prefix + url; @@ -156,9 +159,13 @@ public class T_MonitorController extends BaseController { break; case 20: url = "/vibrationSensorAdd"; + break; case 30: url = "/arrayAdd"; break; + case 40: + url = "/noiseAdd"; + break; default: break; } @@ -191,6 +198,17 @@ public class T_MonitorController extends BaseController { return prefix + url; } + @GetMapping(value = {"/noiseAdd/{objid}", "/noiseAdd/"}) + public String noiseAdd(@PathVariable(value = "objid", required = false) Integer objid, ModelMap mmap) { + String url = ""; + if (StringUtils.isNotNull(objid)) { + T_Monitor t_monitor = t_MonitorService.selectT_MonitorById(objid); + mmap.put("t_Monitor", t_monitor); + } + url = "/noiseAdd"; + return prefix + url; + } + /** * 新增保存测控点信息 */ @@ -207,7 +225,7 @@ public class T_MonitorController extends BaseController { } else { t_Monitor.setGrade(3); } - int info = itSetmonitorthresholdvalueService.insertTSetmonitorthresholdvalue(new TSetmonitorthresholdvalue(t_Monitor.getMonitorId(), t_Monitor.getMonitorType())); + itSetmonitorthresholdvalueService.insertTSetmonitorthresholdvalue(new TSetmonitorthresholdvalue(t_Monitor.getMonitorId(), t_Monitor.getMonitorType())); return toAjax(t_MonitorService.insertT_Monitor(t_Monitor)); } @@ -247,6 +265,9 @@ public class T_MonitorController extends BaseController { case 30: url = "/arrayEdit"; break; + case 40: + url = "/noiseEdit"; + break; default: break; } @@ -319,6 +340,9 @@ public class T_MonitorController extends BaseController { case "30": url = "/arrayTree"; break; + case "40": + url = "/noiseTree"; + break; default: T_Monitor t_monitor = new T_Monitor(); t_monitor.setMonitorId(objid); @@ -348,6 +372,10 @@ public class T_MonitorController extends BaseController { break; case 30: url = "/arrayTree"; + break; + case 40: + url = "/noiseTree"; + break; default: break; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_W_TemperturedataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_W_TemperturedataController.java index 6239b7e..56d4f69 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_W_TemperturedataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/T_W_TemperturedataController.java @@ -60,6 +60,9 @@ public class T_W_TemperturedataController extends BaseController case 3: url = "/TempertureReport"; break; + case 40: + url = "/noiseData"; + break; default: break; } diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html new file mode 100644 index 0000000..2785930 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html @@ -0,0 +1,432 @@ + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
    +
  • + + - + +
    • +
  • + + + +
    • + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseAdd.html b/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseAdd.html new file mode 100644 index 0000000..c25b24b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseAdd.html @@ -0,0 +1,192 @@ + + + + + + +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+ + + +
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + +
+ + + + + + + + +
+ +
+ +
+
+ +
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseMonitor.html b/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseMonitor.html new file mode 100644 index 0000000..bbe2049 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseMonitor.html @@ -0,0 +1,186 @@ + + + + + + +
+
+
+
+
+
    + + + + + + + + +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseTree.html b/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseTree.html new file mode 100644 index 0000000..c8eccd1 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/Monitor/noiseTree.html @@ -0,0 +1,49 @@ + + + + + + + + + + +
+ + +
+ +
+ 展开 / + 折叠 +
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/TempertureData/noiseData.html b/ruoyi-admin/src/main/resources/templates/system/TempertureData/noiseData.html new file mode 100644 index 0000000..e8fa106 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/TempertureData/noiseData.html @@ -0,0 +1,224 @@ + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ + +
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSetmonitorthresholdvalueServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSetmonitorthresholdvalueServiceImpl.java index 6a0b51c..8b8ee2c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSetmonitorthresholdvalueServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSetmonitorthresholdvalueServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.dto.TSetmonitorthresholdvalueDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -60,6 +61,14 @@ public class TSetmonitorthresholdvalueServiceImpl implements ITSetmonitorthresho @Override public int insertTSetmonitorthresholdvalue(TSetmonitorthresholdvalue tSetmonitorthresholdvalue) { + if (StringUtils.isNotEmpty(tSetmonitorthresholdvalue.getMonitorId())){ + TSetmonitorthresholdvalue setmonitorthresholdvalue = new TSetmonitorthresholdvalue(); + setmonitorthresholdvalue.setMonitorId(tSetmonitorthresholdvalue.getMonitorId()); + List setmonitorthresholdvalueList = tSetmonitorthresholdvalueMapper.selectTSetmonitorthresholdvalueList(setmonitorthresholdvalue); + for (TSetmonitorthresholdvalue setmonitorthresholdvalue1 : setmonitorthresholdvalueList) { + tSetmonitorthresholdvalueMapper.deleteTSetmonitorthresholdvalueById(setmonitorthresholdvalue1.getObjId()); + } + } tSetmonitorthresholdvalue.setCreateTime(DateUtils.getNowDate()); return tSetmonitorthresholdvalueMapper.insertTSetmonitorthresholdvalue(tSetmonitorthresholdvalue); }