Commit 4a5e22d1 authored by KeYong's avatar KeYong

更新告警bug

parent c59bd4e2
...@@ -422,7 +422,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -422,7 +422,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper); List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
if (0 < alarms.size()) { if (0 < alarms.size()) {
alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " " alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+ equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList()); + null == equipmentSpecific.getStockDetail().getDescription() ? "" : equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
equipmentSpecificAlarmService.updateBatchById(alarms); equipmentSpecificAlarmService.updateBatchById(alarms);
} }
} }
......
...@@ -968,7 +968,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -968,7 +968,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
} }
return ""; return "";
} }
......
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