录波功能完善

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

@@ -17,6 +17,7 @@
         <result column="Dev_Curr" property="devCurr"/>
         <result column="Angle" property="angle"/>
         <result column="Use_Phase_Index" property="usePhaseIndex"/>
+        <result column="Wave_Cmd" property="waveCmd"/>
 
         <collection
                 property="monitorList"
@@ -39,7 +40,8 @@
         t.Dev_Volt,
         t.Dev_Curr,
         p.Angle,
-        p.Use_Phase_Index
+        p.Use_Phase_Index,
+        t.Wave_Cmd
         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

@@ -17,6 +17,7 @@
         <result column="Dev_Curr" property="devCurr"/>
         <result column="Angle" property="angle"/>
         <result column="Use_Phase_Index" property="usePhaseIndex"/>
+        <result column="Wave_Cmd" property="waveCmd"/>
     </resultMap>
 
     <select id="listStandardDevPreDetection" resultMap="standardDevResultMap">
@@ -33,7 +34,8 @@
         dev_type.Dev_Volt,
         dev_type.Dev_Curr,
         icd_path.Angle,
-        icd_path.Use_Phase_Index
+        icd_path.Use_Phase_Index,
+        dev_type.Wave_Cmd
         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/po/PqDevSub.java

@@ -50,21 +50,6 @@ public class PqDevSub {
      */
     private Integer factorCheckResult;
 
-    /**
-     * 实时数据结果 0:不合格，1:合格，2：未检
-     */
-    private Integer realtimeResult;
-
-    /**
-     * 统计数据结果 0:不合格，1:合格，2：未检
-     */
-    private Integer statisticsResult;
-
-    /**
-     * 录波数据结果 0:不合格，1:合格，2：未检
-     */
-    private Integer recordedResult;
-
     /**
      * 检测人
      */

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

@@ -84,6 +84,9 @@ public class PreDetection {
     private Double devVolt;
 
     private Double devCurr;
+
+    @JSONField(serialize = false)
+    private String waveCmd;
     /**
      * 监测点信息
      */