1.消防盘空

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

@@ -148,13 +148,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());
                     equipmentSpecificAlarmMapper.updateById(alarm);
-                    LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
-                    queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, alarmLog.getIotCode());
-                    queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, alarmLog.getEquipmentSpecificIndexKey());
-                    queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
-                    List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
-                    logs.stream().map(x -> x.setCleanTime(new Date())).map(y -> y.setStatus(AlarmStatusEnum.HF.getCode())).collect(Collectors.toList());
-                    equipmentSpecificAlarmLogService.updateBatchById(logs);
+                    MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
                 }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 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

@@ -449,13 +449,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                             }
                             mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
                         } else {
-                            LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
-                            queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, action.getIotCode());
-                            queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, action.getEquipmentSpecificIndexKey());
-                            queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
-                            List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
-                            logs.stream().map(x -> x.setCleanTime(new Date())).map(y -> y.setStatus(AlarmStatusEnum.HF.getCode())).collect(Collectors.toList());
-                            equipmentSpecificAlarmLogService.updateBatchById(logs);
+                            upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
                         }
                         specificAlarmIds.add(action.getId());
                         equipIndexIds.add(action.getEquipmentIndexId());
@@ -750,6 +744,21 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
     }
 
+    static void upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
+        LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
+        queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
+        queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
+        List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
+        logs.forEach(x -> {
+            x.setCleanTime(new Date());
+            x.setStatus(AlarmStatusEnum.HF.getCode());
+        });
+        if(!logs.isEmpty()){
+            equipmentSpecificAlarmLogService.updateBatchById(logs);
+        }
+    }
+
     void syncSystemctlMsg(EquipmentSpecificAlarmLog equipmentSpecificAlarmLog) {
         try {
             MessageModel model = new MessageModel();