From e3138944175a3090dd86f13cbf12639be359eca7 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Wed, 15 Jul 2026 13:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=8D=E7=BD=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/pojo/dto/DeviceInfo.java    |  2 ++
 .../njcn/device/node/mapper/mapping/NodeMapper.xml | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

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
         <where>
             <if test="nodeDeviceParam.ip!=null  and nodeDeviceParam.ip != ''">
-                pq_node.ip=#{nodeDeviceParam.ip}
-            </if>
-            <if test="nodeDeviceParam.devId!=null  and nodeDeviceParam.devId != ''">
-                pq_device.id=#{nodeDeviceParam.devId}
-            </if>
-            <if test="nodeDeviceParam.runFlag!=null and nodeDeviceParam.runFlag.size()!=0">
+            pq_node.ip=#{nodeDeviceParam.ip}
+        </if>
+        <if test="nodeDeviceParam.devId!=null  and nodeDeviceParam.devId != ''">
+            pq_device.id=#{nodeDeviceParam.devId}
+        </if>
+        <if test="nodeDeviceParam.runFlag!=null and nodeDeviceParam.runFlag.size()!=0">
                 AND pq_device.Run_Flag in
                 <foreach collection="nodeDeviceParam.runFlag" open="(" close=")" item="item" separator=",">
                     #{item}