比对预检测

detection/src/main/java/com/njcn/gather/device/mapper/PqStandardDevMapper.java

@@ -13,6 +13,6 @@ import java.util.List;
  */
 public interface PqStandardDevMapper extends MPJBaseMapper<PqStandardDev> {
 
-    List<PreDetection> listStandardDevPreDetection(@Param("devIds") List<String> ids);
+    List<PreDetection> listStandardDevPreDetection(@Param("ids") List<String> ids);
 }
 

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

@@ -30,15 +30,16 @@
         standard_dev.Name,
         standard_dev.IP,
         standard_dev.Port,
-        standard_dev.Dev_Type,
+        dev_type.name as Dev_Type,
         standard_dev.Series,
         standard_dev.Dev_Key,
-        dev_type.icdType,
+        icd_path.Name as icdType,
         dev_type.Dev_Chns,
         dev_type.Dev_Volt,
         dev_type.Dev_Curr
         from pq_standard_dev standard_dev
         inner join pq_dev_type dev_type on standard_dev.Dev_Type = dev_type.id
+        inner join pq_icd_path icd_path on dev_type.icd = icd_path.id
         where standard_dev.Id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}

detection/src/main/java/com/njcn/gather/device/pojo/enums/PatternEnum.java

@@ -19,4 +19,13 @@ public enum PatternEnum {
         this.value = value;
         this.msg = msg;
     }
+
+    public static PatternEnum getEnum(String value) {
+        for (PatternEnum patternEnum : PatternEnum.values()) {
+            if (patternEnum.getValue().equals(value)) {
+                return patternEnum;
+            }
+        }
+        return null;
+    }
 }

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

@@ -97,25 +97,37 @@ public class PreDetection {
         /**
          * pt
          */
-        @JSONField(name = "pt")
-        private String pt;
+        @JSONField(serialize = false)
+        private String ptStr;
 
         /**
          * ct
          */
-        @JSONField(name = "ct") //todo 是否改为ct
-        private String ct;
+        @JSONField(serialize = false)
+        private String ctStr;
+
+        /**
+         * pt
+         */
+        @JSONField(name = "pt")
+        private Double pt;
+
+        /**
+         * ct
+         */
+        @JSONField(name = "ct")
+        private Double ct;
 
         /**
          * 统计间隔
          */
-        @JSONField(name = "statInterval")
+        @JSONField(serialize = false)
         private Integer statInterval;
 
         /**
          * 接线方式
          */
-        @JSONField(name = "connection")
+        @JSONField(serialize = false)
         private String connection;
     }
 

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

@@ -418,8 +418,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.setCt("1");
+                    monitorListDTO.setPt(1.0);
+                    monitorListDTO.setCt(1.0);
                     monitorList.add(monitorListDTO);
                 }
                 preDetection.setMonitorList(monitorList);