1.刷新bug

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

@@ -596,41 +596,39 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
                                                                    String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService,
                                                                    boolean flag) {
-        LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
+        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);
-        EquipmentSpecificAlarmLog log = logs.get(0);
-        EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
-        Date date = new Date();
-        logs.forEach(x -> {
-            x.setCleanTime(new Date());
-            x.setStatus(AlarmStatusEnum.HF.getCode());
-            if (!flag) {
-                x.setConfirmType(x.getType());
-                x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
-                String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
-                if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
-                    x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
-                } else {
-                    x.setAlarmReason(equipmentName + "引起设备报警");
+        if(!logs.isEmpty()){
+            EquipmentSpecificAlarmLog log = logs.get(0);
+            EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
+            Date date = new Date();
+            logs.forEach(x -> {
+                x.setCleanTime(new Date());
+                x.setStatus(AlarmStatusEnum.HF.getCode());
+                if (!flag) {
+                    x.setConfirmType(x.getType());
+                    x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
+                    String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
+                    if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
+                        x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
+                    } else {
+                        x.setAlarmReason(equipmentName + "引起设备报警");
+                    }
+                    x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
+                    x.setConfirmUser("");
+                    x.setConfirmUserName("系统自动处理");
+                    x.setConfirmDate(date);
                 }
-                x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
-                x.setConfirmUser("");
-                x.setConfirmUserName("系统自动处理");
-                x.setConfirmDate(date);
-            }
-            x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
-            if (!StringUtils.isEmpty(traceId)) {
-                x.setTraceId(traceId);
-            }
-        });
-
-        if (!logs.isEmpty()) {
+                x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
+                if (!StringUtils.isEmpty(traceId)) {
+                    x.setTraceId(traceId);
+                }
+            });
             equipmentSpecificAlarmLogService.updateBatchById(logs);
         }
-
         if (flag) {
             List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexService.getEquipmentSpeIndexBySpeIotCode(iotCode);
             publishDataToCanvas(indexList);