Commit aa35d171 authored by limei's avatar limei

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

parents d47b3bf7 c61b6183
...@@ -418,6 +418,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -418,6 +418,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode()); queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper() List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper()
.selectList(queryWrapper); .selectList(queryWrapper);
if (0 < logs.size()) {
EquipmentSpecificAlarmLog log = logs.get(0); EquipmentSpecificAlarmLog log = logs.get(0);
String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(log.getEquipmentSpecificId()); String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(log.getEquipmentSpecificId());
EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId()); EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
...@@ -467,7 +468,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -467,7 +468,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
}).start(); }).start();
} }
} }
if (!logs.isEmpty()) {
equipmentSpecificAlarmLogService.updateBatchById(logs); equipmentSpecificAlarmLogService.updateBatchById(logs);
} }
if (flag) { if (flag) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment