diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/DeviceInfo.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/DeviceInfo.java index 9a7dc6616..d91a87b0c 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/DeviceInfo.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/DeviceInfo.java @@ -20,6 +20,8 @@ public class DeviceInfo { private String ip; //终端型号 private String devType; + //前置类型 + private String comType; //挂载单位 private String org_name; //组织名称 diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/mapper/mapping/NodeMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/mapper/mapping/NodeMapper.xml index 5f63d3b00..e1447d5c1 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/mapper/mapping/NodeMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/mapper/mapping/NodeMapper.xml @@ -8,6 +8,7 @@ pq_device.Id id, pq_device.IP ip, s1.Name devType, + S3.Name comType, pq_device.Port port, pq_line.Name name, sub.Name subName, @@ -25,15 +26,16 @@ LEFT JOIN pq_line sub on pq_line.pid = sub.id LEFT JOIN pq_device_process on pq_device_process.id = pq_device.id LEFT JOIN pq_dev_type s1 ON pq_device.Dev_Type = s1.id + LEFT JOIN sys_dict_data s3 ON pq_device.Front_Type = s3.id LEFT JOIN sys_dict_data s2 ON pq_device.Manufacturer = s2.id - pq_node.ip=#{nodeDeviceParam.ip} - - - pq_device.id=#{nodeDeviceParam.devId} - - + pq_node.ip=#{nodeDeviceParam.ip} + + + pq_device.id=#{nodeDeviceParam.devId} + + AND pq_device.Run_Flag in #{item}