Explorar o código

安环opc页面

hfxc226 hai 1 ano
pai
achega
305b3c856c

+ 4 - 0
platform-dao/src/main/java/com/platform/dao/dto/remote/RemotePositionDTO.java

@@ -25,6 +25,10 @@ public class RemotePositionDTO extends BaseDTO implements Serializable {
      * opc标识:0否1是
      */
     private Integer opcFlag;
+    /**
+     * 安环标识:0否1是
+     */
+    private Integer ahFlag;
     /**
      * 车间opc图片
      */

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

@@ -24,6 +24,10 @@ public class RemotePosition implements Serializable {
      * opc标识:0否1是
      */
     private Integer opcFlag;
+    /**
+     * 安环标识:0否1是
+     */
+    private Integer ahFlag;
     /**
      * 车间opc图片
      */

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

@@ -22,6 +22,10 @@ public class RemotePositionVO extends BaseVO implements Serializable {
      * opc标识:0否1是
      */
     private Integer opcFlag;
+    /**
+     * 安环标识:0否1是
+     */
+    private Integer ahFlag;
     /**
      * 车间opc图片
      */

+ 5 - 2
platform-dao/src/main/resources/mapper/remote/RemotePositionMapper.xml

@@ -2,12 +2,12 @@
 <!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.RemotePositionMapper">
     <sql id="Base_Column_List">
-        id, no, name, type, sort, code, user_id, del_flag, parent_id, opc_flag, opc_img, light_flag, light_img, remark, created_user_id, update_user_id,
+        id, no, name, type, sort, code, user_id, del_flag, parent_id, opc_flag, opc_img,ah_flag,light_flag, light_img, remark, created_user_id, update_user_id,
         created_time, update_time
     </sql>
 
     <sql id="Join_Column">
-        position.id, position.no, position.name, position.code, position.opc_flag, position.light_flag, position.light_img, position.opc_img, position.user_id, position.type, position.sort, position.del_flag, position.parent_id,
+        position.id, position.no, position.name, position.code, position.opc_flag, position.ah_flag,position.light_flag, position.light_img, position.opc_img, position.user_id, position.type, position.sort, position.del_flag, position.parent_id,
         position.remark, position.created_user_id, position.update_user_id,
         position.created_time, position.update_time,
         p.name as parentName, user.real_name as userName
@@ -34,6 +34,9 @@
         <if test="opcFlag != null">
             and position.opc_flag = #{opcFlag}
         </if>
+        <if test="ahFlag != null">
+            and position.ah_flag = #{ahFlag}
+        </if>
         <if test="delFlag != null">
             and position.del_flag = #{delFlag}
         </if>