任务 8234

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

@@ -284,12 +284,28 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         });
 
         // 报警数据保存
-        List<EquipmentSpecificAlarmLog> alarmLogs = saveOrUpdateEquipAlarm(equipmentSpecificAlarms);
+        List<EquipmentSpecificAlarmLog> alarmLogs = new ArrayList<>();
+        equipmentSpecificAlarmService.saveOrUpdateBatch(equipmentSpecificAlarms);
 
         // 需要在事务提交之后，否侧事务隔离查询不出数据
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
             @Override
             public void afterCommit() {
+                equipmentSpecificAlarms.forEach(action -> {
+                    if (AlarmStatusEnum.BJ.getCode() == action.getStatus()) {
+                        alarmLogs.add(addEquipAlarmLogRecord(action));
+                        if (ValidationUtil.isEmpty(action.getAlamContent())) {
+                            action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
+                        }
+                        mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
+                    } else {
+                        alarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
+                                equipmentSpecificAlarmLogService));
+                        mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString());
+                        bool = Boolean.TRUE;
+                    }
+                });
+
                 // 向预控系统发送消息
                 sendEquipSpecIndexToAutosysTopic(equipmentSpecificIndexList);
 
@@ -707,29 +723,10 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         return flag;
     }
 
-    public List<EquipmentSpecificAlarmLog> saveOrUpdateEquipAlarm(
-            List<EquipmentSpecificAlarm> equipmentSpecificAlarms) {
-        List<EquipmentSpecificAlarmLog> equipmentAlarmLogs = new ArrayList<>();
-        if (ObjectUtils.isEmpty(equipmentSpecificAlarms)) {
-            return equipmentAlarmLogs;
-        }
-        equipmentSpecificAlarmService.saveOrUpdateBatch(equipmentSpecificAlarms);
-        equipmentSpecificAlarms.forEach(action -> {
-            if (AlarmStatusEnum.BJ.getCode() == action.getStatus()) {
-                equipmentAlarmLogs.add(addEquipAlarmLogRecord(action));
-                if (ValidationUtil.isEmpty(action.getAlamContent())) {
-                    action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
-                }
-                mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
-            } else {
-                equipmentAlarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
-                        equipmentSpecificAlarmLogService));
-                mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString());
-                bool = Boolean.TRUE;
-            }
-        });
-        return equipmentAlarmLogs;
-    }
+//    public void saveOrUpdateEquipAlarm(
+//            List<EquipmentSpecificAlarm> equipmentSpecificAlarms) {
+//        equipmentSpecificAlarmService.saveOrUpdateBatch(equipmentSpecificAlarms);
+//    }
 
     /**
      * 报警日志同步其他系统