Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -418,56 +418,56 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
         List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper()
                 .selectList(queryWrapper);
-        EquipmentSpecificAlarmLog log = logs.get(0);
-        String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(log.getEquipmentSpecificId());
-        EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
-        Date date = new Date();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String dateString = formatter.format(date);
-        logs.forEach(x -> {
-            x.setCleanTime(new Date());
-            x.setStatus(AlarmStatusEnum.HF.getCode());
-            x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
-            if (!StringUtils.isEmpty(traceId)) {
-                x.setTraceId(traceId);
-            }
-            // 自动确警处理
-            if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.ZDXC.getCode().equals(cleanType)){
-                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 (0 < logs.size()) {
+            EquipmentSpecificAlarmLog log = logs.get(0);
+            String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(log.getEquipmentSpecificId());
+            EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
+            Date date = new Date();
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String dateString = formatter.format(date);
+            logs.forEach(x -> {
+                x.setCleanTime(new Date());
+                x.setStatus(AlarmStatusEnum.HF.getCode());
+                x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
+                if (!StringUtils.isEmpty(traceId)) {
+                    x.setTraceId(traceId);
                 }
-                x.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
-                x.setConfirmUser("");
-                x.setConfirmUserName("系统自动处理");
-                x.setConfirmDate(date);
-            }
-        });
-        if (jcsSwitch && AlarmTypeEnum.HZGJ.getCode().equals(log.getType())) {
-            Token token = remoteSecurityService.getServerToken();
-            String toke = token.getToke();
-            String appKey = token.getAppKey();
-            String product = token.getProduct();
-            String userId = remoteSecurityService.getAgencyUser().getUserId();
-            // 确警消息发送
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(userId)) {
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            ConfirmAlarmServiceImpl.sendIotSystemAlarm(log, userId, appKey, product, toke);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                // 自动确警处理
+                if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.ZDXC.getCode().equals(cleanType)){
+                    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 + "引起设备报警");
                     }
-                }).start();
+                    x.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
+                    x.setConfirmUser("");
+                    x.setConfirmUserName("系统自动处理");
+                    x.setConfirmDate(date);
+                }
+            });
+            if (jcsSwitch && AlarmTypeEnum.HZGJ.getCode().equals(log.getType())) {
+                Token token = remoteSecurityService.getServerToken();
+                String toke = token.getToke();
+                String appKey = token.getAppKey();
+                String product = token.getProduct();
+                String userId = remoteSecurityService.getAgencyUser().getUserId();
+                // 确警消息发送
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(userId)) {
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                ConfirmAlarmServiceImpl.sendIotSystemAlarm(log, userId, appKey, product, toke);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }).start();
+                }
             }
-        }
-        if (!logs.isEmpty()) {
             equipmentSpecificAlarmLogService.updateBatchById(logs);
         }
         if (flag) {