修改bug

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

@@ -177,7 +177,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                             set(EquipmentSpecific::getRealtimeIotIndexUpdateDate,new Date()).
                             eq(EquipmentSpecific::getId,alarm.getEquipmentSpecificId());
                             equipmentSpecificSerivce.update(wrapper);
-                    MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), null, equipmentSpecificAlarmLogService);
+                    MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), null, equipmentSpecificAlarmLogService, true);
                 }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 isBatch = ent.getIsBatch();

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mchange.v2.beans.swing.TestBean;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentDefectAlarm;
@@ -57,8 +58,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
     private static Map<String, TemperatureAlarmDto> temperatureMap = new HashMap<>();
 
+    static IEquipmentSpecificIndexService equipmentSpecificIndexService;
     @Autowired
-    IEquipmentSpecificIndexService equipmentSpecificIndexService;
+    public void setEquipmentSpecificIndexService(IEquipmentSpecificIndexService equipmentSpecificIndexService){
+        MqttReceiveServiceImpl.equipmentSpecificIndexService = equipmentSpecificIndexService;
+    }
 
     @Autowired
     ICarPropertyService carPropertyService;
@@ -88,11 +92,18 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     FireFightingSystemMapper FireFightingSystemMapper;
 
+    static IFireFightingSystemService fireFightingSystemService;
     @Autowired
-    IFireFightingSystemService fireFightingSystemService;
+    public void setFireFightingSystemService(IFireFightingSystemService fireFightingSystemService){
+        MqttReceiveServiceImpl.fireFightingSystemService = fireFightingSystemService;
+    }
+
 
+    static MqttSendGateway mqttSendGateway;
     @Autowired
-    MqttSendGateway mqttSendGateway;
+    public void setMqttSendGateway(MqttSendGateway mqttSendGateway){
+        MqttReceiveServiceImpl.mqttSendGateway = mqttSendGateway;
+    }
 
     @Autowired
     private RedisUtils redisUtils;
@@ -133,8 +144,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${mqtt.vehicle.topic}")
     private String carTopic;
 
+    private static String canvasTopic;
     @Value("${equip.point.equipmentdata.topic}")
-    private String canvasTopic;
+    public void setCanvasTopic(String canvasTopic){
+        MqttReceiveServiceImpl.canvasTopic = canvasTopic;
+    }
 
     @Value("${equip.index.topic}")
     private String indexTopic;
@@ -301,7 +315,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
                     } else {
                         alarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
-                                equipmentSpecificAlarmLogService));
+                                equipmentSpecificAlarmLogService, false));
                         mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString());
                         bool = Boolean.TRUE;
                     }
@@ -379,7 +393,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     }
 
     public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
-                                                                   String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
+                                                                   String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService, boolean flag) {
         LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
         queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
@@ -396,6 +410,10 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         if (!logs.isEmpty()) {
             equipmentSpecificAlarmLogService.updateBatchById(logs);
         }
+        if (flag) {
+            List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexService.getEquipmentSpeIndexBySpeIotCode(iotCode);
+            publishDataToCanvas(indexList);
+        }
         return logs;
     }
 
@@ -404,7 +422,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
      *
      * @param indexList
      */
-    public void publishDataToCanvas(List<EquipmentSpecificIndex> indexList) {
+    public static void publishDataToCanvas(List<EquipmentSpecificIndex> indexList) {
         if (!ObjectUtils.isEmpty(indexList)) {
             EquipmentSpecificIndex index = indexList.stream().filter(x -> x.getUpdateDate() != null)
                     .sorted(Comparator.comparing(EquipmentSpecificIndex::getUpdateDate).reversed())