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 f553224..bddfbd8 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 @@ -45,9 +45,14 @@ public class T_MonitorController extends BaseController { @Autowired private ITSetmonitorthresholdvalueService itSetmonitorthresholdvalueService; - @Autowired - private ITempertureMonitorService itempertureMonitorService; +// @Autowired +// private ITempertureMonitorService itempertureMonitorService; + /** + * 2点、3水、16温度、20震动、30阵列 + * @param id + * @return + */ @RequiresPermissions("system:Monitor:view") @GetMapping() public String Monitor(@RequestParam("id") int id) { @@ -75,6 +80,8 @@ public class T_MonitorController extends BaseController { url = "/monitor_tw"; case 20: url = "/vibrationSensorMonitor"; + case 30: + url = "/arrayMonitor"; break; } @@ -147,6 +154,8 @@ public class T_MonitorController extends BaseController { break; case 20: url = "/vibrationSensorAdd"; + case 30: + url = "/arrayAdd"; break; default: break; @@ -169,6 +178,17 @@ public class T_MonitorController extends BaseController { return prefix + url; } + @GetMapping(value = {"/arrayAdd/{objid}", "/arrayAdd/"}) + public String arrayAdd(@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 = "/arrayAdd"; + return prefix + url; + } + /** * 新增保存测控点信息 */ @@ -222,6 +242,9 @@ public class T_MonitorController extends BaseController { case 20: url = "/vibrationSensorEdit"; break; + case 30: + url = "/arrayEdit"; + break; default: break; } @@ -291,6 +314,9 @@ public class T_MonitorController extends BaseController { case "20": url = "/vibrationSensorTree"; break; + case "30": + url = "/arrayTree"; + break; default: T_Monitor t_monitor = new T_Monitor(); t_monitor.setMonitorId(objid); @@ -318,6 +344,8 @@ public class T_MonitorController extends BaseController { case 20: url = "/vibrationSensorTree"; break; + case 30: + url = "/arrayTree"; default: break; } diff --git a/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html b/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html index 094b2d9..f75ceec 100644 --- a/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html +++ b/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html @@ -2,8 +2,35 @@ + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+
@@ -15,7 +42,11 @@
+
+ + + diff --git a/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayAdd.html b/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayAdd.html new file mode 100644 index 0000000..e3f1a60 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayAdd.html @@ -0,0 +1,192 @@ + + + + + + +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+ + + +
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + +
+ + + + + + + + +
+ +
+ +
+
+ +
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayMonitor.html b/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayMonitor.html new file mode 100644 index 0000000..bcf3482 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayMonitor.html @@ -0,0 +1,186 @@ + + + + + + +
+
+
+
+
+
    + + + + + + + + +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayTree.html b/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayTree.html new file mode 100644 index 0000000..31135a0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/Monitor/arrayTree.html @@ -0,0 +1,49 @@ + + + + + + + + + + +
+ + +
+ +
+ 展开 / + 折叠 +
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java index 4781809..f0a4c0d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java @@ -63,6 +63,12 @@ public class TArraytemperaturedata extends BaseEntity { @Excel(name = "位置1") private BigDecimal Site1; + /** + * 测控点编号 + */ + @Excel(name = "测控点编号") + private String monitorId; + /** * 位置2 */ diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml index 64df15b..57ea1c4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml @@ -12,6 +12,7 @@ + @@ -790,6 +791,7 @@ avgTemperature, collectTime, recodeTime, + monitorId, Site1, Site2, Site3, @@ -1567,6 +1569,7 @@ and probeAddress = #{probeAddress} and maxTemperature = #{maxTemperature} + and monitorId = #{monitorId} and minTemperature = #{minTemperature} and avgTemperature = #{avgTemperature} and collectTime = #{collectTime} @@ -1583,6 +1586,7 @@ resultMap="TArraytemperaturedataResult"> SELECT TOP 1 * FROM T_ArrayTemperatureData + and monitorId = #{monitorId} ORDER BY collectTime DESC