装置通讯检测

device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml

@@ -12,6 +12,8 @@
         <result column="" property="icdType" />
         <result column="Series" property="devCode" />
         <result column="Dev_Key" property="devKey" />
+        <result column="icdType" property="icdType" />
+
         <collection
                 property="monitorList"
                 column="{ devId = Id}"
@@ -28,9 +30,11 @@
             d.Port,
             d.Dev_Chns as devChns,
             d.Series,
-            d.Dev_Key
+            d.Dev_Key,
+            p.name icdType
         FROM
             pq_dev d
+            inner join pq_icd_path p on d.Icd_Id = p.id
         <where>
             <if test="devIds !=null and devIds.size()!=0">
                 AND d.Id in

device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java

@@ -34,7 +34,7 @@ public class PreDetection {
     /**
      * 装置ip
      */
-    @JSONField(name = "devIP", serialize = false)
+    @JSONField(name = "devIP")
     private String devIP;
 
     /**