From 2e25d5a6e2e49a189dd6956c7949f6e41e37303d Mon Sep 17 00:00:00 2001
From: wangwei_123 <1255324804@qq.com>
Date: Tue, 5 Aug 2025 12:16:06 +0800
Subject: [PATCH] fix

---
 .../iocoder/yudao/framework/common/pojo/PageParam.java |  2 +-
 .../lock/controller/admin/PlanLifeLockController.java  |  6 ++++++
 .../yudao/module/lock/enums/ErrorCodeConstants.java    |  2 ++
 .../yudao/module/lock/service/PlanLifeLockService.java |  1 +
 .../lock/service/impl/PlanLifeLockServiceImpl.java     | 18 ++++++++++++++++++
 .../cn/iocoder/yudao/module/lock/vo/LockRespVO.java    |  2 +-
 .../yudao/module/lock/vo/PlanItemDetailPageReqVO.java  |  2 +-
 .../yudao/module/lock/vo/PlanItemDetailRespVO.java     |  2 +-
 .../yudao/module/lock/vo/PlanItemPageReqVO.java        |  2 +-
 .../iocoder/yudao/module/lock/vo/PlanItemRespVO.java   |  2 +-
 .../yudao/module/lock/vo/PlanItemSaveReqVO.java        |  2 +-
 .../yudao/module/lock/vo/PlanLifeLockPageReqVO.java    |  2 +-
 .../yudao/module/lock/vo/PlanLifeLockRespVO.java       |  2 +-
 .../yudao/module/lock/vo/PlanLifeLockSaveReqVO.java    |  2 +-
 .../src/main/resources/application-prod.yaml           | 10 +++++-----
 .../yudao-server/src/main/resources/application.yaml   |  2 +-
 16 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/cc-admin-master/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java b/cc-admin-master/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
index 268d117..fcea50f 100644
--- a/cc-admin-master/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
+++ b/cc-admin-master/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
@@ -30,7 +30,7 @@ public class PageParam implements Serializable {
     @Schema(description = "每页条数，最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @NotNull(message = "每页条数不能为空")
     @Min(value = 1, message = "每页条数最小值为 1")
-    @Max(value = 100, message = "每页条数最大值为 100")
+    @Max(value = 99999999, message = "每页条数最大值为 99999999")
     private Integer pageSize = PAGE_SIZE;
 
 }
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanLifeLockController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanLifeLockController.java
index 54b3e0f..3b4bca5 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanLifeLockController.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanLifeLockController.java
@@ -1,6 +1,9 @@
 package cn.iocoder.yudao.module.lock.controller.admin;
 
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.module.lock.dal.PlanLifeLockDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.lock.service.PlanLifeLockService;
 import cn.iocoder.yudao.module.lock.vo.PlanLifeLockPageReqVO;
 import cn.iocoder.yudao.module.lock.vo.PlanLifeLockRespVO;
@@ -22,6 +25,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@@ -46,6 +51,7 @@ public class PlanLifeLockController {
         return success(planLifeLockService.createPlanLifeLock(createReqVO));
     }
 
+
     @PutMapping("/update")
     @Operation(summary = "更新个人生命锁")
     @PreAuthorize("@ss.hasPermission('isolation:plan-life-lock:update')")
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/enums/ErrorCodeConstants.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/enums/ErrorCodeConstants.java
index a259fbb..770ef48 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/enums/ErrorCodeConstants.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/enums/ErrorCodeConstants.java
@@ -22,4 +22,6 @@ public interface ErrorCodeConstants {
     ErrorCode PLAN_LIFE_LOCK_NOT_EXISTS = new ErrorCode(1_005_000_008, "个人生命锁不存在");
 
     ErrorCode POINT_NOT_EXISTS = new ErrorCode(1_005_000_009, "隔离点不存在");
+    ErrorCode CENTRALIZED_LISTING_LOCK_NOT_EXISTS = new ErrorCode(1_005_000_010, "请先创建集中挂牌人锁");
+    ErrorCode CENTRALIZED_LISTING_LOCK_EXISTS = new ErrorCode(1_005_000_010, "请勿重复创建挂牌人锁");
 }
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanLifeLockService.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanLifeLockService.java
index f1533d6..5369a5e 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanLifeLockService.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanLifeLockService.java
@@ -60,4 +60,5 @@ public interface PlanLifeLockService {
      */
     PageResult<PlanLifeLockDO> getPlanLifeLockPage(PlanLifeLockPageReqVO pageReqVO);
 
+    List<PlanLifeLockDO> getListAll(Long isolationPlanItemDetailId);
 }
\ No newline at end of file
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/impl/PlanLifeLockServiceImpl.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/impl/PlanLifeLockServiceImpl.java
index cd149ff..a04bd9c 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/impl/PlanLifeLockServiceImpl.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/impl/PlanLifeLockServiceImpl.java
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.lock.service.PlanLifeLockService;
 import cn.iocoder.yudao.module.lock.vo.PlanLifeLockPageReqVO;
 import cn.iocoder.yudao.module.lock.vo.PlanLifeLockSaveReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +34,16 @@ public class PlanLifeLockServiceImpl implements PlanLifeLockService {
 
     @Override
     public Long createPlanLifeLock(PlanLifeLockSaveReqVO createReqVO) {
+
+        List<PlanLifeLockDO> listAll = getListAll(createReqVO.getIsolationPlanItemDetailId());
+        if (listAll.isEmpty() && !createReqVO.getLockType().equals("1")){
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.CENTRALIZED_LISTING_LOCK_NOT_EXISTS);
+        }
+        for (PlanLifeLockDO planLifeLockDO : listAll) {
+            if (planLifeLockDO.getLockType().equals("1") && createReqVO.getLockType().equals("1")){
+                throw ServiceExceptionUtil.exception(ErrorCodeConstants.CENTRALIZED_LISTING_LOCK_EXISTS);
+            }
+        }
         // 插入
         PlanLifeLockDO planLifeLock = BeanUtils.toBean(createReqVO, PlanLifeLockDO.class);
         planLifeLockMapper.insert(planLifeLock);
@@ -81,4 +92,11 @@ public class PlanLifeLockServiceImpl implements PlanLifeLockService {
         return planLifeLockMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<PlanLifeLockDO> getListAll(Long isolationPlanItemDetailId) {
+        QueryWrapper<PlanLifeLockDO> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("isolation_plan_item_detail_id",isolationPlanItemDetailId);
+        return planLifeLockMapper.selectList(objectQueryWrapper);
+    }
+
 }
\ No newline at end of file
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockRespVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockRespVO.java
index 5cd5780..c4cfa8e 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockRespVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockRespVO.java
@@ -38,7 +38,7 @@ public class LockRespVO {
 
     @Schema(description = "启用状态: 0=未启用, 1=已启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("启用状态: 0=未启用, 1=已启用")
-    private Boolean lockEnableStatus;
+    private Integer lockEnableStatus;
 
     @Schema(description = "上次充电时间")
     @ExcelProperty("上次充电时间")
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailPageReqVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailPageReqVO.java
index 01e9a2e..6663754 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailPageReqVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailPageReqVO.java
@@ -23,7 +23,7 @@ public class PlanItemDetailPageReqVO extends PageParam {
     private Long lockId;
 
     @Schema(description = "锁状态: 0=未上锁, 1=已上锁, 2=已解锁", example = "1")
-    private Boolean lockStatus;
+    private Integer lockStatus;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailRespVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailRespVO.java
index 99cb8ba..38fc19e 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailRespVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemDetailRespVO.java
@@ -30,7 +30,7 @@ public class PlanItemDetailRespVO {
 
     @Schema(description = "锁状态: 0=未上锁, 1=已上锁, 2=已解锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("锁状态: 0=未上锁, 1=已上锁, 2=已解锁")
-    private Boolean lockStatus;
+    private Integer lockStatus;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemPageReqVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemPageReqVO.java
index b295fa7..e817463 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemPageReqVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemPageReqVO.java
@@ -32,7 +32,7 @@ public class PlanItemPageReqVO extends PageParam {
     private Long verifierHelperId;
 
     @Schema(description = "子项状态: 0=未完成, 1=已完成", example = "2")
-    private Boolean status;
+    private Integer status;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemRespVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemRespVO.java
index 36de308..a35bb63 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemRespVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemRespVO.java
@@ -42,7 +42,7 @@ public class PlanItemRespVO {
 
     @Schema(description = "子项状态: 0=未完成, 1=已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("子项状态: 0=未完成, 1=已完成")
-    private Boolean status;
+    private Integer status;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemSaveReqVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemSaveReqVO.java
index ace8469..d848526 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemSaveReqVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanItemSaveReqVO.java
@@ -36,6 +36,6 @@ public class PlanItemSaveReqVO {
 
     @Schema(description = "子项状态: 0=未完成, 1=已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "子项状态: 0=未完成, 1=已完成不能为空")
-    private Boolean status;
+    private Integer status;
 
 }
\ No newline at end of file
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockPageReqVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockPageReqVO.java
index 5b509ae..8d345d5 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockPageReqVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockPageReqVO.java
@@ -23,7 +23,7 @@ public class PlanLifeLockPageReqVO extends PageParam {
     private String lockType;
 
     @Schema(description = "锁定状态: 0=未上锁, 1=已上锁", example = "1")
-    private Boolean lockStatus;
+    private Integer lockStatus;
 
     @Schema(description = "上锁时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockRespVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockRespVO.java
index 1145ecf..0b25df1 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockRespVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockRespVO.java
@@ -30,7 +30,7 @@ public class PlanLifeLockRespVO {
 
     @Schema(description = "锁定状态: 0=未上锁, 1=已上锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("锁定状态: 0=未上锁, 1=已上锁")
-    private Boolean lockStatus;
+    private Integer lockStatus;
 
     @Schema(description = "上锁时间")
     @ExcelProperty("上锁时间")
diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockSaveReqVO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockSaveReqVO.java
index ad1c945..61f13b7 100644
--- a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockSaveReqVO.java
+++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/PlanLifeLockSaveReqVO.java
@@ -28,7 +28,7 @@ public class PlanLifeLockSaveReqVO {
 
     @Schema(description = "锁定状态: 0=未上锁, 1=已上锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "锁定状态: 0=未上锁, 1=已上锁不能为空")
-    private Boolean lockStatus;
+    private Integer lockStatus;
 
     @Schema(description = "上锁时间")
     private LocalDateTime lockTime;
diff --git a/cc-admin-master/yudao-server/src/main/resources/application-prod.yaml b/cc-admin-master/yudao-server/src/main/resources/application-prod.yaml
index bebd598..26fe650 100644
--- a/cc-admin-master/yudao-server/src/main/resources/application-prod.yaml
+++ b/cc-admin-master/yudao-server/src/main/resources/application-prod.yaml
@@ -48,9 +48,9 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://192.168.0.180:3306/lock-dev?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
-          username: root
-          password: Gsking164411
+          url: jdbc:mysql://127.0.0.1:3306/cc-admin-lock?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          username: locksql
+          password: Zdhllock@2024
           driver-class-name: com.mysql.cj.jdbc.Driver # MySQL Connector/J 8.X 连接的示例
 #        tdengine:
 #          url: jdbc:TAOS-RS://192.168.0.180:6041/test
@@ -64,9 +64,9 @@ spring:
   data:
     redis:
       host: 127.0.0.1 # 地址
-      port: 6379 # 端口
+      port: 6377 # 端口
       database: 5 # 数据库索引
-  #    password: dev # 密码，建议生产环境开启
+      password: 'Redislock@25' # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 
diff --git a/cc-admin-master/yudao-server/src/main/resources/application.yaml b/cc-admin-master/yudao-server/src/main/resources/application.yaml
index f73ed5a..745bd4c 100644
--- a/cc-admin-master/yudao-server/src/main/resources/application.yaml
+++ b/cc-admin-master/yudao-server/src/main/resources/application.yaml
@@ -3,7 +3,7 @@ spring:
     name: yudao-server
 
   profiles:
-    active: local
+    active: prod
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。