diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java index 6c70dbafb..061db35da 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java @@ -265,4 +265,10 @@ public class Monitor extends BaseEntity { * 牵引站id */ private String tractionId; + + /** + * 装置的ip + */ + @TableField(exist = false) + private String devIp; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index a2006ce73..e2264de9e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -232,8 +232,11 @@ public class MonitorServiceImpl extends ServiceImpl impl temList = temList.stream().peek(item -> { if (mapTerminal.containsKey(item.getTerminalId())) { item.setTerminalCode(mapTerminal.get(item.getTerminalId()).getTerminalCode()); + item.setDevIp(mapTerminal.get(item.getTerminalId()).getIp()); } + + if (mapBus.containsKey(item.getLineId())) { item.setBusId(mapBus.get(item.getLineId()).getMidBusId()); }