add 设备名称

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GasCommonController.java

@@ -424,10 +424,21 @@ public class GasCommonController {
                 ElasticConstants.SO2_ALERT,
                 ElasticConstants.HEIYAN_SHIP_RECOGNITION);
         List<MonitorInfo> pageList = Convert.toList(MonitorInfo.class, monitorMap.get("pageList"));
+
+        Map<String, String> so2Device = so2Service.queryDeviceMap();
+        Map<String, String> aisDevice = aisDatabase.queryDeviceMap();
+        Map<String, String> heiyanDevice = heiYanService.queryDeviceMap();
         // 处理数据
         for (MonitorInfo monitorInfo : pageList) {
-            if (StrUtil.isBlank(monitorInfo.getMonitorPointName()) && StrUtil.isNotBlank(monitorInfo.getSnapPos())) {
+            /*if (StrUtil.isBlank(monitorInfo.getMonitorPointName()) && StrUtil.isNotBlank(monitorInfo.getSnapPos())) {
                 monitorInfo.setMonitorPointName(monitorInfo.getSnapPos());
+            }*/
+            if ("heiyan".equals(monitorInfo.getIllegalType())) {
+                monitorInfo.setMonitorPointName(heiyanDevice.get(monitorInfo.getDeviceId()));
+            } else if ("xiutan".equals(monitorInfo.getIllegalType())) {
+                monitorInfo.setMonitorPointName(aisDevice.get(monitorInfo.getDeviceId()));
+            } else if ("guangpu".equals(monitorInfo.getIllegalType())) {
+                monitorInfo.setMonitorPointName(so2Device.get(monitorInfo.getDeviceId()));
             }
             if (ObjectUtil.isNotEmpty(monitorInfo.getCo2Concentration())) {
                 minor.add(monitorInfo);

ruoyi-system/src/main/java/com/ruoyi/system/domain/MonitorInfo.java

@@ -34,4 +34,7 @@ public class MonitorInfo {
     private Integer rcgSoot;
 
     private Integer illegalStatus;
+
+    private String deviceId;
+
 }