新增型号字段

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsKey.java

@@ -47,5 +47,7 @@ public class IsKey extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "规格型号")
+    private String keySpec;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsLock.java

@@ -47,5 +47,7 @@ public class IsLock extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "规格型号")
+    private String lockSpec;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsLockType.java

@@ -57,4 +57,7 @@ public class IsLockType extends BaseBean
     @ApiModelProperty(value = "所有父节点ID")
     private String ancestors;
 
+    @ApiModelProperty(value = "规格型号")
+    private String lockTypeSpec;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsLockset.java

@@ -51,5 +51,7 @@ public class IsLockset extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "规格型号")
+    private String locksetSpec;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsLocksetType.java

@@ -57,4 +57,7 @@ public class IsLocksetType extends BaseBean
     @ApiModelProperty(value = "所有父节点ID")
     private String ancestors;
 
+    @ApiModelProperty(value = "规格型号")
+    private String locksetTypeSpec;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/key/IsKeyVO.java

@@ -50,5 +50,7 @@ public class IsKeyVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "规格型号")
+    private String keySpec;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/lock/IsLockVO.java

@@ -53,5 +53,7 @@ public class IsLockVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "规格型号")
+    private String lockSpec;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/lockType/IsLockTypeVO.java

@@ -59,4 +59,7 @@ public class IsLockTypeVO extends BaseBean
     @ApiModelProperty(value = "所有父节点ID")
     private String ancestors;
 
+    @ApiModelProperty(value = "规格型号")
+    private String lockTypeSpec;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/lockset/IsLocksetVO.java

@@ -56,5 +56,8 @@ public class IsLocksetVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "规格型号")
+    private String locksetSpec;
+
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/locksetType/IsLocksetTypeVO.java

@@ -60,4 +60,7 @@ public class IsLocksetTypeVO extends BaseBean
     @ApiModelProperty(value = "所有父节点ID")
     private String ancestors;
 
+    @ApiModelProperty(value = "规格型号")
+    private String locksetTypeSpec;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointPageVO.java

@@ -56,19 +56,22 @@ public class PointPageVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
-    @ApiModelProperty(value = "锁具类型id")
+    @ApiModelProperty(value = "挂锁类型id")
     private Long lockTypeId;
 
-    @ApiModelProperty(value = "锁具类型编码")
+    @ApiModelProperty(value = "挂锁类型编码")
     private String lockTypeCode;
 
-    @ApiModelProperty(value = "锁具类型名称")
+    @ApiModelProperty(value = "挂锁类型名称")
     private String lockTypeName;
 
-    @ApiModelProperty(value = "锁具类型图标")
+    @ApiModelProperty(value = "挂锁类型图标")
     private String lockTypeIcon;
 
-    @ApiModelProperty(value = "锁具类型图片")
+    @ApiModelProperty(value = "挂锁类型图片")
     private String lockTypeImg;
 
+    @ApiModelProperty(value = "锁具类型图片")
+    private String locksetTypeImg;
+
 }

ktg-iscs/src/main/resources/mapper/IsIsolationPointMapper.xml

@@ -158,10 +158,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             l.lock_type_name,
             l.lock_type_code,
             l.lock_type_icon,
-            l.lock_type_img
-        FROM
-            is_isolation_point p
-                LEFT JOIN is_lock_type l ON l.lock_type_id = p.lock_type_id
+            l.lock_type_img,
+            t.lockset_type_img
+        FROM is_isolation_point p
+        LEFT JOIN is_lock_type l ON l.lock_type_id = p.lock_type_id
+        LEFT JOIN is_lockset_type t ON t.lockset_type_id = p.lockset_type_id
         <where>
             <if test="dto.pointCode != null and dto.pointCode.trim != ''">
                 and p.point_code like concat('%',#{dto.pointCode},'%')

ktg-iscs/src/main/resources/mapper/IsKeyMapper.xml

@@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="remark"    column="remark"    />
+        <result property="keySpec"    column="keySpec"    />
     </resultMap>
 
     <sql id="selectIsKeyVo">
-        select key_id, key_code, key_name, hardware_id, key_nfc, mac_address, del_flag, create_by, create_time, update_time, update_by, remark from is_key
+        select * from is_key
     </sql>
 
     <select id="selectIsKeyList" parameterType="IsKey" resultMap="IsKeyResult">
@@ -52,7 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="remark != null">remark,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="keySpec != null and keySpec != ''">key_spec,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="keyCode != null and keyCode != ''">#{keyCode},</if>
@@ -65,7 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="remark != null">#{remark},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="keySpec != null and keySpec != ''">#{keySpec},</if>
          </trim>
     </insert>
 
@@ -82,7 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="keySpec != null and keySpec != ''">key_spec = #{keySpec},</if>
         </trim>
         where key_id = #{keyId}
     </update>

ktg-iscs/src/main/resources/mapper/IsLockMapper.xml

@@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="remark"    column="remark"    />
+        <result property="lockSpec"    column="lock_spec"    />
     </resultMap>
 
     <sql id="selectIsLockVo">
-        select lock_id, lock_code, lock_name, lock_type_id, hardware_id, lock_nfc, del_flag, create_by, create_time, update_time, update_by, remark from is_lock
+        select * from is_lock
     </sql>
 
     <select id="selectIsLockList" parameterType="IsLock" resultMap="IsLockResult">
@@ -52,7 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="remark != null">remark,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="lockSpec != null and lockSpec != ''">lock_spec,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="lockCode != null and lockCode != ''">#{lockCode},</if>
@@ -65,7 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="remark != null">#{remark},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="lockSpec != null and lockSpec != ''">#{lockSpec},</if>
          </trim>
     </insert>
 
@@ -82,7 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="lockSpec != null and lockSpec != ''">lock_spec = #{lockSpec},</if>
         </trim>
         where lock_id = #{lockId}
     </update>

ktg-iscs/src/main/resources/mapper/IsLockTypeMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="parentTypeId"    column="parent_type_id"    />
         <result property="ancestors"    column="ancestors"    />
+        <result property="lockTypeSpec"    column="lock_type_spec"    />
     </resultMap>
 
     <sql id="selectIsLockTypeVo">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="parentTypeId != null">parent_type_id,</if>
             <if test="ancestors != null and ancestors != ''">ancestors,</if>
+            <if test="lockTypeSpec != null and lockTypeSpec != ''">lock_type_spec,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="lockTypeCode != null and lockTypeCode != ''">#{lockTypeCode},</if>
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="parentTypeId != null">#{parentTypeId},</if>
             <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+            <if test="lockTypeSpec != null and lockTypeSpec != ''">#{lockTypeSpec},</if>
          </trim>
     </insert>
 
@@ -96,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="parentTypeId != null">parent_type_id = #{parentTypeId},</if>
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+            <if test="lockTypeSpec != null and lockTypeSpec != ''">lock_type_spec = #{lockTypeSpec},</if>
         </trim>
         where lock_type_id = #{lockTypeId}
     </update>

ktg-iscs/src/main/resources/mapper/IsLocksetMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="remark"    column="remark"    />
+        <result property="locksetSpec"    column="lockset_spec"    />
     </resultMap>
 
     <sql id="selectIsLocksetVo">
@@ -55,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="remark != null">remark,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="locksetSpec != null and locksetSpec != ''">lockset_spec,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="locksetCode != null and locksetCode != ''">#{locksetCode},</if>
@@ -69,7 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="remark != null">#{remark},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="locksetSpec != null and locksetSpec != ''">#{locksetSpec},</if>
          </trim>
     </insert>
 
@@ -87,7 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="locksetSpec != null and locksetSpec != ''">lockset_spec = #{locksetSpec},</if>
         </trim>
         where lockset_id = #{locksetId}
     </update>

ktg-iscs/src/main/resources/mapper/IsLocksetTypeMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="parentTypeId"    column="parent_type_id"    />
         <result property="ancestors"    column="ancestors"    />
+        <result property="locksetTypeSpec"    column="lockset_type_spec"    />
     </resultMap>
 
     <sql id="selectIsLocksetTypeVo">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="parentTypeId != null">parent_type_id,</if>
             <if test="ancestors != null and ancestors != ''">ancestors,</if>
+            <if test="locksetTypeSpec != null and locksetTypeSpec != ''">lockset_type_spec,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="locksetTypeCode != null and locksetTypeCode != ''">#{locksetTypeCode},</if>
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="parentTypeId != null">#{parentTypeId},</if>
             <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+            <if test="locksetTypeSpec != null and locksetTypeSpec != ''">#{locksetTypeSpec},</if>
          </trim>
     </insert>
 
@@ -96,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="parentTypeId != null">parent_type_id = #{parentTypeId},</if>
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+            <if test="locksetTypeSpec != null and locksetTypeSpec != ''">lockset_type_spec = #{locksetTypeSpec},</if>
         </trim>
         where lockset_type_id = #{locksetTypeId}
     </update>