修改测试发现的bug

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

@@ -690,7 +690,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
         queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
         queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
-        queryWrapper.isNull(EquipmentSpecificAlarmLog::getConfirmType);
         List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
         if(!logs.isEmpty()){
             EquipmentSpecificAlarmLog log = logs.get(0);
@@ -702,18 +701,21 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 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 (StringUtils.isEmpty(x.getConfirmType())) {
+                        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(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
+                        x.setConfirmUser("");
+                        x.setConfirmUserName("系统自动处理");
+                        x.setConfirmDate(date);
                     }
-                    x.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
-                    x.setConfirmUser("");
-                    x.setConfirmUserName("系统自动处理");
-                    x.setConfirmDate(date);
                 }
                 x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
                 if (!StringUtils.isEmpty(traceId)) {