修改发送数据到画布数据

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -291,7 +292,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 List<EquipmentAlarmReportDay> equipmentAlarmReports = new ArrayList<>();
                 List<EquipmentSpecificAlarmLog> equipmentAlarmLogs = new ArrayList<>();
                 List<IndexStateVo> indexStateList = new ArrayList<>();
-                EquipmentStateVo equipmentStateVo = new EquipmentStateVo();
+//                EquipmentStateVo equipmentStateVo = new EquipmentStateVo();
                 List<EquipmentSpecificIndex> newIndexList = new ArrayList<>();
                 for (EquipmentSpecificIndex equipmentSpecificIndex : indexList) {
                     EquipmentSpecificIndex equipmentSpeIndex = new EquipmentSpecificIndex();
@@ -359,11 +360,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         });
 
 
-                        equipmentStateVo.setEquipName(equipmentSpecificIndex.getEquipmentSpecificName());
-                        equipmentStateVo.setOrgCode(equipmentSpecificIndex.getOrgCode());
-                        equipmentStateVo.setSpecificId(equipmentSpecificIndex.getEquipmentSpecificId());
-                        equipmentStateVo.setEquipCode(equipmentSpecificIndex.getQrCode());
-                        equipmentStateVo.setEquipIotCode(iotCode);
+//                        equipmentStateVo.setEquipName(equipmentSpecificIndex.getEquipmentSpecificName());
+//                        equipmentStateVo.setOrgCode(equipmentSpecificIndex.getOrgCode());
+//                        equipmentStateVo.setSpecificId(equipmentSpecificIndex.getEquipmentSpecificId());
+//                        equipmentStateVo.setEquipCode(equipmentSpecificIndex.getQrCode());
+//                        equipmentStateVo.setEquipIotCode(iotCode);
                         List<EquipmentSpecificIndex> tempIndexList = new ArrayList<>();
                         tempIndexList = newIndexList.stream().filter(x -> x.getEquipmentIndexId().equals(equipmentSpeIndex.getEquipmentIndexId())).collect(Collectors.toList());
                         tempIndexList.get(0).setValue(value);
@@ -388,7 +389,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         }
                     }
                     // 发送数据到画布
-                    publishDataToCanvas(newIndexList, iotCode);
+                    publishDataToCanvas(newIndexList);
                 }
 
                 // 设备报警日报表数据储存更新
@@ -749,7 +750,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
     }
 
-    public void publishDataToCanvas(List<EquipmentSpecificIndex> indexList, String iotCode) {
+    public void publishDataToCanvas(List<EquipmentSpecificIndex> indexList) {
         if (!ObjectUtils.isEmpty(indexList)) {
             EquipmentSpecificIndex index = indexList.stream().filter(x -> x.getUpdateDate() != null)
                     .sorted(Comparator.comparing(EquipmentSpecificIndex::getUpdateDate).reversed())
@@ -759,7 +760,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             equipmentStateVo.setOrgCode(index.getOrgCode());
             equipmentStateVo.setSpecificId(index.getEquipmentSpecificId());
             equipmentStateVo.setEquipCode(index.getQrCode());
-            equipmentStateVo.setEquipIotCode(iotCode);
+            equipmentStateVo.setEquipIotCode(index.getIotCode());
             equipmentStateVo.setStatus("");
             equipmentStateVo.setColor(index.getEmergencyLevelColor());
             // 添加性能指标项
@@ -1148,7 +1149,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     // 向预控系统发送消息
                     sendEquipSpecIndexToAutosysTopic(equipmentSpeIndex);
                     
-                    //向画布推送
+                   
                     
                     // 添加指标报告
                     saveEquipmentAlarmReportDay(equipmentSpeIndex);
@@ -1164,6 +1165,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
   			  }
   		 }
 	  });
+	  //向画布推送
 	  
 	  // 首页性能指标数据订阅
       mqttSendGateway.sendToMqtt(indexTopic, JSON.toJSONString(indexStateList));