动态决定是否进行相角差校验、角型接线是否使用相别的指标进行正式检测、数模脚本与映射校验时动态补充相角的测试项

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

@@ -15,6 +15,8 @@
         <result column="Dev_Chns" property="devChns"/>
         <result column="Dev_Volt" property="devVolt"/>
         <result column="Dev_Curr" property="devCurr"/>
+        <result column="Angle" property="angle"/>
+        <result column="Use_Phase_Index" property="usePhaseIndex"/>
 
         <collection
                 property="monitorList"
@@ -35,7 +37,9 @@
         p.name as icdType,
         t.Dev_Chns,
         t.Dev_Volt,
-        t.Dev_Curr
+        t.Dev_Curr,
+        p.Angle,
+        p.Use_Phase_Index
         FROM
         pq_dev d
         inner join pq_dev_type t on d.Dev_Type = t.id

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

@@ -15,13 +15,8 @@
         <result column="Dev_Chns" property="devChns"/>
         <result column="Dev_Volt" property="devVolt"/>
         <result column="Dev_Curr" property="devCurr"/>
-
-<!--        <collection-->
-<!--                property="monitorList"-->
-<!--                column="{ devId = Id}"-->
-<!--                select="com.njcn.gather.monitor.mapper.PqMonitorMapper.selectMonitorInfo"-->
-<!--        >-->
-<!--        </collection>-->
+        <result column="Angle" property="angle"/>
+        <result column="Use_Phase_Index" property="usePhaseIndex"/>
     </resultMap>
 
     <select id="listStandardDevPreDetection" resultMap="standardDevResultMap">
@@ -36,7 +31,9 @@
         icd_path.Name as icdType,
         dev_type.Dev_Chns,
         dev_type.Dev_Volt,
-        dev_type.Dev_Curr
+        dev_type.Dev_Curr,
+        icd_path.Angle,
+        icd_path.Use_Phase_Index
         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

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

@@ -54,6 +54,18 @@ public class PreDetection {
     @JSONField(name = "icdType")
     private String icdType;
 
+    /**
+     * 是否支持相角。0：不支持，1：支持
+     */
+    @JSONField(name = "angle")
+    private Integer angle;
+
+    /**
+     * 角型接线时是否使用相别的指标来进行检测，0表示否，1表示是
+     */
+    @JSONField(name = "usePhaseIndex")
+    private Integer usePhaseIndex;
+
     /**
      * 装置识别码（3ds加密）
      */