From e36652f930dc9a72938b7e4df605fa2ef316cc21 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 18 Dec 2024 11:40:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/mapper/mapping/PqDevMapper.xml     |  3 ++
 .../device/device/pojo/vo/PreDetection.java   | 43 +++++++++++++------
 .../device/service/impl/PqDevServiceImpl.java | 17 +++++++-
 .../script/pojo/param/PqScriptIssueParam.java |  2 +-
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml b/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml
index 67110677..fd01e2cd 100644
--- a/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml
+++ b/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml
@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="DevResultMap" type="com.njcn.gather.device.device.pojo.vo.PreDetection">
+        <id column="Id" property="devId" />
+        <id column="Name" property="devName" />
         <id column="IP" property="devIP" />
         <result column="Port" property="port" />
         <result column="Dev_Type" property="devType" />
@@ -20,6 +22,7 @@
     <select id="selectDevInfo" resultMap="DevResultMap">
         SELECT
             d.Id,
+            d.Name,
             d.IP,
             ( select name from sys_dict_data sd where d.Dev_Type= sd.id) as Dev_Type,
             d.Port,
diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java
index b6cbcf6d..c0ff816f 100644
--- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java
+++ b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java
@@ -1,6 +1,7 @@
 package com.njcn.gather.device.device.pojo.vo;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.njcn.gather.device.device.util.DeviceUtil;
 import lombok.Data;
@@ -20,44 +21,58 @@ public class PreDetection {
     /**
      * 装置ip
      */
-    @JsonProperty("devIP")
+    @JSONField(serialize = false)
+    private String devId;
+
+    /**
+     * 装置ip
+     */
+    @JSONField(serialize = false)
+    private String devName;
+
+
+    /**
+     * 装置ip
+     */
+    @JSONField(name = "devIP", serialize = false)
     private String devIP;
 
     /**
      * 装置端口
      */
-    @JsonProperty("port")
+    @JSONField(name = "port")
     private Integer port;
 
     /**
      * 设备类型，字典表
      */
-    @JsonProperty("devType")
+    @JSONField(name = "devType")
     private String devType;
 
     /**
      * icd设备类型
      */
-    @JsonProperty("icdType")
+    @JSONField(name = "icdType")
     private String icdType;
 
     /**
      * 装置识别码（3ds加密）
      */
-    @JsonProperty("devCode")
+    @JSONField(name = "devCode")
     private String devCode;
 
     /**
      * 装置秘钥（3ds加密）
      */
-    @JsonProperty("devKey")
+    @JSONField(name = "devKey")
     private String devKey;
 
+    @JSONField(serialize = false)
     private Integer devChns;
     /**
      * 监测点信息
      */
-    @JsonProperty("monitorList")
+    @JSONField(name = "monitorList")
     private List<MonitorListDTO> monitorList;
 
 
@@ -67,20 +82,20 @@ public class PreDetection {
         /**
          * 监测点id
          */
-        @JsonProperty("lineId")
+        @JSONField(name = "lineId")
         private String lineId;
 
         /**
          * 监测点线路号
          */
-        @JsonProperty("line")
+        @JSONField(name = "line")
         private Integer line;
     }
 
     public String getDevKey() {
-        if(StrUtil.isNotBlank(devKey)){
+        if (StrUtil.isNotBlank(devKey)) {
             String key = DeviceUtil.decoderString(1, devKey);
-            if(StrUtil.isNotBlank(key)){
+            if (StrUtil.isNotBlank(key)) {
                 return key;
             }
         }
@@ -88,9 +103,9 @@ public class PreDetection {
     }
 
     public String getDevCode() {
-        if(StrUtil.isNotBlank(devCode)){
-         String   code= DeviceUtil.decoderString(1,devCode);
-            if(StrUtil.isNotBlank(code)){
+        if (StrUtil.isNotBlank(devCode)) {
+            String code = DeviceUtil.decoderString(1, devCode);
+            if (StrUtil.isNotBlank(code)) {
                 return code;
             }
         }
diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
index d6ddbabb..9b69ddb6 100644
--- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
+++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
@@ -1,6 +1,7 @@
 package com.njcn.gather.device.device.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -403,7 +404,21 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 
     @Override
     public List<PreDetection> getDevInfo(List<String> devIds) {
-        return this.baseMapper.selectDevInfo(devIds);
+        List<PreDetection> preDetections = this.baseMapper.selectDevInfo(devIds);
+        for (PreDetection preDetection : preDetections) {
+            List<PreDetection.MonitorListDTO> monitorList = preDetection.getMonitorList();
+            if(CollUtil.isEmpty(monitorList)){
+                PreDetection.MonitorListDTO monitorListDTO;
+                for (int i = 1; i <= preDetection.getDevChns(); i++) {
+                    monitorListDTO=new PreDetection.MonitorListDTO();
+                    monitorListDTO.setLineId(preDetection.getDevIP()+"_"+i);
+                    monitorListDTO.setLine(i);
+                    monitorList.add(monitorListDTO);
+                }
+                preDetection.setMonitorList(monitorList);
+            }
+        }
+        return preDetections;
     }
 
     @Override
diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptIssueParam.java b/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptIssueParam.java
index 2dcdc871..9b175b7c 100644
--- a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptIssueParam.java
+++ b/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptIssueParam.java
@@ -27,5 +27,5 @@ public class PqScriptIssueParam {
     private Boolean isPhaseSequence;
 
     @ApiModelProperty("源id")
-    private String sourceId ="111";
+    private String sourceId;
 }