对接调整

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

@@ -75,10 +75,7 @@ public class IsJobTicketPoints extends BaseBean
     @Schema(description = "解锁时间")
     private Date unlockTime;
 
-    @ApiModelProperty(value = "上锁顺序")
-    private Integer lockIndex;
-
-    @ApiModelProperty(value = "解锁顺序")
-    private Integer unlockIndex;
+    @ApiModelProperty(value = "前置隔离点ID")
+    private Long prePointId;
 
 }

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

@@ -45,11 +45,8 @@ public class IsSopPoints extends BaseBean
     @Excel(name = "隔离点ID")
     private Long pointId;
 
-    @ApiModelProperty(value = "上锁顺序")
-    private Integer lockIndex;
-
-    @ApiModelProperty(value = "解锁顺序")
-    private Integer unlockIndex;
+    @ApiModelProperty(value = "前置隔离点ID")
+    private Long prePointId;
 
     /** 删除标志（0代表存在 2代表删除） */
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/sop/AddSopDTO.java

@@ -40,11 +40,8 @@ public class AddSopDTO implements Serializable {
     @ApiModelProperty(value = "隔离点id， 多个用逗号分隔")
     private String pointIds;
 
-    @ApiModelProperty(value = "上锁顺序")
-    private Integer lockIndex;
-
-    @ApiModelProperty(value = "解锁顺序")
-    private Integer unlockIndex;
+    @ApiModelProperty(value = "前置隔离点ID")
+    private Long prePointId;
 
     @ApiModelProperty(value = "关联人员信息")
     private List<AddSopUserDTO> ticketUserDTOList;

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -138,6 +138,13 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
             isJobTicketPoints.setPointId(pointId);
             iIsJobTicketPointsService.save(isJobTicketPoints);
         }
+        // 3.1新增作业票和钥匙的关联关系
+        
+        // 3.2新增作业票和挂锁的关联关系
+
+        // 3.3新增作业票和锁具的关联关系
+
+
         // 4.新增人员信息
         for (AddTicketUserDTO addTicketUserDTO : dto.getTicketUserDTOList()) {
             IsJobTicketUser jobTicketUser = BeanUtils.toBean(addTicketUserDTO, IsJobTicketUser.class);

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

@@ -21,8 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unlockedByKeyId"    column="unlocked_by_key_id"    />
         <result property="lockTime"    column="lock_time"    />
         <result property="unlockTime"    column="unlock_time"    />
-        <result property="lockIndex"    column="lock_index"    />
-        <result property="unlockIndex"    column="unlock_index"    />
+        <result property="prePointId"    column="pre_point_id"    />
     </resultMap>
 
     <sql id="selectIsJobTicketPointsVo">
@@ -63,8 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unlockedByKeyId != null">unlocked_by_key_id,</if>
             <if test="lockTime != null">lock_time,</if>
             <if test="unlockTime != null">unlock_time,</if>
-            <if test="lockIndex != null">lock_index,</if>
-            <if test="unlockIndex != null">unlock_index,</if>
+            <if test="prePointId != null">pre_point_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ticketId != null">#{ticketId},</if>
@@ -82,8 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unlockedByKeyId != null">#{unlockedByKeyId},</if>
             <if test="lockTime != null">#{lockTime},</if>
             <if test="unlockTime != null">#{unlockTime},</if>
-            <if test="lockIndex != null">#{lockIndex},</if>
-            <if test="unlockIndex != null">#{unlockIndex},</if>
+            <if test="prePointId != null">#{prePointId},</if>
          </trim>
     </insert>
 
@@ -105,8 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unlockedByKeyId != null">unlocked_by_key_id = #{unlockedByKeyId},</if>
             <if test="lockTime != null">lock_time = #{lockTime},</if>
             <if test="unlockTime != null">unlock_time = #{unlockTime},</if>
-            <if test="lockIndex != null">lock_index = #{lockIndex},</if>
-            <if test="unlockIndex != null">unlock_index = #{unlockIndex},</if>
+            <if test="prePointId != null">pre_point_id = #{prePointId},</if>
         </trim>
         where record_id = #{recordId}
     </update>

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

@@ -15,8 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
-        <result property="lockIndex"    column="lock_index"    />
-        <result property="unlockIndex"    column="unlock_index"    />
+        <result property="prePointId"    column="pre_point_id"    />
     </resultMap>
 
     <sql id="selectIsSopPointsVo">
@@ -50,8 +49,7 @@ 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="lockIndex != null">lock_index,</if>
-            <if test="unlockIndex != null">unlock_index,</if>
+            <if test="prePointId != null">pre_point_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sopId != null">#{sopId},</if>
@@ -63,8 +61,7 @@ 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="lockIndex != null">#{lockIndex},</if>
-            <if test="unlockIndex != null">#{unlockIndex},</if>
+            <if test="prePointId != null">#{prePointId},</if>
          </trim>
     </insert>
 
@@ -80,8 +77,7 @@ 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="lockIndex != null">lock_index = #{lockIndex},</if>
-            <if test="unlockIndex != null">unlock_index = #{unlockIndex},</if>
+            <if test="prePointId != null">pre_point_id = #{prePointId},</if>
         </trim>
         where record_id = #{recordId}
     </update>