电子锁模块初始化

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockWordRecordMapper.java

@@ -1,34 +0,0 @@
-package cn.iocoder.admin.module.lock.mapper;
-
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.LockWordRecordDO;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordPageReqVO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 电子锁操作记录 Mapper
- *
- * @author 超级管理员
- */
-@Mapper
-public interface LockWordRecordMapper extends BaseMapperX<LockWordRecordDO> {
-
-    default PageResult<LockWordRecordDO> selectPage(LockWordRecordPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<LockWordRecordDO>()
-                .eqIfPresent(LockWordRecordDO::getOperatorId, reqVO.getOperatorId())
-                .eqIfPresent(LockWordRecordDO::getLockId, reqVO.getLockId())
-                .eqIfPresent(LockWordRecordDO::getIsolationPlanItemDetailId, reqVO.getIsolationPlanItemDetailId())
-                .eqIfPresent(LockWordRecordDO::getRecordType, reqVO.getRecordType())
-                .eqIfPresent(LockWordRecordDO::getSignaturePath, reqVO.getSignaturePath())
-                .eqIfPresent(LockWordRecordDO::getBeforePhotoPath, reqVO.getBeforePhotoPath())
-                .eqIfPresent(LockWordRecordDO::getAfterPhotoPath, reqVO.getAfterPhotoPath())
-                .eqIfPresent(LockWordRecordDO::getGpsCoordinates, reqVO.getGpsCoordinates())
-                .betweenIfPresent(LockWordRecordDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(LockWordRecordDO::getId));
-    }
-
-}

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

@@ -1,88 +0,0 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.LockWordRecordDO;
-import cn.iocoder.admin.module.lock.mapper.LockWordRecordMapper;
-import cn.iocoder.admin.module.lock.service.LockWordRecordService;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordPageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordSaveReqVO;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.LOCK_WORD_RECORD_NOT_EXISTS;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-
-/**
- * 电子锁操作记录 Service 实现类
- *
- * @author 超级管理员
- */
-@Service
-@Validated
-public class LockWordRecordServiceImpl implements LockWordRecordService {
-
-    @Resource
-    private LockWordRecordMapper lockWordRecordMapper;
-
-    @Override
-    public Long createLockWordRecord(LockWordRecordSaveReqVO createReqVO) {
-        // 插入
-        LockWordRecordDO lockWordRecord = BeanUtils.toBean(createReqVO, LockWordRecordDO.class);
-        lockWordRecordMapper.insert(lockWordRecord);
-
-        // 返回
-        return lockWordRecord.getId();
-    }
-
-    @Override
-    public void updateLockWordRecord(LockWordRecordSaveReqVO updateReqVO) {
-        // 校验存在
-        validateLockWordRecordExists(updateReqVO.getId());
-        // 更新
-        LockWordRecordDO updateObj = BeanUtils.toBean(updateReqVO, LockWordRecordDO.class);
-        lockWordRecordMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteLockWordRecord(Long id) {
-        // 校验存在
-        validateLockWordRecordExists(id);
-        // 删除
-        lockWordRecordMapper.deleteById(id);
-    }
-
-    @Override
-    public void deleteLockWordRecordListByIds(List<Long> ids) {
-        // 删除
-        lockWordRecordMapper.deleteByIds(ids);
-    }
-
-
-    private void validateLockWordRecordExists(Long id) {
-        if (lockWordRecordMapper.selectById(id) == null) {
-            throw exception(LOCK_WORD_RECORD_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public LockWordRecordDO getLockWordRecord(Long id) {
-        return lockWordRecordMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<LockWordRecordDO> getLockWordRecordPage(LockWordRecordPageReqVO pageReqVO) {
-        return lockWordRecordMapper.selectPage(pageReqVO);
-    }
-
-}

cc-admin-master/pom.xml

@@ -17,7 +17,7 @@
         <module>yudao-module-infra</module>
        <module>yudao-module-bpm</module>
        <module>yudao-module-report</module>
-       <module>lock-module</module>
+       <module>yudao-module-lock</module>
         <!--<module>yudao-module-iot</module>-->
     </modules>
 

cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.framework.web.config;
 import cn.iocoder.yudao.framework.common.biz.infra.logger.ApiErrorLogCommonApi;
 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
 import cn.iocoder.yudao.framework.web.core.filter.CacheRequestBodyFilter;
-import cn.iocoder.yudao.framework.web.core.filter.DemoFilter;
 import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
 import cn.iocoder.yudao.framework.web.core.handler.GlobalResponseBodyHandler;
 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
@@ -102,15 +101,6 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
         return createFilterBean(new CacheRequestBodyFilter(), WebFilterOrderEnum.REQUEST_BODY_CACHE_FILTER);
     }
 
-    /**
-     * 创建 DemoFilter Bean，演示模式
-     */
-    @Bean
-    @ConditionalOnProperty(value = "yudao.demo", havingValue = "true")
-    public FilterRegistrationBean<DemoFilter> demoFilter() {
-        return createFilterBean(new DemoFilter(), WebFilterOrderEnum.DEMO_FILTER);
-    }
-
     public static <T extends Filter> FilterRegistrationBean<T> createFilterBean(T filter, Integer order) {
         FilterRegistrationBean<T> bean = new FilterRegistrationBean<>(filter);
         bean.setOrder(order);

cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java

@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.framework.web.core.filter;
-
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
-import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY;
-
-/**
- * 演示 Filter，禁止用户发起写操作，避免影响测试数据
- *
- * @author 芋道源码
- */
-public class DemoFilter extends OncePerRequestFilter {
-
-    @Override
-    protected boolean shouldNotFilter(HttpServletRequest request) {
-        String method = request.getMethod();
-        return !StrUtil.equalsAnyIgnoreCase(method, "POST", "PUT", "DELETE")  // 写操作时，不进行过滤率
-                || WebFrameworkUtils.getLoginUserId(request) == null; // 非登录用户时，不进行过滤
-    }
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) {
-        // 直接返回 DEMO_DENY 的结果。即，请求不继续
-        ServletUtils.writeJSON(response, CommonResult.error(DEMO_DENY));
-    }
-
-}

cc-admin-master/lock-module/pom.xml → cc-admin-master/yudao-module-lock/pom.xml

@@ -8,7 +8,7 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>lock-module</artifactId>
+    <artifactId>yudao-module-lock</artifactId>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -22,6 +22,10 @@
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
+        </dependency>
         <!-- 业务组件 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/IsolationPointController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/IsolationPointController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.IsolationPointDO;
-import cn.iocoder.admin.module.lock.service.IsolationPointService;
-import cn.iocoder.admin.module.lock.vo.IsolationPointPageReqVO;
-import cn.iocoder.admin.module.lock.vo.IsolationPointRespVO;
-import cn.iocoder.admin.module.lock.vo.IsolationPointSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.IsolationPointDO;
+import cn.iocoder.yudao.module.lock.service.IsolationPointService;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointRespVO;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockController.java

@@ -1,10 +1,11 @@
-package cn.iocoder.admin.module.lock.controller;
-
-import cn.iocoder.admin.module.lock.dal.LockDO;
-import cn.iocoder.admin.module.lock.service.LockService;
-import cn.iocoder.admin.module.lock.vo.LockPageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockRespVO;
-import cn.iocoder.admin.module.lock.vo.LockSaveReqVO;
+package cn.iocoder.yudao.module.lock.controller.admin;
+
+import cn.iocoder.yudao.module.lock.dal.LockDO;
+import cn.iocoder.yudao.module.lock.service.LockService;
+import cn.iocoder.yudao.module.lock.vo.LockPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockRespVO;
+import cn.iocoder.yudao.module.lock.vo.LockSaveReqVO;
+import jakarta.annotation.security.PermitAll;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,9 +14,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
+
 import java.util.*;
 import java.io.IOException;
 
@@ -23,13 +24,14 @@ 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.success;
 
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 
 @Tag(name = "管理后台 - 电子锁")
@@ -68,7 +70,7 @@ public class LockController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除电子锁")
-                @PreAuthorize("@ss.hasPermission('electron:lock:delete')")
+    @PreAuthorize("@ss.hasPermission('electron:lock:delete')")
     public CommonResult<Boolean> deleteLockList(@RequestParam("ids") List<Long> ids) {
         lockService.deleteLockListByIds(ids);
         return success(true);
@@ -85,7 +87,8 @@ public class LockController {
 
     @GetMapping("/page")
     @Operation(summary = "获得电子锁分页")
-    @PreAuthorize("@ss.hasPermission('electron:lock:query')")
+    //@PreAuthorize("@ss.hasPermission('electron:lock:query')")
+    @PermitAll
     public CommonResult<PageResult<LockRespVO>> getLockPage(@Valid LockPageReqVO pageReqVO) {
         PageResult<LockDO> pageResult = lockService.getLockPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, LockRespVO.class));
@@ -96,12 +99,12 @@ public class LockController {
     @PreAuthorize("@ss.hasPermission('electron:lock:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportLockExcel(@Valid LockPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+                                HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<LockDO> list = lockService.getLockPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "电子锁.xls", "数据", LockRespVO.class,
-                        BeanUtils.toBean(list, LockRespVO.class));
+                BeanUtils.toBean(list, LockRespVO.class));
     }
 
 }

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockGuideController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockGuideController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.LockGuideDO;
-import cn.iocoder.admin.module.lock.service.LockGuideService;
-import cn.iocoder.admin.module.lock.vo.LockGuidePageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockGuideRespVO;
-import cn.iocoder.admin.module.lock.vo.LockGuideSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.LockGuideDO;
+import cn.iocoder.yudao.module.lock.service.LockGuideService;
+import cn.iocoder.yudao.module.lock.vo.LockGuidePageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockGuideRespVO;
+import cn.iocoder.yudao.module.lock.vo.LockGuideSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockWordRecordController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockWorkRecordController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.LockWordRecordDO;
-import cn.iocoder.admin.module.lock.service.LockWordRecordService;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordPageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordRespVO;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.LockWorkRecordDO;
+import cn.iocoder.yudao.module.lock.service.LockWorkRecordService;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordRespVO;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -35,23 +34,33 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/electron/lock-word-record")
 @Validated
-public class LockWordRecordController {
+public class LockWorkRecordController {
 
     @Resource
-    private LockWordRecordService lockWordRecordService;
+    private LockWorkRecordService lockWorkRecordService;
+
+
+    @GetMapping("/page")
+    @Operation(summary = "获得电子锁操作记录分页")
+    @PreAuthorize("@ss.hasPermission('electron:lock-word-record:query')")
+    public CommonResult<PageResult<LockWorkRecordRespVO>> getLockWorkRecordPage(@Valid LockWorkRecordPageReqVO pageReqVO) {
+        PageResult<LockWorkRecordDO> pageResult = lockWorkRecordService.getLockWorkRecordPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, LockWorkRecordRespVO.class));
+    }
+
 
     @PostMapping("/create")
     @Operation(summary = "创建电子锁操作记录")
     @PreAuthorize("@ss.hasPermission('electron:lock-word-record:create')")
-    public CommonResult<Long> createLockWordRecord(@Valid @RequestBody LockWordRecordSaveReqVO createReqVO) {
-        return success(lockWordRecordService.createLockWordRecord(createReqVO));
+    public CommonResult<Long> createLockWorkRecord(@Valid @RequestBody LockWorkRecordSaveReqVO createReqVO) {
+        return success(lockWorkRecordService.createLockWorkRecord(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新电子锁操作记录")
     @PreAuthorize("@ss.hasPermission('electron:lock-word-record:update')")
-    public CommonResult<Boolean> updateLockWordRecord(@Valid @RequestBody LockWordRecordSaveReqVO updateReqVO) {
-        lockWordRecordService.updateLockWordRecord(updateReqVO);
+    public CommonResult<Boolean> updateLockWorkRecord(@Valid @RequestBody LockWorkRecordSaveReqVO updateReqVO) {
+        lockWorkRecordService.updateLockWorkRecord(updateReqVO);
         return success(true);
     }
 
@@ -59,8 +68,8 @@ public class LockWordRecordController {
     @Operation(summary = "删除电子锁操作记录")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('electron:lock-word-record:delete')")
-    public CommonResult<Boolean> deleteLockWordRecord(@RequestParam("id") Long id) {
-        lockWordRecordService.deleteLockWordRecord(id);
+    public CommonResult<Boolean> deleteLockWorkRecord(@RequestParam("id") Long id) {
+        lockWorkRecordService.deleteLockWorkRecord(id);
         return success(true);
     }
 
@@ -68,8 +77,8 @@ public class LockWordRecordController {
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除电子锁操作记录")
                 @PreAuthorize("@ss.hasPermission('electron:lock-word-record:delete')")
-    public CommonResult<Boolean> deleteLockWordRecordList(@RequestParam("ids") List<Long> ids) {
-        lockWordRecordService.deleteLockWordRecordListByIds(ids);
+    public CommonResult<Boolean> deleteLockWorkRecordList(@RequestParam("ids") List<Long> ids) {
+        lockWorkRecordService.deleteLockWorkRecordListByIds(ids);
         return success(true);
     }
 
@@ -77,30 +86,24 @@ public class LockWordRecordController {
     @Operation(summary = "获得电子锁操作记录")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('electron:lock-word-record:query')")
-    public CommonResult<LockWordRecordRespVO> getLockWordRecord(@RequestParam("id") Long id) {
-        LockWordRecordDO lockWordRecord = lockWordRecordService.getLockWordRecord(id);
-        return success(BeanUtils.toBean(lockWordRecord, LockWordRecordRespVO.class));
+    public CommonResult<LockWorkRecordRespVO> getLockWorkRecord(@RequestParam("id") Long id) {
+        LockWorkRecordDO lockWorkRecord = lockWorkRecordService.getLockWorkRecord(id);
+        return success(BeanUtils.toBean(lockWorkRecord, LockWorkRecordRespVO.class));
     }
 
-    @GetMapping("/page")
-    @Operation(summary = "获得电子锁操作记录分页")
-    @PreAuthorize("@ss.hasPermission('electron:lock-word-record:query')")
-    public CommonResult<PageResult<LockWordRecordRespVO>> getLockWordRecordPage(@Valid LockWordRecordPageReqVO pageReqVO) {
-        PageResult<LockWordRecordDO> pageResult = lockWordRecordService.getLockWordRecordPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, LockWordRecordRespVO.class));
-    }
+
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出电子锁操作记录 Excel")
     @PreAuthorize("@ss.hasPermission('electron:lock-word-record:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportLockWordRecordExcel(@Valid LockWordRecordPageReqVO pageReqVO,
+    public void exportLockWorkRecordExcel(@Valid LockWorkRecordPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<LockWordRecordDO> list = lockWordRecordService.getLockWordRecordPage(pageReqVO).getList();
+        List<LockWorkRecordDO> list = lockWorkRecordService.getLockWorkRecordPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "电子锁操作记录.xls", "数据", LockWordRecordRespVO.class,
-                        BeanUtils.toBean(list, LockWordRecordRespVO.class));
+        ExcelUtils.write(response, "电子锁操作记录.xls", "数据", LockWorkRecordRespVO.class,
+                        BeanUtils.toBean(list, LockWorkRecordRespVO.class));
     }
 
 }

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.PlanDO;
-import cn.iocoder.admin.module.lock.service.PlanService;
-import cn.iocoder.admin.module.lock.vo.PlanPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanRespVO;
-import cn.iocoder.admin.module.lock.vo.PlanSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanDO;
+import cn.iocoder.yudao.module.lock.service.PlanService;
+import cn.iocoder.yudao.module.lock.vo.PlanPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanRespVO;
+import cn.iocoder.yudao.module.lock.vo.PlanSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanItemController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.PlanItemDO;
-import cn.iocoder.admin.module.lock.service.PlanItemService;
-import cn.iocoder.admin.module.lock.vo.PlanItemPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemRespVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDO;
+import cn.iocoder.yudao.module.lock.service.PlanItemService;
+import cn.iocoder.yudao.module.lock.vo.PlanItemPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemRespVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemDetailController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanItemDetailController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.PlanItemDetailDO;
-import cn.iocoder.admin.module.lock.service.PlanItemDetailService;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailRespVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDetailDO;
+import cn.iocoder.yudao.module.lock.service.PlanItemDetailService;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailRespVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanLifeLockController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanLifeLockController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.PlanLifeLockDO;
-import cn.iocoder.admin.module.lock.service.PlanLifeLockService;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockRespVO;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanLifeLockDO;
+import cn.iocoder.yudao.module.lock.service.PlanLifeLockService;
+import cn.iocoder.yudao.module.lock.vo.PlanLifeLockPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanLifeLockRespVO;
+import cn.iocoder.yudao.module.lock.vo.PlanLifeLockSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PointController.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PointController.java

@@ -1,10 +1,10 @@
-package cn.iocoder.admin.module.lock.controller;
+package cn.iocoder.yudao.module.lock.controller.admin;
 
-import cn.iocoder.admin.module.lock.dal.PointDO;
-import cn.iocoder.admin.module.lock.service.PointService;
-import cn.iocoder.admin.module.lock.vo.PointPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PointRespVO;
-import cn.iocoder.admin.module.lock.vo.PointSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PointDO;
+import cn.iocoder.yudao.module.lock.service.PointService;
+import cn.iocoder.yudao.module.lock.vo.PointPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PointRespVO;
+import cn.iocoder.yudao.module.lock.vo.PointSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * infra 模块的 web 配置
+ */
+package cn.iocoder.yudao.module.lock.controller;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockWordRecordDO.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/LockWorkRecordDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;
@@ -12,15 +12,15 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 超级管理员
  */
-@TableName("electron_lock_word_record")
-@KeySequence("electron_lock_word_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("electron_lock_work_record")
+@KeySequence("electron_lock_work_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class LockWordRecordDO extends BaseDO {
+public class LockWorkRecordDO extends BaseDO {
 
     /**
      * 主键ID

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.dal;
+package cn.iocoder.yudao.module.lock.dal;
 
 import lombok.*;
 import java.util.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/enums/ErrorCodeConstants.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/enums/ErrorCodeConstants.java

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.enums;
+package cn.iocoder.yudao.module.lock.enums;
 
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 属于 report 模块的 framework 封装
+ *
+ * @author 芋道源码
+ */
+package cn.iocoder.yudao.module.lock.framework;

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/web/config/LockWebConfiguration.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.lock.framework.web.config;
+
+import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration;
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * infra 模块的 web 组件的 Configuration
+ *
+ * @author 芋道源码
+ */
+@Configuration(proxyBeanMethods = false)
+public class LockWebConfiguration {
+
+    /**
+     * infra 模块的 API 分组
+     */
+    @Bean
+    public GroupedOpenApi lockGroupedOpenApi() {
+        return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("lock");
+    }
+
+}

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/web/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * infra 模块的 web 配置
+ */
+package cn.iocoder.yudao.module.lock.framework.web;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/IsolationPointMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/IsolationPointMapper.java

@@ -1,9 +1,7 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.IsolationPointDO;
-import cn.iocoder.admin.module.lock.vo.IsolationPointPageReqVO;
+import cn.iocoder.yudao.module.lock.dal.IsolationPointDO;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointPageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockGuideMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockGuideMapper.java

@@ -1,9 +1,7 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.LockGuideDO;
-import cn.iocoder.admin.module.lock.vo.LockGuidePageReqVO;
+import cn.iocoder.yudao.module.lock.dal.LockGuideDO;
+import cn.iocoder.yudao.module.lock.vo.LockGuidePageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockMapper.java

@@ -1,9 +1,7 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.LockDO;
-import cn.iocoder.admin.module.lock.vo.LockPageReqVO;
+import cn.iocoder.yudao.module.lock.dal.LockDO;
+import cn.iocoder.yudao.module.lock.vo.LockPageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockWorkRecordMapper.java

@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.lock.mapper;
+
+import cn.iocoder.yudao.module.lock.dal.LockWorkRecordDO;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordPageReqVO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 电子锁操作记录 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface LockWorkRecordMapper extends BaseMapperX<LockWorkRecordDO> {
+
+    default PageResult<LockWorkRecordDO> selectPage(LockWorkRecordPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<LockWorkRecordDO>()
+                .eqIfPresent(LockWorkRecordDO::getOperatorId, reqVO.getOperatorId())
+                .eqIfPresent(LockWorkRecordDO::getLockId, reqVO.getLockId())
+                .eqIfPresent(LockWorkRecordDO::getIsolationPlanItemDetailId, reqVO.getIsolationPlanItemDetailId())
+                .eqIfPresent(LockWorkRecordDO::getRecordType, reqVO.getRecordType())
+                .eqIfPresent(LockWorkRecordDO::getSignaturePath, reqVO.getSignaturePath())
+                .eqIfPresent(LockWorkRecordDO::getBeforePhotoPath, reqVO.getBeforePhotoPath())
+                .eqIfPresent(LockWorkRecordDO::getAfterPhotoPath, reqVO.getAfterPhotoPath())
+                .eqIfPresent(LockWorkRecordDO::getGpsCoordinates, reqVO.getGpsCoordinates())
+                .betweenIfPresent(LockWorkRecordDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(LockWorkRecordDO::getId));
+    }
+
+}

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemDetailMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanItemDetailMapper.java

@@ -1,15 +1,12 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import cn.iocoder.admin.module.lock.dal.PlanItemDetailDO;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailPageReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDetailDO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailPageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.*;
-
-
 
 /**
  * 隔离计划子项详情 Mapper

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanItemMapper.java

@@ -1,9 +1,7 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.PlanItemDO;
-import cn.iocoder.admin.module.lock.vo.PlanItemPageReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemPageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanLifeLockMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanLifeLockMapper.java

@@ -1,9 +1,7 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.PlanLifeLockDO;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockPageReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanLifeLockDO;
+import cn.iocoder.yudao.module.lock.vo.PlanLifeLockPageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanMapper.java

@@ -1,9 +1,7 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.PlanDO;
-import cn.iocoder.admin.module.lock.vo.PlanPageReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanDO;
+import cn.iocoder.yudao.module.lock.vo.PlanPageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PointMapper.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PointMapper.java

@@ -1,9 +1,7 @@
-package cn.iocoder.admin.module.lock.mapper;
+package cn.iocoder.yudao.module.lock.mapper;
 
-import java.util.*;
-
-import cn.iocoder.admin.module.lock.dal.PointDO;
-import cn.iocoder.admin.module.lock.vo.PointPageReqVO;
+import cn.iocoder.yudao.module.lock.dal.PointDO;
+import cn.iocoder.yudao.module.lock.vo.PointPageReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/IsolationPointMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/IsolationPointMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.IsolationPointMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.IsolationPointMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/LockGuideMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/LockGuideMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.LockGuideMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.LockGuideMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/LockMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/LockMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.LockMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.LockMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/LockWordRecordMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/LockWordRecordMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.LockWordRecordMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.LockWorkRecordMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/PlanItemDetailMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/PlanItemDetailMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.PlanItemDetailMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.PlanItemDetailMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/PlanItemMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/PlanItemMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.PlanItemMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.PlanItemMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/PlanLifeLockMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/PlanLifeLockMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.PlanLifeLockMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.PlanLifeLockMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/PlanMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/PlanMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.PlanMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.PlanMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/PointMapper.xml → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/PointMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.admin.module.lock.mapper.PointMapper">
+<mapper namespace="cn.iocoder.yudao.module.lock.mapper.PointMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/package-info.java

@@ -0,0 +1,12 @@
+/**
+ * bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能，基于 Flowable 6 版本实现。
+ * 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等
+ *
+ * bpm 解释：https://baike.baidu.com/item/BPM/1933
+ *
+ * 1. Controller URL：以 /bpm/ 开头，避免和其它 Module 冲突
+ * 2. DataObject 表名：以 bpm_ 开头，方便在数据库中区分
+ *
+ * 注意，由于 Bpm 模块下，容易和其它模块重名，所以类名都加载 Bpm 的前缀~
+ */
+package cn.iocoder.yudao.module.lock;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/IsolationPointService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/IsolationPointService.java

@@ -1,14 +1,13 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.IsolationPointDO;
-import cn.iocoder.admin.module.lock.vo.IsolationPointPageReqVO;
-import cn.iocoder.admin.module.lock.vo.IsolationPointSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.IsolationPointDO;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointSaveReqVO;
 import jakarta.validation.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 指导书与隔离点关联 Service 接口

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/LockGuideService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/LockGuideService.java

@@ -1,13 +1,12 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.LockGuideDO;
-import cn.iocoder.admin.module.lock.vo.LockGuidePageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockGuideSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.LockGuideDO;
+import cn.iocoder.yudao.module.lock.vo.LockGuidePageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockGuideSaveReqVO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 隔离指导书 Service 接口

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/LockService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/LockService.java

@@ -1,13 +1,12 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.LockDO;
-import cn.iocoder.admin.module.lock.vo.LockPageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.LockDO;
+import cn.iocoder.yudao.module.lock.vo.LockPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockSaveReqVO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 电子锁 Service 接口

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/LockWordRecordService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/LockWorkRecordService.java

@@ -1,20 +1,19 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.LockWordRecordDO;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordPageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockWordRecordSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.LockWorkRecordDO;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordSaveReqVO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 电子锁操作记录 Service 接口
  *
  * @author 超级管理员
  */
-public interface LockWordRecordService {
+public interface LockWorkRecordService {
 
     /**
      * 创建电子锁操作记录
@@ -22,28 +21,28 @@ public interface LockWordRecordService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createLockWordRecord(@Valid LockWordRecordSaveReqVO createReqVO);
+    Long createLockWorkRecord(@Valid LockWorkRecordSaveReqVO createReqVO);
 
     /**
      * 更新电子锁操作记录
      *
      * @param updateReqVO 更新信息
      */
-    void updateLockWordRecord(@Valid LockWordRecordSaveReqVO updateReqVO);
+    void updateLockWorkRecord(@Valid LockWorkRecordSaveReqVO updateReqVO);
 
     /**
      * 删除电子锁操作记录
      *
      * @param id 编号
      */
-    void deleteLockWordRecord(Long id);
+    void deleteLockWorkRecord(Long id);
 
     /**
     * 批量删除电子锁操作记录
     *
     * @param ids 编号
     */
-    void deleteLockWordRecordListByIds(List<Long> ids);
+    void deleteLockWorkRecordListByIds(List<Long> ids);
 
     /**
      * 获得电子锁操作记录
@@ -51,7 +50,7 @@ public interface LockWordRecordService {
      * @param id 编号
      * @return 电子锁操作记录
      */
-    LockWordRecordDO getLockWordRecord(Long id);
+    LockWorkRecordDO getLockWorkRecord(Long id);
 
     /**
      * 获得电子锁操作记录分页
@@ -59,6 +58,6 @@ public interface LockWordRecordService {
      * @param pageReqVO 分页查询
      * @return 电子锁操作记录分页
      */
-    PageResult<LockWordRecordDO> getLockWordRecordPage(LockWordRecordPageReqVO pageReqVO);
+    PageResult<LockWorkRecordDO> getLockWorkRecordPage(LockWorkRecordPageReqVO pageReqVO);
 
 }

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/PlanItemDetailService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanItemDetailService.java

@@ -1,14 +1,13 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.PlanItemDetailDO;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDetailDO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailSaveReqVO;
 import jakarta.validation.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 隔离计划子项详情 Service 接口

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/PlanItemService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanItemService.java

@@ -1,13 +1,12 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.PlanItemDO;
-import cn.iocoder.admin.module.lock.vo.PlanItemPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemSaveReqVO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 隔离计划子项 Service 接口

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/PlanLifeLockService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanLifeLockService.java

@@ -1,13 +1,12 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.PlanLifeLockDO;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanLifeLockDO;
+import cn.iocoder.yudao.module.lock.vo.PlanLifeLockPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanLifeLockSaveReqVO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 个人生命锁 Service 接口

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/PlanService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PlanService.java

@@ -1,13 +1,12 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.PlanDO;
-import cn.iocoder.admin.module.lock.vo.PlanPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PlanDO;
+import cn.iocoder.yudao.module.lock.vo.PlanPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanSaveReqVO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 隔离计划 Service 接口

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/PointService.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/service/PointService.java

@@ -1,14 +1,13 @@
-package cn.iocoder.admin.module.lock.service;
+package cn.iocoder.yudao.module.lock.service;
 
 import java.util.*;
 
-import cn.iocoder.admin.module.lock.dal.PointDO;
-import cn.iocoder.admin.module.lock.vo.PointPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PointSaveReqVO;
+import cn.iocoder.yudao.module.lock.dal.PointDO;
+import cn.iocoder.yudao.module.lock.vo.PointPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PointSaveReqVO;
 import jakarta.validation.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 隔离点 Service 接口

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

@@ -1,26 +1,23 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.IsolationPointDO;
-import cn.iocoder.admin.module.lock.mapper.IsolationPointMapper;
-import cn.iocoder.admin.module.lock.service.IsolationPointService;
-import cn.iocoder.admin.module.lock.vo.IsolationPointPageReqVO;
-import cn.iocoder.admin.module.lock.vo.IsolationPointSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.IsolationPointDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.IsolationPointMapper;
+import cn.iocoder.yudao.module.lock.service.IsolationPointService;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.IsolationPointSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.ISOLATION_POINT_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 
 /**
  * 指导书与隔离点关联 Service 实现类
@@ -70,7 +67,7 @@ public class IsolationPointServiceImpl implements IsolationPointService {
 
     private void validateIsolationPointExists(Long id) {
         if (isolationPointMapper.selectById(id) == null) {
-            throw exception(ISOLATION_POINT_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.ISOLATION_POINT_NOT_EXISTS);
         }
     }
 

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

@@ -1,24 +1,22 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.LockGuideDO;
-import cn.iocoder.admin.module.lock.mapper.LockGuideMapper;
-import cn.iocoder.admin.module.lock.service.LockGuideService;
-import cn.iocoder.admin.module.lock.vo.LockGuidePageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockGuideSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.LockGuideDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.LockGuideMapper;
+import cn.iocoder.yudao.module.lock.service.LockGuideService;
+import cn.iocoder.yudao.module.lock.vo.LockGuidePageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockGuideSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.LOCK_GUIDE_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
@@ -71,7 +69,7 @@ public class LockGuideServiceImpl implements LockGuideService {
 
     private void validateLockGuideExists(Long id) {
         if (lockGuideMapper.selectById(id) == null) {
-            throw exception(LOCK_GUIDE_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.LOCK_GUIDE_NOT_EXISTS);
         }
     }
 

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

@@ -1,26 +1,24 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.LockDO;
-import cn.iocoder.admin.module.lock.mapper.LockMapper;
-import cn.iocoder.admin.module.lock.service.LockService;
-import cn.iocoder.admin.module.lock.vo.LockPageReqVO;
-import cn.iocoder.admin.module.lock.vo.LockSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.LockDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.LockMapper;
+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 org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.LOCK_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 
 /**
  * 电子锁 Service 实现类
@@ -70,7 +68,7 @@ public class LockServiceImpl implements LockService {
 
     private void validateLockExists(Long id) {
         if (lockMapper.selectById(id) == null) {
-            throw exception(LOCK_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.LOCK_NOT_EXISTS);
         }
     }
 

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

@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.LockWorkRecordDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.LockWorkRecordMapper;
+import cn.iocoder.yudao.module.lock.service.LockWorkRecordService;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.LockWorkRecordSaveReqVO;
+import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+
+/**
+ * 电子锁操作记录 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class LockWorkRecordServiceImpl implements LockWorkRecordService {
+
+    @Resource
+    private LockWorkRecordMapper lockWorkRecordMapper;
+
+    @Override
+    public Long createLockWorkRecord(LockWorkRecordSaveReqVO createReqVO) {
+        // 插入
+        LockWorkRecordDO lockWorkRecord = BeanUtils.toBean(createReqVO, LockWorkRecordDO.class);
+        lockWorkRecordMapper.insert(lockWorkRecord);
+
+        // 返回
+        return lockWorkRecord.getId();
+    }
+
+    @Override
+    public void updateLockWorkRecord(LockWorkRecordSaveReqVO updateReqVO) {
+        // 校验存在
+        validateLockWorkRecordExists(updateReqVO.getId());
+        // 更新
+        LockWorkRecordDO updateObj = BeanUtils.toBean(updateReqVO, LockWorkRecordDO.class);
+        lockWorkRecordMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteLockWorkRecord(Long id) {
+        // 校验存在
+        validateLockWorkRecordExists(id);
+        // 删除
+        lockWorkRecordMapper.deleteById(id);
+    }
+
+    @Override
+    public void deleteLockWorkRecordListByIds(List<Long> ids) {
+        // 删除
+        lockWorkRecordMapper.deleteByIds(ids);
+    }
+
+
+    private void validateLockWorkRecordExists(Long id) {
+        if (lockWorkRecordMapper.selectById(id) == null) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.LOCK_WORD_RECORD_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public LockWorkRecordDO getLockWorkRecord(Long id) {
+        return lockWorkRecordMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<LockWorkRecordDO> getLockWorkRecordPage(LockWorkRecordPageReqVO pageReqVO) {
+        return lockWorkRecordMapper.selectPage(pageReqVO);
+    }
+
+}

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

@@ -1,26 +1,23 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.PlanItemDetailDO;
-import cn.iocoder.admin.module.lock.mapper.PlanItemDetailMapper;
-import cn.iocoder.admin.module.lock.service.PlanItemDetailService;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemDetailSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDetailDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.PlanItemDetailMapper;
+import cn.iocoder.yudao.module.lock.service.PlanItemDetailService;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemDetailSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.PLAN_ITEM_DETAIL_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 
 /**
  * 隔离计划子项详情 Service 实现类
@@ -70,7 +67,7 @@ public class PlanItemDetailServiceImpl implements PlanItemDetailService {
 
     private void validatePlanItemDetailExists(Long id) {
         if (planItemDetailMapper.selectById(id) == null) {
-            throw exception(PLAN_ITEM_DETAIL_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.PLAN_ITEM_DETAIL_NOT_EXISTS);
         }
     }
 

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

@@ -1,25 +1,23 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.PlanItemDO;
-import cn.iocoder.admin.module.lock.mapper.PlanItemMapper;
-import cn.iocoder.admin.module.lock.service.PlanItemService;
-import cn.iocoder.admin.module.lock.vo.PlanItemPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanItemSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.PlanItemDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.PlanItemMapper;
+import cn.iocoder.yudao.module.lock.service.PlanItemService;
+import cn.iocoder.yudao.module.lock.vo.PlanItemPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanItemSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.PLAN_ITEM_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
 
 /**
  * 隔离计划子项 Service 实现类
@@ -69,7 +67,7 @@ public class PlanItemServiceImpl implements PlanItemService {
 
     private void validatePlanItemExists(Long id) {
         if (planItemMapper.selectById(id) == null) {
-            throw exception(PLAN_ITEM_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.PLAN_ITEM_NOT_EXISTS);
         }
     }
 

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

@@ -1,23 +1,21 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.PlanLifeLockDO;
-import cn.iocoder.admin.module.lock.mapper.PlanLifeLockMapper;
-import cn.iocoder.admin.module.lock.service.PlanLifeLockService;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanLifeLockSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+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.mapper.PlanLifeLockMapper;
+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 org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.PLAN_LIFE_LOCK_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
 
@@ -69,7 +67,7 @@ public class PlanLifeLockServiceImpl implements PlanLifeLockService {
 
     private void validatePlanLifeLockExists(Long id) {
         if (planLifeLockMapper.selectById(id) == null) {
-            throw exception(PLAN_LIFE_LOCK_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.PLAN_LIFE_LOCK_NOT_EXISTS);
         }
     }
 

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

@@ -1,23 +1,22 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.PlanDO;
-import cn.iocoder.admin.module.lock.mapper.PlanMapper;
-import cn.iocoder.admin.module.lock.service.PlanService;
-import cn.iocoder.admin.module.lock.vo.PlanPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PlanSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.PlanDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.PlanMapper;
+import cn.iocoder.yudao.module.lock.service.PlanService;
+import cn.iocoder.yudao.module.lock.vo.PlanPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PlanSaveReqVO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.PLAN_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
 /**
@@ -68,7 +67,7 @@ public class PlanServiceImpl implements PlanService {
 
     private void validatePlanExists(Long id) {
         if (planMapper.selectById(id) == null) {
-            throw exception(PLAN_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.PLAN_NOT_EXISTS);
         }
     }
 

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

@@ -1,23 +1,21 @@
-package cn.iocoder.admin.module.lock.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.admin.module.lock.dal.PointDO;
-import cn.iocoder.admin.module.lock.mapper.PointMapper;
-import cn.iocoder.admin.module.lock.service.PointService;
-import cn.iocoder.admin.module.lock.vo.PointPageReqVO;
-import cn.iocoder.admin.module.lock.vo.PointSaveReqVO;
+package cn.iocoder.yudao.module.lock.service.impl;
+
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.lock.dal.PointDO;
+import cn.iocoder.yudao.module.lock.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.lock.mapper.PointMapper;
+import cn.iocoder.yudao.module.lock.service.PointService;
+import cn.iocoder.yudao.module.lock.vo.PointPageReqVO;
+import cn.iocoder.yudao.module.lock.vo.PointSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
-import static cn.iocoder.admin.module.lock.enums.ErrorCodeConstants.POINT_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
 
@@ -69,7 +67,7 @@ public class PointServiceImpl implements PointService {
 
     private void validatePointExists(Long id) {
         if (pointMapper.selectById(id) == null) {
-            throw exception(POINT_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.POINT_NOT_EXISTS);
         }
     }
 

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/vo/LockWordRecordPageReqVO.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockWorkRecordPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;
@@ -11,7 +11,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 
 @Schema(description = "管理后台 - 电子锁操作记录分页 Request VO")
 @Data
-public class LockWordRecordPageReqVO extends PageParam {
+public class LockWorkRecordPageReqVO extends PageParam {
 
     @Schema(description = "操作人ID", example = "24074")
     private Long operatorId;

cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/vo/LockWordRecordRespVO.java → cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/vo/LockWorkRecordRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -10,7 +10,7 @@ import com.alibaba.excel.annotation.*;
 @Schema(description = "管理后台 - 电子锁操作记录 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class LockWordRecordRespVO {
+public class LockWorkRecordRespVO {
 
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31635")
     @ExcelProperty("主键ID")

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -7,7 +7,7 @@ import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - 电子锁操作记录新增/修改 Request VO")
 @Data
-public class LockWordRecordSaveReqVO {
+public class LockWorkRecordSaveReqVO {
 
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31635")
     private Long id;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.admin.module.lock.vo;
+package cn.iocoder.yudao.module.lock.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

cc-admin-master/yudao-server/pom.xml

@@ -24,6 +24,11 @@
     <dependencies>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-lock</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-module-system</artifactId>
             <version>${revision}</version>
         </dependency>
@@ -51,19 +56,12 @@
             <artifactId>yudao-module-iot-biz</artifactId>
             <version>${revision}</version>
         </dependency>-->
-        <!-- 电子锁模块 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>lock-module</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <!-- spring boot 配置所需依赖 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-
         <!-- 服务保障相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>

cc-admin-master/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java

@@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author 芋道源码
  */
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
-@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module"})
+@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module",})
 public class YudaoServerApplication {
 
     public static void main(String[] args) {

cc-admin-master/yudao-server/src/main/resources/application-local.yaml

@@ -65,7 +65,7 @@ spring:
     redis:
       host: 127.0.0.1 # 地址
       port: 6379 # 端口
-      database: 0 # 数据库索引
+      database: 5 # 数据库索引
   #    password: dev # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################