浏览代码

opc:增加是否重要

hfxc226 2 年之前
父节点
当前提交
2093abc457

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

@@ -2,6 +2,7 @@ package com.platform.dao.dto.remote;
 
 import com.platform.common.bean.BaseDTO;
 import com.platform.common.validation.group.UpdateGroup;
+import com.platform.office.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,6 +26,10 @@ public class RemoteOpcDTO extends BaseDTO implements Serializable {
      * 是否配置了显示位置:0否,1是,导入的时候默认0
      */
     private Integer positionFlag;
+    /**
+     * 是否重要监测点:0否1是
+     */
+    private Integer portFlag;
     /**
      * x轴位置
      */

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

@@ -25,6 +25,10 @@ public class RemoteOpc implements Serializable {
      * 是否配置了显示位置:0否,1是,导入的时候默认0
      */
     private Integer positionFlag;
+    /**
+     * 是否重要监测点:0否1是
+     */
+    private Integer portFlag;
     /**
      * x轴位置
      */

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

@@ -98,6 +98,11 @@ public class ExportRemoteOpcVO implements Serializable {
      */
     @Excel(name = "opc服务器上是否已经创建", dicCode="YES_NO")
     private Integer createdFlag;
+    /**
+     * 是否重要监测点:0否1是
+     */
+    @Excel(name = "是否重要", dicCode="YES_NO")
+    private Integer portFlag;
     /**
      * x轴位置
      */

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

@@ -23,6 +23,10 @@ public class RemoteOpcVO extends BaseVO implements Serializable {
      * 是否配置了显示位置:0否,1是,导入的时候默认0
      */
     private Integer positionFlag;
+    /**
+     * 是否重要监测点:0否1是
+     */
+    private Integer portFlag;
     /**
      * x轴位置
      */

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

@@ -2,10 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.remote.RemoteOpcMapper">
     <sql id="Base_Column_List">
-        opc
-        .
-        id
-        ,
+        opc.id,
                                      opc.sb_id,
                                      opc.sb_name,
                                      opc.position_num,
@@ -16,6 +13,7 @@
                                      opc.description,
                                      opc.result,
                                      opc.av_flag,
+                                     opc.port_flag,
                                      opc.created_flag,
                                      opc.position_flag,
                                      opc.x_position,
@@ -43,6 +41,7 @@
                                      opc.description,
                                      opc.result,
                                      opc.av_flag,
+                                     opc.port_flag,
                                      opc.created_flag,
                                      opc.position_flag,
                                      opc.x_position,
@@ -63,6 +62,9 @@
         <if test="avFlag != null and avFlag != ''">
             and opc.av_flag = #{avFlag}
         </if>
+        <if test="portFlag != null and portFlag != ''">
+            and opc.port_flag = #{portFlag}
+        </if>
         <if test="positionFlag != null and positionFlag != ''">
             and opc.position_flag = #{positionFlag}
         </if>