opc完善

platform-dao/src/main/java/com/platform/dao/dto/remote/RemoteOpcDTO.java

@@ -30,6 +30,10 @@ public class RemoteOpcDTO extends BaseDTO implements Serializable {
      * 是否重要监测点：0否1是
      */
     private Integer portFlag;
+    /**
+     * 是否正在采集中：0否1是
+     */
+    private Integer fetchFlag;
     /**
      * 最低阈值
      */

platform-dao/src/main/java/com/platform/dao/entity/remote/RemoteOpc.java

@@ -29,6 +29,10 @@ public class RemoteOpc implements Serializable {
      * 是否重要监测点：0否1是
      */
     private Integer portFlag;
+    /**
+     * 是否正在采集中：0否1是
+     */
+    private Integer fetchFlag;
     /**
      * 最低阈值
      */

platform-dao/src/main/java/com/platform/dao/vo/export/remote/ExportRemoteOpcVO.java

@@ -102,6 +102,12 @@ public class ExportRemoteOpcVO implements Serializable {
      */
     @Excel(name = "是否重要", dicCode="YES_NO")
     private Integer portFlag;
+
+    /**
+     * 是否正在采集中：0否1是
+     */
+    @Excel(name = "是否重要", dicCode="YES_NO")
+    private Integer fetchFlag;
     /**
      * x轴位置
      */

platform-dao/src/main/java/com/platform/dao/vo/query/remote/RemoteOpcVO.java

@@ -27,6 +27,10 @@ public class RemoteOpcVO extends BaseVO implements Serializable {
      * 是否重要监测点：0否1是
      */
     private Integer portFlag;
+    /**
+     * 是否正在采集中：0否1是
+     */
+    private Integer fetchFlag;
     /**
      * 最低阈值
      */

platform-dao/src/main/resources/mapper/remote/RemoteOpcMapper.xml

@@ -22,6 +22,7 @@
                                      opc.result,
                                      opc.av_flag,
                                      opc.port_flag,
+                                     opc.fetch_flag,
                                      opc.created_flag,
                                      opc.position_flag,
                                      opc.x_position,
@@ -56,6 +57,7 @@
                                      opc.result,
                                      opc.av_flag,
                                      opc.port_flag,
+                                     opc.fetch_flag,
                                      opc.created_flag,
                                      opc.position_flag,
                                      opc.x_position,
@@ -81,6 +83,9 @@
         <if test="portFlag != null">
             and opc.port_flag = #{portFlag}
         </if>
+        <if test="fetchFlag != null">
+            and opc.fetch_flag = #{fetchFlag}
+        </if>
         <if test="positionFlag != null">
             and opc.position_flag = #{positionFlag}
         </if>
@@ -180,6 +185,12 @@
                 <if test="item.positionFlag != null">
                     position_flag = #{item.positionFlag}
                 </if>
+                <if test="item.fetchFlag != null">
+                    fetch_flag = #{fetchFlag}
+                </if>
+                <if test="item.portFlag != null">
+                    port_flag = #{portFlag}
+                </if>
                 <if test="item.xPosition != null">
                     x_position = #{item.xPosition}
                 </if>