更新消除策略

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

@@ -148,21 +148,13 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());
                     equipmentSpecificAlarmMapper.updateById(alarm);
-                    if (isBatch == 1) {
-                        List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
-                        logs = logs.stream().map(x -> {
-                            BeanUtils.copyProperties(ent, x);
-                            x.setCleanTime(new Date());
-                            x.setStatus(AlarmStatusEnum.HF.getCode());
-                            return x;
-                        }).collect(Collectors.toList());
+                    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);
-                    } else {
-                        ent.setCleanTime(new Date());
-                        ent.setStatus(AlarmStatusEnum.HF.getCode());
-                        equipmentSpecificAlarmLogService.updateById(ent);
-                    }
-                    return;
                 }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 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

@@ -445,6 +445,14 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                                 action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
                             }
                             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);
                         }
                         specificAlarmIds.add(action.getId());
                         equipIndexIds.add(action.getEquipmentIndexId());

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1444,7 +1444,7 @@
         select
          we.clean_type
         from
-         wl_Equipment we
+         wl_equipment we
          LEFT JOIN `wl_equipment_detail` wed ON wed.equipment_id = we.id
          LEFT JOIN `wl_equipment_specific` wes ON wes.equipment_detail_id = wed.id
         where

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -1279,6 +1279,7 @@ FROM
 				`wl_equipment_specific_index` si
 				where
 				si.equipment_index_key  = 'SCS_Blower_Shield'
+				and si.`value` = 'true'
 			) AS `sffjpb`,
 			(
 				select