diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockWordRecordMapper.java b/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockWordRecordMapper.java deleted file mode 100644 index 66db61e..0000000 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockWordRecordMapper.java +++ /dev/null @@ -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 { - - default PageResult selectPage(LockWordRecordPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .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)); - } - -} \ No newline at end of file diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/impl/LockWordRecordServiceImpl.java b/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/impl/LockWordRecordServiceImpl.java deleted file mode 100644 index 9f1c344..0000000 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/service/impl/LockWordRecordServiceImpl.java +++ /dev/null @@ -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 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 getLockWordRecordPage(LockWordRecordPageReqVO pageReqVO) { - return lockWordRecordMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file diff --git a/cc-admin-master/pom.xml b/cc-admin-master/pom.xml index 829c53f..1944c35 100644 --- a/cc-admin-master/pom.xml +++ b/cc-admin-master/pom.xml @@ -17,7 +17,7 @@ yudao-module-infra yudao-module-bpm yudao-module-report - lock-module + yudao-module-lock diff --git a/cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java b/cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java index 9126c7e..9218ce1 100644 --- a/cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java +++ b/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() { - return createFilterBean(new DemoFilter(), WebFilterOrderEnum.DEMO_FILTER); - } - public static FilterRegistrationBean createFilterBean(T filter, Integer order) { FilterRegistrationBean bean = new FilterRegistrationBean<>(filter); bean.setOrder(order); diff --git a/cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java b/cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java deleted file mode 100644 index eece304..0000000 --- a/cc-admin-master/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java +++ /dev/null @@ -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)); - } - -} diff --git a/cc-admin-master/lock-module/pom.xml b/cc-admin-master/yudao-module-lock/pom.xml similarity index 92% rename from cc-admin-master/lock-module/pom.xml rename to cc-admin-master/yudao-module-lock/pom.xml index b7fd6d8..a952cbd 100644 --- a/cc-admin-master/lock-module/pom.xml +++ b/cc-admin-master/yudao-module-lock/pom.xml @@ -8,7 +8,7 @@ ${revision} 4.0.0 - lock-module + yudao-module-lock jar ${project.artifactId} @@ -22,6 +22,10 @@ ${revision} + + cn.iocoder.boot + yudao-spring-boot-starter-web + cn.iocoder.boot diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/IsolationPointController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/IsolationPointController.java similarity index 91% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/IsolationPointController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/IsolationPointController.java index af37f90..e900b69 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/IsolationPointController.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockController.java similarity index 85% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockController.java index 28b717b..7970c0d 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockController.java +++ b/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 deleteLockList(@RequestParam("ids") List 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> getLockPage(@Valid LockPageReqVO pageReqVO) { PageResult 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 list = lockService.getLockPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "电子锁.xls", "数据", LockRespVO.class, - BeanUtils.toBean(list, LockRespVO.class)); + BeanUtils.toBean(list, LockRespVO.class)); } } \ No newline at end of file diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockGuideController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockGuideController.java similarity index 91% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockGuideController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockGuideController.java index 50b40bd..597305d 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockGuideController.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockWordRecordController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockWorkRecordController.java similarity index 62% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockWordRecordController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/LockWorkRecordController.java index 9eec3a9..90f6ea1 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/LockWordRecordController.java +++ b/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> getLockWorkRecordPage(@Valid LockWorkRecordPageReqVO pageReqVO) { + PageResult 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 createLockWordRecord(@Valid @RequestBody LockWordRecordSaveReqVO createReqVO) { - return success(lockWordRecordService.createLockWordRecord(createReqVO)); + public CommonResult createLockWorkRecord(@Valid @RequestBody LockWorkRecordSaveReqVO createReqVO) { + return success(lockWorkRecordService.createLockWorkRecord(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新电子锁操作记录") @PreAuthorize("@ss.hasPermission('electron:lock-word-record:update')") - public CommonResult updateLockWordRecord(@Valid @RequestBody LockWordRecordSaveReqVO updateReqVO) { - lockWordRecordService.updateLockWordRecord(updateReqVO); + public CommonResult 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 deleteLockWordRecord(@RequestParam("id") Long id) { - lockWordRecordService.deleteLockWordRecord(id); + public CommonResult 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 deleteLockWordRecordList(@RequestParam("ids") List ids) { - lockWordRecordService.deleteLockWordRecordListByIds(ids); + public CommonResult deleteLockWorkRecordList(@RequestParam("ids") List 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 getLockWordRecord(@RequestParam("id") Long id) { - LockWordRecordDO lockWordRecord = lockWordRecordService.getLockWordRecord(id); - return success(BeanUtils.toBean(lockWordRecord, LockWordRecordRespVO.class)); + public CommonResult 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> getLockWordRecordPage(@Valid LockWordRecordPageReqVO pageReqVO) { - PageResult 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 list = lockWordRecordService.getLockWordRecordPage(pageReqVO).getList(); + List 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)); } } \ No newline at end of file diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanController.java similarity index 91% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanController.java index 7cad304..40c3dd5 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanController.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanItemController.java similarity index 91% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanItemController.java index eb39600..14eb6ee 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemController.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemDetailController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanItemDetailController.java similarity index 91% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemDetailController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanItemDetailController.java index eb7fdb5..7f3aa37 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanItemDetailController.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanLifeLockController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanLifeLockController.java similarity index 91% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanLifeLockController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PlanLifeLockController.java index adf300e..54b3e0f 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PlanLifeLockController.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PointController.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PointController.java similarity index 91% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PointController.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/admin/PointController.java index b8f8839..0e4f926 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/controller/PointController.java +++ b/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.*; diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/package-info.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/controller/package-info.java new file mode 100644 index 0000000..c354f61 --- /dev/null +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/IsolationPointDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/IsolationPointDO.java similarity index 95% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/IsolationPointDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/IsolationPointDO.java index 7e48b4e..bce357a 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/IsolationPointDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/LockDO.java similarity index 96% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/LockDO.java index e343fdf..3aaea6d 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockGuideDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/LockGuideDO.java similarity index 95% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockGuideDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/LockGuideDO.java index bc8d288..ebba610 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockGuideDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockWordRecordDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/LockWorkRecordDO.java similarity index 86% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockWordRecordDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/LockWorkRecordDO.java index 3486461..77c0bbd 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/LockWordRecordDO.java +++ b/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 diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanDO.java similarity index 94% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanDO.java index a2c944e..9678f77 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanItemDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanItemDO.java similarity index 96% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanItemDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanItemDO.java index 9980186..ff16e37 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanItemDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanItemDetailDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanItemDetailDO.java similarity index 96% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanItemDetailDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanItemDetailDO.java index f6a6791..41d484e 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanItemDetailDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanLifeLockDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanLifeLockDO.java similarity index 96% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanLifeLockDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PlanLifeLockDO.java index b486975..43b8c40 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PlanLifeLockDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PointDO.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PointDO.java similarity index 95% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PointDO.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/dal/PointDO.java index 51c16ff..1f256a3 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/dal/PointDO.java +++ b/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.*; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/enums/ErrorCodeConstants.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/enums/ErrorCodeConstants.java similarity index 95% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/enums/ErrorCodeConstants.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/enums/ErrorCodeConstants.java index 297925e..a259fbb 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/enums/ErrorCodeConstants.java +++ b/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; diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/package-info.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/package-info.java new file mode 100644 index 0000000..1c481c0 --- /dev/null +++ b/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; diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/web/config/LockWebConfiguration.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/web/config/LockWebConfiguration.java new file mode 100644 index 0000000..22cca16 --- /dev/null +++ b/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"); + } + +} diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/web/package-info.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/framework/web/package-info.java new file mode 100644 index 0000000..f5a4946 --- /dev/null +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/IsolationPointMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/IsolationPointMapper.java similarity index 82% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/IsolationPointMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/IsolationPointMapper.java index e7005e1..07ffd48 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/IsolationPointMapper.java +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockGuideMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockGuideMapper.java similarity index 82% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockGuideMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockGuideMapper.java index e492d32..9c4a6d6 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockGuideMapper.java +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockMapper.java similarity index 87% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockMapper.java index 363d9e9..f573af5 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/LockMapper.java +++ b/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; diff --git a/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockWorkRecordMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/LockWorkRecordMapper.java new file mode 100644 index 0000000..8919f46 --- /dev/null +++ b/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 { + + default PageResult selectPage(LockWorkRecordPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .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)); + } + +} \ No newline at end of file diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemDetailMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanItemDetailMapper.java similarity index 85% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemDetailMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanItemDetailMapper.java index a258df9..77f3a1e 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemDetailMapper.java +++ b/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 diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanItemMapper.java similarity index 87% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanItemMapper.java index a87eab1..ce91a98 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanItemMapper.java +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanLifeLockMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanLifeLockMapper.java similarity index 86% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanLifeLockMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanLifeLockMapper.java index 8efc02b..b93025d 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanLifeLockMapper.java +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanMapper.java similarity index 80% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PlanMapper.java index dbcd221..934eade 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PlanMapper.java +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PointMapper.java b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PointMapper.java similarity index 84% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PointMapper.java rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/PointMapper.java index 06502d5..dfaff88 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/PointMapper.java +++ b/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; diff --git a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/IsolationPointMapper.xml b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/IsolationPointMapper.xml similarity index 88% rename from cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/IsolationPointMapper.xml rename to cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/IsolationPointMapper.xml index d83838e..87fbdba 100644 --- a/cc-admin-master/lock-module/src/main/java/cn/iocoder/admin/module/lock/mapper/xml/IsolationPointMapper.xml +++ b/cc-admin-master/yudao-module-lock/src/main/java/cn/iocoder/yudao/module/lock/mapper/xml/IsolationPointMapper.xml @@ -1,6 +1,6 @@ - + - - - cn.iocoder.boot - lock-module - ${revision} - org.springframework.boot spring-boot-configuration-processor true - cn.iocoder.boot diff --git a/cc-admin-master/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java b/cc-admin-master/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java index 57db3f9..4e4fb77 100644 --- a/cc-admin-master/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java +++ b/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) { diff --git a/cc-admin-master/yudao-server/src/main/resources/application-local.yaml b/cc-admin-master/yudao-server/src/main/resources/application-local.yaml index 39c3c13..180dd96 100644 --- a/cc-admin-master/yudao-server/src/main/resources/application-local.yaml +++ b/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 # 密码，建议生产环境开启 --- #################### 定时任务相关配置 ####################