From c6f36235b51ddb3c6609de2abd8eb02af345ac33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Fri, 26 May 2023 10:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java  | 8 ++++++++
 .../com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java   | 5 +++++
 .../majornetwork/mapping/DistributionMonitorMapper.xml    | 2 +-
 .../ledgerManger/impl/CommTerminalServiceImpl.java        | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java
index 3cbb30d60..6ead3cf8a 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java
@@ -37,8 +37,16 @@ public class LineDevGetDTO {
      */
     private String devId;
 
+    /**
+     * 0.主网 1.配网
+     */
     private Integer type;
 
+    /**
+     * 1.I类监测点 2.II类监测点 3.III类监测点
+     */
+    private Integer lineType;
+
     /**
      * 装置通讯状态
      */
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
index 4a9c83fcd..fb04b1dc7 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
@@ -53,4 +53,9 @@ public class PmsMonitorBaseDTO implements Serializable {
      */
     private String lineId;
 
+    /***
+     * 配网监测点类别
+     */
+    private Integer lineType;
+
 }
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
index 5b7a1d305..8bc7053dd 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
@@ -268,7 +268,7 @@
 
     <select id="getDisMonitorAllList" resultType="com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO">
         SELECT
-        t.org_id orgId,t.id monitorId,b.Terminal_Id terminalId,t.Voltage_Level voltageLevel,t.powerrId,t.Line_Id
+        t.org_id orgId,t.id monitorId,b.Terminal_Id terminalId,t.Voltage_Level voltageLevel,t.powerrId,t.Line_Id,t.lineType
         FROM
         (
         (
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
index 6de0bfde8..9d8fb40fa 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
@@ -141,6 +141,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
                             lineDevGetDTOPms.setInterval(10);
                             lineDevGetDTOPms.setDevId(it.getTerminalId());
                             lineDevGetDTOPms.setType(1);
+                            lineDevGetDTOPms.setLineType(it.getLineType());
                             lineDevGetDTOPms.setVoltageLevel(mapVoltage.get(it.getVoltageLevel()).getValue());
                             lineListPw.add(lineDevGetDTOPms);
                         });