添加字段

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;
+
     /**
      * 装置通讯状态
      */

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;
+
 }

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
         (
         (

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);
                         });