增加字段

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanItemDetailDO.java

@@ -44,5 +44,7 @@ public class PlanItemDetailDO extends BaseDO {
      */
     private Integer lockStatus;
 
+    private Long operateRecordId;
 
+    private Long verifyRecordId;
 }

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/entity/PlanItemDetailEntity.java

@@ -22,6 +22,10 @@ public class PlanItemDetailEntity {
      * 隔离点ID
      */
     private Long isolationPointId;
+
+    private Long operateRecordId;
+
+    private Long verifyRecordId;
     /**
      * 电子锁ID
      */

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/impl/LockServiceImpl.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.lock.service.LockService;
 import cn.iocoder.yudao.module.lock.vo.LockPageReqVO;
 import cn.iocoder.yudao.module.lock.vo.LockSaveReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -27,6 +28,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
  */
 @Service
 @Validated
+@Slf4j
 public class LockServiceImpl implements LockService {
 
     @Resource
@@ -45,6 +47,7 @@ public class LockServiceImpl implements LockService {
     @Override
     public void updateLock(LockSaveReqVO updateReqVO) {
         // 校验存在
+        log.info("[updateLock][updateReqVO({})]", updateReqVO);
         validateLockExists(updateReqVO.getId());
         // 更新
         LockDO updateObj = BeanUtils.toBean(updateReqVO, LockDO.class);

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/IsolationPointSaveReqVO.java

@@ -13,11 +13,11 @@ public class IsolationPointSaveReqVO {
     private Long id;
 
     @Schema(description = "隔离指导书ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22721")
-    @NotNull(message = "隔离指导书ID不能为空")
+    //@NotNull(message = "隔离指导书ID不能为空")
     private Long guideId;
 
     @Schema(description = "隔离点ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7504")
-    @NotNull(message = "隔离点ID不能为空")
+    //@NotNull(message = "隔离点ID不能为空")
     private Long isolationPointId;
 
 }

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockGuideSaveReqVO.java

@@ -19,7 +19,7 @@ public class LockGuideSaveReqVO {
      * 集中挂牌人ID
      */
     @Schema(description = "集中挂牌人ID")
-    @NotNull(message = "集中挂牌人ID不能为空")
+    //@NotNull(message = "集中挂牌人ID不能为空")
     private Long operatorId;
     /**
      * 集中挂牌协助人ID
@@ -31,7 +31,7 @@ public class LockGuideSaveReqVO {
      * 验证人ID
      */
     @Schema(description = "验证人ID")
-    @NotNull(message = "集中挂牌人ID不能为空")
+    //@NotNull(message = "集中挂牌人ID不能为空")
     private Long verifierId;
     /**
      * 验证协助人ID

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockSaveReqVO.java

@@ -15,22 +15,22 @@ public class LockSaveReqVO {
     private Long id;
 
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "编号不能为空")
+    //@NotEmpty(message = "编号不能为空")
     private String lockNumber;
 
     @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    @NotEmpty(message = "名称不能为空")
+    //@NotEmpty(message = "名称不能为空")
     private String lockName;
 
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private String lockStatus;
 
     @Schema(description = "锁具类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "锁具类型不能为空")
+    ////@NotEmpty(message = "锁具类型不能为空")
     private String lockType;
 
     @Schema(description = "启用状态: 0=未启用, 1=已启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "启用状态: 0=未启用, 1=已启用不能为空")
+    //@NotNull(message = "启用状态: 0=未启用, 1=已启用不能为空")
     private Integer lockEnableStatus;
 
     @Schema(description = "上次充电时间")

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockWorkRecordSaveReqVO.java

@@ -13,18 +13,18 @@ public class LockWorkRecordSaveReqVO {
     private Long id;
 
     @Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24074")
-    @NotNull(message = "操作人ID不能为空")
+    //@NotNull(message = "操作人ID不能为空")
     private Long operatorId;
 
     @Schema(description = "电子锁ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21680")
-    @NotNull(message = "电子锁ID不能为空")
+    //@NotNull(message = "电子锁ID不能为空")
     private Long lockId;
 
     @Schema(description = "关联的子项详情ID (某些操作可能不关联)", example = "29583")
     private Long isolationPlanItemDetailId;
 
     @Schema(description = "记录类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "记录类型不能为空")
+    //@NotEmpty(message = "记录类型不能为空")
     private String recordType;
 
     @Schema(description = "操作签名 (图片路径)")

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailPageReqVO.java

@@ -29,4 +29,9 @@ public class PlanItemDetailPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "操作人记录ID")
+    private Long operateRecordId;
+
+    @Schema(description = "验证人记录ID")
+    private Long verifyRecordId;
 }

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailRespVO.java

@@ -36,4 +36,8 @@ public class PlanItemDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "操作人记录ID")
+    private Long operateRecordId;
+    @Schema(description = "验证人记录ID")
+    private Long verifyRecordId;
 }

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailSaveReqVO.java

@@ -13,18 +13,24 @@ public class PlanItemDetailSaveReqVO {
     private Long id;
 
     @Schema(description = "隔离计划子项ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31279")
-    @NotNull(message = "隔离计划子项ID不能为空")
+    //@NotNull(message = "隔离计划子项ID不能为空")
     private Long isolationPlanItemId;
 
     @Schema(description = "隔离点ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27424")
-    @NotNull(message = "隔离点ID不能为空")
+    //@NotNull(message = "隔离点ID不能为空")
     private Long isolationPointId;
 
     @Schema(description = "电子锁ID", example = "10317")
     private Long lockId;
 
     @Schema(description = "锁状态: 0=未上锁, 1=已上锁, 2=已解锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "锁状态: 0=未上锁, 1=已上锁, 2=已解锁不能为空")
+    //@NotNull(message = "锁状态: 0=未上锁, 1=已上锁, 2=已解锁不能为空")
     private Integer lockStatus;
 
+    @Schema(description = "操作人记录ID")
+    private Long operateRecordId;
+
+    @Schema(description = "验证人记录ID")
+    private Long verifyRecordId;
+
 }

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemSaveReqVO.java

@@ -13,29 +13,29 @@ public class PlanItemSaveReqVO {
     private Long id;
 
     @Schema(description = "隔离计划ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16895")
-    @NotNull(message = "隔离计划ID不能为空")
+    //@NotNull(message = "隔离计划ID不能为空")
     private Long isolationPlanId;
 
     @Schema(description = "隔离指导书ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23409")
-    @NotNull(message = "隔离指导书ID不能为空")
+    //@NotNull(message = "隔离指导书ID不能为空")
     private Long guideId;
 
     @Schema(description = "集中挂牌人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6573")
-    @NotNull(message = "集中挂牌人ID不能为空")
+    //@NotNull(message = "集中挂牌人ID不能为空")
     private Long operatorId;
 
     @Schema(description = "集中挂牌协助人ID", example = "249")
     private Long operatorHelperId;
 
     @Schema(description = "验证人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19847")
-    @NotNull(message = "验证人ID不能为空")
+    //@NotNull(message = "验证人ID不能为空")
     private Long verifierId;
 
     @Schema(description = "验证协助人ID", example = "31703")
     private Long verifierHelperId;
 
     @Schema(description = "子项状态: 0=未完成, 1=已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "子项状态: 0=未完成, 1=已完成不能为空")
+    //@NotNull(message = "子项状态: 0=未完成, 1=已完成不能为空")
     private Integer status;
 
 }

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockSaveReqVO.java

@@ -15,19 +15,19 @@ public class PlanLifeLockSaveReqVO {
     private Long id;
 
     @Schema(description = "子项详情ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8076")
-    @NotNull(message = "子项详情ID不能为空")
+    //@NotNull(message = "子项详情ID不能为空")
     private Long isolationPlanItemDetailId;
 
     @Schema(description = "上锁人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28726")
-    @NotNull(message = "上锁人ID不能为空")
+    //@NotNull(message = "上锁人ID不能为空")
     private Long userId;
 
     @Schema(description = "生命锁类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "生命锁类型不能为空")
+    //@NotEmpty(message = "生命锁类型不能为空")
     private String lockType;
 
     @Schema(description = "锁定状态: 0=未上锁, 1=已上锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "锁定状态: 0=未上锁, 1=已上锁不能为空")
+    //@NotNull(message = "锁定状态: 0=未上锁, 1=已上锁不能为空")
     private Integer lockStatus;
 
     @Schema(description = "上锁时间")

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PointSaveReqVO.java

@@ -14,18 +14,18 @@ public class PointSaveReqVO {
     private Long id;
 
     @Schema(description = "隔离点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "隔离点类型不能为空")
+    //@NotEmpty(message = "隔离点类型不能为空")
     private String ipType;
 
     @Schema(description = "隔离点名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
-    @NotEmpty(message = "隔离点名称不能为空")
+    //@NotEmpty(message = "隔离点名称不能为空")
     private String ipName;
 
     @Schema(description = "隔离点位置")
     private String ipLocation;
 
     @Schema(description = "隔离点编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "隔离点编号不能为空")
+    @NotEmpty(message = "隔离点编号不能为空",groups = {PointSaveReqVO.class})
     private String ipNumber;
 
     @Schema(description = "隔离点状态")