1.微调

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

@@ -90,6 +90,18 @@ public class PreDetection {
          */
         @JSONField(name = "line")
         private Integer line;
+
+        /**
+         * 监测点线路号
+         */
+        @JSONField(name = "pt")
+        private Integer pt;
+
+        /**
+         * 监测点线路号
+         */
+        @JSONField(name = "pt")
+        private Integer ct;
     }
 
     public String getDevKey() {

device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java

@@ -413,6 +413,8 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                     monitorListDTO=new PreDetection.MonitorListDTO();
                     monitorListDTO.setLineId(preDetection.getDevIP()+"_"+i);
                     monitorListDTO.setLine(i);
+                    monitorListDTO.setPt(1);
+                    monitorListDTO.setPt(1);
                     monitorList.add(monitorListDTO);
                 }
                 preDetection.setMonitorList(monitorList);

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

@@ -6,7 +6,9 @@
             resultType="com.njcn.gather.device.device.pojo.vo.PreDetection$MonitorListDTO">
         SELECT
             Id as lineId,
-            Num as line
+            Num as line,
+            pt as pt,
+            ct as ct
         FROM
             pq_monitor
         WHERE