From 1c69b3010b03145343f1deeb0c176ed1f503c496 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 10 Feb 2025 14:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A0=E4=BF=AE=E6=94=B9=E8=A2=AB=E6=A3=80?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=A1=A8=E7=BB=93=E6=9E=84=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/mapper/mapping/PqDevMapper.xml     | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml b/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml
index 127fa0c2..5815d40a 100644
--- a/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml
+++ b/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml
@@ -9,10 +9,10 @@
         <id column="IP" property="devIP" />
         <result column="Port" property="port" />
         <result column="Dev_Type" property="devType" />
-        <result column="" property="icdType" />
         <result column="Series" property="devCode" />
         <result column="Dev_Key" property="devKey" />
         <result column="icdType" property="icdType" />
+        <result column="Dev_Chns" property="devChns" />
         <result column="Dev_Volt" property="devVolt" />
         <result column="Dev_Curr" property="devCurr" />
 
@@ -25,20 +25,21 @@
     </resultMap>
     <select id="selectDevInfo" resultMap="DevResultMap">
         SELECT
-            d.Id,
-            d.Name,
-            d.IP,
-            ( select name from pq_dev_type sd where d.Dev_Type= sd.id) as Dev_Type,
-            d.Port,
-            d.Dev_Chns as devChns,
-            d.Series,
-            d.Dev_Key,
-            d.Dev_Volt,
-            d.Dev_Curr,
-            p.name icdType
+        d.Id,
+        d.Name,
+        d.IP,
+        d.Port,
+        t.name as Dev_Type,
+        d.Series,
+        d.Dev_Key,
+        p.name as icdType,
+        t.Dev_Chns,
+        t.Dev_Volt,
+        t.Dev_Curr
         FROM
-            pq_dev d
-            inner join pq_icd_path p on d.Icd_Id = p.id
+        pq_dev d
+        inner join pq_dev_type t on d.Dev_Type = t.id
+        inner join pq_icd_path p on t.icd = p.id
         <where>
             <if test="devIds !=null and devIds.size()!=0">
                 AND d.Id in