修改实时消息画图数据推送异常

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

@@ -300,39 +300,36 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
     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())
-                    .collect(Collectors.toList()).get(0);
-            EquipmentStateVo equipmentStateVo = new EquipmentStateVo();
-            equipmentStateVo.setEquipName(index.getEquipmentSpecificName());
-            equipmentStateVo.setOrgCode(index.getOrgCode());
-            equipmentStateVo.setSpecificId(index.getEquipmentSpecificId());
-            equipmentStateVo.setEquipCode(index.getQrCode());
-            equipmentStateVo.setEquipIotCode(index.getIotCode());
-            equipmentStateVo.setStatus("");
-            equipmentStateVo.setColor(index.getEmergencyLevelColor());
-            // 添加性能指标项
-            equipmentStateVo.setSpeindexList(fireFightingSystemService.getSpeIndex(index.getEquipmentSpecificId()));
-            Map<String, Object> topicObject = new HashMap<>();
-            topicObject.put("equipCode", equipmentStateVo.getEquipCode());
-            if (TrueOrFalseEnum.real.value.toUpperCase().equals(index.getValue().toUpperCase())) {
-                topicObject.put("color", equipmentStateVo.getColor());
-            } else {
-                topicObject.put("color", "");
-            }
-            Map<String, Object> map = JSON.parseObject(JSON.toJSONString(equipmentStateVo));
-            map.put(canvasTopic, topicObject);
-
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                 @Override
-                public void afterCompletion(int status) {
-                    if (TransactionSynchronization.STATUS_COMMITTED == status) {
-                        // 发送数据至画布
-                        mqttSendGateway.sendToMqtt(canvasTopic, JSON.toJSONString(map));
+                public void afterCommit() {
+                	EquipmentSpecificIndex index = indexList.stream().filter(x -> x.getUpdateDate() != null)
+                            .sorted(Comparator.comparing(EquipmentSpecificIndex::getUpdateDate).reversed())
+                            .collect(Collectors.toList()).get(0);
+                    EquipmentStateVo equipmentStateVo = new EquipmentStateVo();
+                    equipmentStateVo.setEquipName(index.getEquipmentSpecificName());
+                    equipmentStateVo.setOrgCode(index.getOrgCode());
+                    equipmentStateVo.setSpecificId(index.getEquipmentSpecificId());
+                    equipmentStateVo.setEquipCode(index.getQrCode());
+                    equipmentStateVo.setEquipIotCode(index.getIotCode());
+                    equipmentStateVo.setStatus("");
+                    equipmentStateVo.setColor(index.getEmergencyLevelColor());
+                    // 添加性能指标项
+                    equipmentStateVo.setSpeindexList(fireFightingSystemService.getSpeIndex(index.getEquipmentSpecificId()));
+                    Map<String, Object> topicObject = new HashMap<>();
+                    topicObject.put("equipCode", equipmentStateVo.getEquipCode());
+                    if (TrueOrFalseEnum.real.value.toUpperCase().equals(index.getValue().toUpperCase())) {
+                        topicObject.put("color", equipmentStateVo.getColor());
+                    } else {
+                        topicObject.put("color", "");
                     }
+                    Map<String, Object> map = JSON.parseObject(JSON.toJSONString(equipmentStateVo));
+                    map.put(canvasTopic, topicObject);
+
+                	// 发送数据至画布
+                    mqttSendGateway.sendToMqtt(canvasTopic, JSON.toJSONString(map));
                 }
             });
-
         }
     }