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 7a33567..ab04518 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 @@ -69,6 +69,16 @@ public class TemAndHumReportController extends BaseController { return prefix + "/TemperatureArraySensorCurves"; } + /** + * 温度阵列树状图 + * @return + */ + @GetMapping("/TemperatureArrayTreemap") + public String TemperatureArrayTreemap() + { + return prefix + "/TemperatureArrayTreemap"; + } + /** * 获取第一个点位 * @return diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java index 39b45ad..b84a90a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java @@ -142,4 +142,16 @@ public class TArraytemperaturedataController extends BaseController { return AjaxResult.success(list); } + /** + * 获取温度阵列树状图 + * @param tArraytemperaturedata + * @return + */ + @PostMapping("/getTemperatureArrayTreemap") + @ResponseBody + public AjaxResult getTemperatureArrayTreemap(TArraytemperaturedata tArraytemperaturedata) { + List> list = tArraytemperaturedataService.getTemperatureArrayTreemap(tArraytemperaturedata); + return AjaxResult.success(list); + } + } diff --git a/ruoyi-admin/src/main/resources/templates/report/TemperatureArrayTreemap.html b/ruoyi-admin/src/main/resources/templates/report/TemperatureArrayTreemap.html new file mode 100644 index 0000000..131f4e9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/report/TemperatureArrayTreemap.html @@ -0,0 +1,246 @@ + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
    +
  • + + - + +
    • +
  • +
    • + +
+
+
+
+
+
+
+ + + +
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java index bf957f6..f3f9146 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java @@ -82,4 +82,11 @@ public interface TArraytemperaturedataMapper * @return */ List selectArrayTemperatureSensorAlarmList(TArraytemperaturedata selectData); + + /** + * 获取温度阵列树状图 + * @param tArraytemperaturedata + * @return + */ + List> getTemperatureArrayTreemap(TArraytemperaturedata tArraytemperaturedata); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java index d15d1b1..6292515 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java @@ -73,4 +73,11 @@ public interface ITArraytemperaturedataService { * @return */ List> getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata); + + /** + * 获取温度阵列树状图 + * @param tArraytemperaturedata + * @return + */ + List> getTemperatureArrayTreemap(TArraytemperaturedata tArraytemperaturedata); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java index cc2e813..040c9e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java @@ -132,4 +132,35 @@ public class TArraytemperaturedataServiceImpl implements ITArraytemperaturedataS public List> getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata) { return tArraytemperaturedataMapper.getHighestPointTemperature(tArraytemperaturedata); } + + /** + * 获取温度阵列树状图 + * @param tArraytemperaturedata + * @return + */ + @Override + public List> getTemperatureArrayTreemap(TArraytemperaturedata tArraytemperaturedata) { + String monitorId = tArraytemperaturedata.getMonitorId(); + if (StringUtils.isEmpty(monitorId)){ + return null; + } + T_Monitor monitor = new T_Monitor(); + monitor.setpMonitorid(monitorId); + List tMonitors = t_MonitorMapper.selectT_MonitorList(monitor); + if (tMonitors.size() == 0){ + return null; + } + List monitorList = tMonitors.stream().map(T_Monitor::getMonitorId).collect(Collectors.toList()); + for (String pmonitor : monitorList) { + T_Monitor t_monitor = new T_Monitor(); + t_monitor.setpMonitorid(pmonitor); + List monitors = t_MonitorMapper.selectT_MonitorList(t_monitor); + for (T_Monitor tMonitor : monitors) { + monitorList.add(tMonitor.getMonitorId()); + } + } + tArraytemperaturedata.setMonitorList(monitorList); + return tArraytemperaturedataMapper.getTemperatureArrayTreemap(tArraytemperaturedata); + } + } diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml index 1d92d29..0da0270 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml @@ -4775,6 +4775,9 @@ +