Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

添加前置类型

Browse Source
This commit is contained in:
cdf
2026-07-15 13:17:20 +08:00
parent a4e3a2f904
commit e313894417
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/DeviceInfo.java
View File

@@ -20,6 +20,8 @@ public class DeviceInfo {
private String ip; private String ip;
//终端型号 //终端型号
private String devType; private String devType;
//前置类型
private String comType;
//挂载单位 //挂载单位
private String org_name; private String org_name;
//组织名称 //组织名称

14
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/mapper/mapping/NodeMapper.xml
View File

@@ -8,6 +8,7 @@
pq_device.Id id, pq_device.Id id,
pq_device.IP ip, pq_device.IP ip,
s1.Name devType, s1.Name devType,
S3.Name comType,
pq_device.Port port, pq_device.Port port,
pq_line.Name name, pq_line.Name name,
sub.Name subName, sub.Name subName,
@@ -25,15 +26,16 @@
LEFT JOIN pq_line sub on pq_line.pid = sub.id 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_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 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 LEFT JOIN sys_dict_data s2 ON pq_device.Manufacturer = s2.id
<where> <where>
<if test="nodeDeviceParam.ip!=null and nodeDeviceParam.ip != ''"> <if test="nodeDeviceParam.ip!=null and nodeDeviceParam.ip != ''">
pq_node.ip=#{nodeDeviceParam.ip} pq_node.ip=#{nodeDeviceParam.ip}
</if> </if>
<if test="nodeDeviceParam.devId!=null and nodeDeviceParam.devId != ''"> <if test="nodeDeviceParam.devId!=null and nodeDeviceParam.devId != ''">
pq_device.id=#{nodeDeviceParam.devId} pq_device.id=#{nodeDeviceParam.devId}
</if> </if>
<if test="nodeDeviceParam.runFlag!=null and nodeDeviceParam.runFlag.size()!=0"> <if test="nodeDeviceParam.runFlag!=null and nodeDeviceParam.runFlag.size()!=0">
AND pq_device.Run_Flag in AND pq_device.Run_Flag in
<foreach collection="nodeDeviceParam.runFlag" open="(" close=")" item="item" separator=","> <foreach collection="nodeDeviceParam.runFlag" open="(" close=")" item="item" separator=",">
#{item} #{item}