From e249ce5e5d6cbf01f27b9943895c4b09e45b49f6 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Mon, 18 Jan 2021 23:05:47 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20service=20=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=BB=A7=E6=89=BFExtendService,=20mapper=E7=BB=A7=E6=89=BFExte?= =?UTF-8?q?ndMapper,=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9E=84=E9=80=A0=E4=B8=8B=E6=B2=89=E8=87=B3dao?= =?UTF-8?q?=E5=B1=82=E5=B9=B6=E7=A7=BB=E9=99=A4=20Controller=E5=B1=82?= =?UTF-8?q?=E5=92=8C=20service=E5=B1=82=E5=AF=B9=20IPage=20=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminAccessLogController.java | 16 +-- .../controller/AdminLoginLogController.java | 12 +- .../AdminOperationLogController.java | 18 +-- .../log/mapper/AdminAccessLogMapper.java | 30 ++++- .../log/mapper/AdminLoginLogMapper.java | 31 +++-- .../log/mapper/AdminOperationLogMapper.java | 31 ++++- .../log/model/qo/AdminAccessLogQO.java | 61 +++++++++ .../log/model/qo/AdminOperationLogQO.java | 71 +++++++++++ .../log/model/vo/AdminAccessLogVO.java | 117 ++++++++++++++++++ .../log/model/vo/AdminOperationLogVO.java | 100 +++++++++++++++ .../log/service/AdminAccessLogService.java | 16 ++- .../log/service/AdminLoginLogService.java | 13 +- .../log/service/OperationLogAdminService.java | 16 ++- .../impl/AdminAccessLogServiceImpl.java | 19 ++- .../impl/AdminAdminLoginLogServiceImpl.java | 46 ------- .../impl/AdminLoginLogServiceImpl.java | 33 +++++ .../impl/OperationLogAdminServiceImpl.java | 19 ++- .../modules/lov/controller/LovController.java | 29 ++--- .../modules/lov/mapper/LovBodyMapper.java | 4 +- .../admin/modules/lov/mapper/LovMapper.java | 27 +++- .../modules/lov/mapper/LovSearchMapper.java | 4 +- .../admin/modules/lov/model/qo/LovQO.java | 31 +++++ .../{Vo/LovVo.java => vo/LovInfoVO.java} | 6 +- .../admin/modules/lov/model/vo/LovVO.java | 63 ++++++++++ .../modules/lov/service/LovBodyService.java | 4 +- .../modules/lov/service/LovSearchService.java | 4 +- .../admin/modules/lov/service/LovService.java | 23 ++-- .../lov/service/impl/LovBodyServiceImpl.java | 6 +- .../service/impl/LovSearchServiceImpl.java | 6 +- .../lov/service/impl/LovServiceImpl.java | 35 +++--- .../controller/AnnouncementController.java | 10 +- .../UserAnnouncementController.java | 15 +-- .../notify/mapper/AnnouncementMapper.java | 27 ++-- .../notify/mapper/UserAnnouncementMapper.java | 26 ++-- .../notify/model/entity/Announcement.java | 9 +- .../notify/model/entity/UserAnnouncement.java | 4 + .../notify/service/AnnouncementService.java | 15 +-- .../service/UserAnnouncementService.java | 17 +-- .../service/impl/AnnouncementServiceImpl.java | 24 ++-- .../impl/UserAnnouncementServiceImpl.java | 30 ++--- .../sys/controller/SysConfigController.java | 21 ++-- .../sys/controller/SysDictController.java | 23 ++-- .../sys/controller/SysRoleController.java | 15 +-- .../sys/controller/SysUserController.java | 10 +- .../modules/sys/manager/SysDictManager.java | 18 +-- .../modules/sys/mapper/SysConfigMapper.java | 22 +++- .../modules/sys/mapper/SysDictItemMapper.java | 27 ++-- .../modules/sys/mapper/SysDictMapper.java | 27 +++- .../sys/mapper/SysOrganizationMapper.java | 4 +- .../sys/mapper/SysPermissionMapper.java | 8 +- .../modules/sys/mapper/SysRoleMapper.java | 33 ++++- .../sys/mapper/SysRolePermissionMapper.java | 6 +- .../modules/sys/mapper/SysUserMapper.java | 37 ++++-- .../modules/sys/mapper/SysUserRoleMapper.java | 22 ++-- .../modules/sys/model/entity/SysUser.java | 2 + .../modules/sys/model/qo/SysConfigQO.java | 35 ++++++ .../modules/sys/model/vo/SysConfigVO.java | 67 ++++++++++ .../modules/sys/model/vo/SysDictItemVO.java | 79 ++++++++++++ .../admin/modules/sys/model/vo/SysDictVO.java | 75 +++++++++++ .../admin/modules/sys/model/vo/SysRoleVO.java | 47 +++++++ .../modules/sys/service/SysConfigService.java | 18 ++- .../sys/service/SysDictItemService.java | 18 +-- .../modules/sys/service/SysDictService.java | 16 +-- .../sys/service/SysOrganizationService.java | 4 +- .../sys/service/SysPermissionService.java | 6 +- .../sys/service/SysRolePermissionService.java | 8 +- .../modules/sys/service/SysRoleService.java | 20 +-- .../sys/service/SysUserRoleService.java | 20 +-- .../modules/sys/service/SysUserService.java | 15 +-- .../service/impl/SysConfigServiceImpl.java | 23 +++- .../service/impl/SysDictItemServiceImpl.java | 26 ++-- .../sys/service/impl/SysDictServiceImpl.java | 25 ++-- .../impl/SysOrganizationServiceImpl.java | 6 +- .../impl/SysPermissionServiceImpl.java | 6 +- .../impl/SysRolePermissionServiceImpl.java | 13 +- .../sys/service/impl/SysRoleServiceImpl.java | 29 ++--- .../service/impl/SysUserRoleServiceImpl.java | 25 ++-- .../sys/service/impl/SysUserServiceImpl.java | 41 ++---- .../mapper/log/AdminOperationLogMapper.xml | 19 --- .../resources/mapper/log/LoginLogMapper.xml | 16 --- .../mapper/notify/AnnouncementMapper.xml | 10 +- .../mapper/notify/UserAnnouncementMapper.xml | 27 ---- .../main/resources/mapper/sys/RoleMapper.xml | 14 +-- .../mapper/sys/RolePermissionMapper.xml | 11 -- .../resources/mapper/sys/SysUserMapper.xml | 7 +- .../mapper/sys/SysUserRoleMapper.xml | 9 -- .../DataSourceConfigController.java | 13 +- .../controller/GenerateController.java | 10 +- .../controller/TemplateGroupController.java | 12 +- .../TemplatePropertyController.java | 13 +- .../mapper/DataSourceConfigMapper.java | 28 +++-- .../codegen/mapper/TableInfoMapper.java | 23 +++- .../mapper/TemplateDirectoryEntryMapper.java | 18 +-- .../codegen/mapper/TemplateGroupMapper.java | 28 +++-- .../codegen/mapper/TemplateInfoMapper.java | 4 +- .../mapper/TemplatePropertyMapper.java | 27 ++-- .../model/entity/DataSourceConfig.java | 5 +- .../model/entity/TemplateDirectoryEntry.java | 7 +- .../codegen/model/entity/TemplateGroup.java | 5 +- .../codegen/model/entity/TemplateInfo.java | 5 +- .../model/entity/TemplateProperty.java | 5 +- .../service/DataSourceConfigService.java | 15 +-- .../codegen/service/TableInfoService.java | 9 +- .../TemplateDirectoryEntryService.java | 6 +- .../codegen/service/TemplateGroupService.java | 23 ++-- .../codegen/service/TemplateInfoService.java | 4 +- .../service/TemplatePropertyService.java | 13 +- .../impl/DataSourceConfigServiceImpl.java | 24 ++-- .../service/impl/TableInfoServiceImpl.java | 11 +- .../TemplateDirectoryEntryServiceImpl.java | 7 +- .../impl/TemplateGroupServiceImpl.java | 22 ++-- .../service/impl/TemplateInfoServiceImpl.java | 6 +- .../impl/TemplatePropertyServiceImpl.java | 22 ++-- .../mapper/DataSourceConfigMapper.xml | 30 +---- .../main/resources/mapper/TableInfoMapper.xml | 2 +- .../mapper/TemplateDirectoryEntryMapper.xml | 11 -- .../resources/mapper/TemplateGroupMapper.xml | 21 +--- .../resources/mapper/TemplateInfoMapper.xml | 11 -- .../mapper/TemplatePropertyMapper.xml | 30 ----- ballcat-common/ballcat-common-conf/pom.xml | 5 + .../conf/mybatis/MybatisPlusConfig.java | 24 ++++ ...er.java => PageParamArgumentResolver.java} | 21 ++-- .../ballcat/common/conf/web/WebMvcConfig.java | 2 +- ballcat-common/ballcat-common-core/pom.xml | 10 +- .../ballcat/common/core/domain/PageParam.java | 49 ++++++++ .../common/core/domain/PageResult.java | 44 +++++++ .../common/core/domain/SelectData.java | 52 ++++++++ .../ballcat/common/core/vo/SelectData.java | 45 ------- .../mybatis/plus/mapper/ExtendMapper.java | 18 +++ 129 files changed, 1892 insertions(+), 926 deletions(-) create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminAccessLogQO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminOperationLogQO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminAccessLogVO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminOperationLogVO.java delete mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAdminLoginLogServiceImpl.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminLoginLogServiceImpl.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/{Vo/LovVo.java => vo/LovInfoVO.java} (93%) create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovVO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigVO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemVO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictVO.java create mode 100644 ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRoleVO.java delete mode 100644 ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/AdminOperationLogMapper.xml delete mode 100644 ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/LoginLogMapper.xml delete mode 100644 ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/UserAnnouncementMapper.xml delete mode 100644 ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RolePermissionMapper.xml delete mode 100644 ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateDirectoryEntryMapper.xml delete mode 100644 ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateInfoMapper.xml delete mode 100644 ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplatePropertyMapper.xml rename ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/{SqlFilterArgumentResolver.java => PageParamArgumentResolver.java} (84%) create mode 100644 ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageParam.java create mode 100644 ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageResult.java create mode 100644 ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/SelectData.java delete mode 100644 ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/vo/SelectData.java diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java index 9d228f55..68f93b5b 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java @@ -1,10 +1,10 @@ package com.hccake.ballcat.admin.modules.log.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO; import com.hccake.ballcat.admin.modules.log.service.AdminAccessLogService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,15 +30,15 @@ public class AdminAccessLogController { /** * 分页查询 - * @param page 分页对象 - * @param adminAccessLog 访问日志 + * @param pageParam 分页参数 + * @param adminAccessLogQO 访问日志查询对象 * @return R */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('log:adminaccesslog:read')") - public R> getAccessLogApiPage(Page page, AdminAccessLog adminAccessLog) { - return R.ok(adminAccessLogService.page(page, Wrappers.query(adminAccessLog))); + public R> getAccessLogApiPage(PageParam pageParam, AdminAccessLogQO adminAccessLogQO) { + return R.ok(adminAccessLogService.queryPage(pageParam, adminAccessLogQO)); } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminLoginLogController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminLoginLogController.java index 18fc3973..bb73b29f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminLoginLogController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminLoginLogController.java @@ -1,10 +1,10 @@ package com.hccake.ballcat.admin.modules.log.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO; import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO; import com.hccake.ballcat.admin.modules.log.service.AdminLoginLogService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,19 +25,19 @@ import org.springframework.web.bind.annotation.RestController; @Api(value = "adminloginlog", tags = "登陆日志管理") public class AdminLoginLogController { - private final AdminLoginLogService AdminLoginLogService; + private final AdminLoginLogService adminLoginLogService; /** * 分页查询 - * @param page 分页对象 + * @param pageParam 分页参数 * @param adminLoginLogQO 登陆日志查询对象 * @return R 通用返回体 */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('log:adminloginlog:read')") - public R> getLoginLogPage(Page page, AdminLoginLogQO adminLoginLogQO) { - return R.ok(AdminLoginLogService.selectPageVo(page, adminLoginLogQO)); + public R> getLoginLogPage(PageParam pageParam, AdminLoginLogQO adminLoginLogQO) { + return R.ok(adminLoginLogService.queryPage(pageParam, adminLoginLogQO)); } } \ No newline at end of file diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java index 8de39792..63aac0a3 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java @@ -1,10 +1,10 @@ package com.hccake.ballcat.admin.modules.log.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO; import com.hccake.ballcat.admin.modules.log.service.OperationLogAdminService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,16 +30,16 @@ public class AdminOperationLogController { /** * 分页查询 - * @param page 分页对象 - * @param adminOperationLog 操作日志 + * @param pageParam 分页参数 + * @param adminOperationLogQO 操作日志 * @return R */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('log:adminoperationlog:read')") - public R> getOperationLogAdminPage(Page page, - AdminOperationLog adminOperationLog) { - return R.ok(operationLogAdminService.page(page, Wrappers.query(adminOperationLog))); + public R> getOperationLogAdminPage(PageParam pageParam, + AdminOperationLogQO adminOperationLogQO) { + return R.ok(operationLogAdminService.queryPage(pageParam, adminOperationLogQO)); } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java index 6781601a..60e0df02 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java @@ -1,7 +1,14 @@ package com.hccake.ballcat.admin.modules.log.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; /** * 后台访问日志 @@ -9,6 +16,25 @@ import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog; * @author hccake * @date 2019-10-16 16:09:25 */ -public interface AdminAccessLogMapper extends BaseMapper { +public interface AdminAccessLogMapper extends ExtendMapper { + + /** + * 分页查询 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return 分页结果数据 PageResult + */ + default PageResult queryPage(PageParam pageParam, AdminAccessLogQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(AdminAccessLog.class) + .eqIfPresent(AdminAccessLog::getUserId, qo.getUserId()) + .eqIfPresent(AdminAccessLog::getTraceId, qo.getTraceId()) + .eqIfPresent(AdminAccessLog::getMatchingPattern, qo.getMatchingPattern()) + .eqIfPresent(AdminAccessLog::getIp, qo.getIp()) + .gtIfPresent(AdminAccessLog::getCreateTime, qo.getStartTime()) + .ltIfPresent(AdminAccessLog::getCreateTime, qo.getEndTime()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminLoginLogMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminLoginLogMapper.java index c58f8254..3b86703e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminLoginLogMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminLoginLogMapper.java @@ -1,26 +1,39 @@ package com.hccake.ballcat.admin.modules.log.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.hccake.ballcat.admin.modules.log.model.entity.AdminLoginLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO; import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO; -import org.apache.ibatis.annotations.Param; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; /** * 登陆日志 * * @author hccake 2020-09-16 20:21:10 */ -public interface AdminLoginLogMapper extends BaseMapper { +public interface AdminLoginLogMapper extends ExtendMapper { /** * 分页查询 - * @param page 分页对象 - * @param wrapper 查询wrapper - * @return IPage VO分页数据 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return 分页结果数据 PageResult */ - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + default PageResult queryPage(PageParam pageParam, AdminLoginLogQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(AdminLoginLog.class) + .eqIfPresent(AdminLoginLog::getUsername, qo.getUsername()) + .eqIfPresent(AdminLoginLog::getTraceId, qo.getTraceId()).eqIfPresent(AdminLoginLog::getIp, qo.getIp()) + .eqIfPresent(AdminLoginLog::getEventType, qo.getEventType()) + .eqIfPresent(AdminLoginLog::getStatus, qo.getStatus()) + .gtIfPresent(AdminLoginLog::getLoginTime, qo.getStartTime()) + .ltIfPresent(AdminLoginLog::getLoginTime, qo.getEndTime()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } \ No newline at end of file diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java index 700fba81..c96f230f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java @@ -1,7 +1,14 @@ package com.hccake.ballcat.admin.modules.log.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; /** * 操作日志 @@ -9,6 +16,26 @@ import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; * @author hccake * @date 2019-10-15 20:42:32 */ -public interface AdminOperationLogMapper extends BaseMapper { +public interface AdminOperationLogMapper extends ExtendMapper { + + /** + * 分页查询 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return 分页结果数据 PageResult + */ + default PageResult queryPage(PageParam pageParam, AdminOperationLogQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(AdminOperationLog.class) + .eqIfPresent(AdminOperationLog::getOperator, qo.getUserId()) + .eqIfPresent(AdminOperationLog::getTraceId, qo.getTraceId()) + .eqIfPresent(AdminOperationLog::getUri, qo.getUri()).eqIfPresent(AdminOperationLog::getIp, qo.getIp()) + .eqIfPresent(AdminOperationLog::getStatus, qo.getStatus()) + .eqIfPresent(AdminOperationLog::getType, qo.getType()) + .gtIfPresent(AdminOperationLog::getCreateTime, qo.getStartTime()) + .ltIfPresent(AdminOperationLog::getCreateTime, qo.getEndTime()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminAccessLogQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminAccessLogQO.java new file mode 100644 index 00000000..3f4a8319 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminAccessLogQO.java @@ -0,0 +1,61 @@ +package com.hccake.ballcat.admin.modules.log.model.qo; + +import cn.hutool.core.date.DatePattern; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * 后台访问日志 + * + * @author hccake + * @date 2019-10-16 16:09:25 + */ +@Data +@ApiModel(value = "后台访问日志查询对象") +public class AdminAccessLogQO { + + private static final long serialVersionUID = 1L; + + /** + * 追踪ID + */ + @ApiModelProperty(value = "追踪ID") + private String traceId; + + /** + * 用户ID + */ + @ApiModelProperty(value = "用户ID") + private Integer userId; + + /** + * 访问IP地址 + */ + @ApiModelProperty(value = "访问IP地址") + private String ip; + + /** + * 请求映射地址 + */ + @ApiModelProperty(value = "请求映射地址") + private String matchingPattern; + + /** + * 登陆时间区间（开始时间） + */ + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) + @ApiModelProperty(value = "开始时间（登陆时间区间）") + private LocalDateTime startTime; + + /** + * 登陆时间区间（结束时间） + */ + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) + @ApiModelProperty(value = "结束时间（登陆时间区间）") + private LocalDateTime endTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminOperationLogQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminOperationLogQO.java new file mode 100644 index 00000000..5a2cad66 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/qo/AdminOperationLogQO.java @@ -0,0 +1,71 @@ +package com.hccake.ballcat.admin.modules.log.model.qo; + +import cn.hutool.core.date.DatePattern; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * 操作日志查询对象 + * + * @author hccake + * @date 2019-10-15 20:42:32 + */ +@Data +@ApiModel(value = "操作日志查询对象") +public class AdminOperationLogQO { + + /** + * 追踪ID + */ + @ApiModelProperty(value = "追踪ID") + private String traceId; + + /** + * 用户ID + */ + @ApiModelProperty(value = "用户ID") + private Integer userId; + + /** + * 访问IP地址 + */ + @ApiModelProperty(value = "访问IP地址") + private String ip; + + /** + * 请求URI + */ + @ApiModelProperty(value = "请求URI") + private String uri; + + /** + * 操作状态 + */ + @ApiModelProperty(value = "操作状态") + private Integer status; + + /** + * 操作类型 + */ + @ApiModelProperty(value = "操作类型") + private Integer type; + + /** + * 登陆时间区间（开始时间） + */ + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) + @ApiModelProperty(value = "开始时间（登陆时间区间）") + private LocalDateTime startTime; + + /** + * 登陆时间区间（结束时间） + */ + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) + @ApiModelProperty(value = "结束时间（登陆时间区间）") + private LocalDateTime endTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminAccessLogVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminAccessLogVO.java new file mode 100644 index 00000000..b0331c6f --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminAccessLogVO.java @@ -0,0 +1,117 @@ +package com.hccake.ballcat.admin.modules.log.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 后台访问日志展示对象 + * + * @author hccake + * @date 2019-10-16 16:09:25 + */ +@Data +@ApiModel(value = "后台访问日志分页展示对象") +public class AdminAccessLogVO { + + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + @ApiModelProperty(value = "编号") + private Long id; + + /** + * 追踪ID + */ + @ApiModelProperty(value = "追踪ID") + private String traceId; + + /** + * 用户ID + */ + @ApiModelProperty(value = "用户ID") + private Integer userId; + + /** + * 用户名 + */ + @ApiModelProperty(value = "用户名") + private String username; + + /** + * 访问IP地址 + */ + @ApiModelProperty(value = "访问IP地址") + private String ip; + + /** + * 用户代理 + */ + @ApiModelProperty(value = "用户代理") + private String userAgent; + + /** + * 请求URI + */ + @ApiModelProperty(value = "请求URI") + private String uri; + + /** + * 请求映射地址 + */ + @ApiModelProperty(value = "请求映射地址") + private String matchingPattern; + + /** + * 操作方式 + */ + @ApiModelProperty(value = "操作方式") + private String method; + + /** + * 请求参数 + */ + @ApiModelProperty(value = "请求参数") + private String reqParams; + + /** + * 请求body + */ + @ApiModelProperty(value = "请求body") + private String reqBody; + + /** + * 响应状态码 + */ + @ApiModelProperty(value = "响应状态码") + private Integer httpStatus; + + /** + * 响应信息 + */ + @ApiModelProperty(value = "响应信息") + private String result; + + /** + * 错误消息 + */ + @ApiModelProperty(value = "错误消息") + private String errorMsg; + + /** + * 执行时长 + */ + @ApiModelProperty(value = "执行时长") + private Long time; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminOperationLogVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminOperationLogVO.java new file mode 100644 index 00000000..0c8c01c0 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/vo/AdminOperationLogVO.java @@ -0,0 +1,100 @@ +package com.hccake.ballcat.admin.modules.log.model.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 操作日志视图对象 + * + * @author hccake + * @date 2019-10-15 20:42:32 + */ +@Data +@ApiModel(value = "操作日志视图对象") +public class AdminOperationLogVO { + + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + @ApiModelProperty(value = "编号") + private Long id; + + /** + * 追踪ID + */ + @ApiModelProperty(value = "追踪ID") + private String traceId; + + /** + * 日志消息 + */ + @ApiModelProperty(value = "日志消息") + private String msg; + + /** + * 访问IP地址 + */ + @ApiModelProperty(value = "访问IP地址") + private String ip; + + /** + * 用户代理 + */ + @ApiModelProperty(value = "用户代理") + private String userAgent; + + /** + * 请求URI + */ + @ApiModelProperty(value = "请求URI") + private String uri; + + /** + * 请求方法 + */ + @ApiModelProperty(value = "请求方法") + private String method; + + /** + * 操作提交的数据 + */ + @ApiModelProperty(value = "操作提交的数据") + private String params; + + /** + * 操作状态 + */ + @ApiModelProperty(value = "操作状态") + private Integer status; + + /** + * 操作类型 + */ + @ApiModelProperty(value = "操作类型") + private Integer type; + + /** + * 执行时长 + */ + @ApiModelProperty(value = "执行时长") + private Long time; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String operator; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java index db0fa28f..1f21ded3 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java @@ -1,7 +1,11 @@ package com.hccake.ballcat.admin.modules.log.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** * 后台访问日志 @@ -9,6 +13,14 @@ import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog; * @author hccake * @date 2019-10-16 16:09:25 */ -public interface AdminAccessLogService extends IService { +public interface AdminAccessLogService extends ExtendService { + + /** + * 根据QueryObject查询分页数据 + * @param page 分页参数 + * @param qo 查询参数对象 + * @return PageResult 分页数据 + */ + PageResult queryPage(PageParam page, AdminAccessLogQO qo); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminLoginLogService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminLoginLogService.java index 347f7eef..c26e5032 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminLoginLogService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminLoginLogService.java @@ -1,24 +1,25 @@ package com.hccake.ballcat.admin.modules.log.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.log.model.entity.AdminLoginLog; -import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO; import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** * 登陆日志 * * @author hccake 2020-09-16 20:21:10 */ -public interface AdminLoginLogService extends IService { +public interface AdminLoginLogService extends ExtendService { /** * 根据QueryObject查询分页数据 * @param page 分页参数 * @param qo 查询参数对象 - * @return IPage 分页数据 + * @return PageResult 分页数据 */ - IPage selectPageVo(IPage page, AdminLoginLogQO qo); + PageResult queryPage(PageParam page, AdminLoginLogQO qo); } \ No newline at end of file diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java index 2b17fa41..8f3e4dce 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java @@ -1,7 +1,11 @@ package com.hccake.ballcat.admin.modules.log.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** * 操作日志 @@ -9,6 +13,14 @@ import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; * @author hccake * @date 2019-10-15 20:42:32 */ -public interface OperationLogAdminService extends IService { +public interface OperationLogAdminService extends ExtendService { + + /** + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param qo 查询参数对象 + * @return PageResult 分页数据 + */ + PageResult queryPage(PageParam pageParam, AdminOperationLogQO qo); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java index c09c6ec9..acb3b2ed 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java @@ -1,9 +1,13 @@ package com.hccake.ballcat.admin.modules.log.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.log.mapper.AdminAccessLogMapper; import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO; import com.hccake.ballcat.admin.modules.log.service.AdminAccessLogService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,7 +19,18 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -public class AdminAccessLogServiceImpl extends ServiceImpl +public class AdminAccessLogServiceImpl extends ExtendServiceImpl implements AdminAccessLogService { + /** + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param qo 查询参数对象 + * @return IPage 分页数据 + */ + @Override + public PageResult queryPage(PageParam pageParam, AdminAccessLogQO qo) { + return baseMapper.queryPage(pageParam, qo); + } + } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAdminLoginLogServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAdminLoginLogServiceImpl.java deleted file mode 100644 index d82f0c0d..00000000 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAdminLoginLogServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hccake.ballcat.admin.modules.log.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hccake.ballcat.admin.modules.log.mapper.AdminLoginLogMapper; -import com.hccake.ballcat.admin.modules.log.model.entity.AdminLoginLog; -import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO; -import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO; -import com.hccake.ballcat.admin.modules.log.service.AdminLoginLogService; -import org.springframework.stereotype.Service; - -/** - * 登陆日志 - * - * @author hccake 2020-09-16 20:21:10 - */ -@Service -public class AdminAdminLoginLogServiceImpl extends ServiceImpl - implements AdminLoginLogService { - - private final static String TABLE_ALIAS_PREFIX = "ll."; - - /** - * 根据QueryObject查询分页数据 - * @param page 分页参数 - * @param qo 查询参数对象 - * @return IPage 分页数据 - */ - @Override - public IPage selectPageVo(IPage page, AdminLoginLogQO qo) { - QueryWrapper wrapper = Wrappers.query() - .eq(StrUtil.isNotBlank(qo.getUsername()), TABLE_ALIAS_PREFIX + "username", qo.getUsername()) - .eq(StrUtil.isNotBlank(qo.getTraceId()), TABLE_ALIAS_PREFIX + "trace_id", qo.getTraceId()) - .eq(StrUtil.isNotBlank(qo.getIp()), TABLE_ALIAS_PREFIX + "ip", qo.getIp()) - .eq(ObjectUtil.isNotNull(qo.getEventType()), TABLE_ALIAS_PREFIX + "event_type", qo.getEventType()) - .eq(ObjectUtil.isNotNull(qo.getStatus()), TABLE_ALIAS_PREFIX + "status", qo.getStatus()) - .gt(ObjectUtil.isNotNull(qo.getStartTime()), TABLE_ALIAS_PREFIX + "login_time", qo.getStartTime()) - .lt(ObjectUtil.isNotNull(qo.getEndTime()), TABLE_ALIAS_PREFIX + "login_time", qo.getEndTime()); - return baseMapper.selectPageVo(page, wrapper); - } - -} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminLoginLogServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminLoginLogServiceImpl.java new file mode 100644 index 00000000..27e6b5a9 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminLoginLogServiceImpl.java @@ -0,0 +1,33 @@ +package com.hccake.ballcat.admin.modules.log.service.impl; + +import com.hccake.ballcat.admin.modules.log.mapper.AdminLoginLogMapper; +import com.hccake.ballcat.admin.modules.log.model.entity.AdminLoginLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO; +import com.hccake.ballcat.admin.modules.log.service.AdminLoginLogService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 登陆日志 + * + * @author hccake 2020-09-16 20:21:10 + */ +@Service +public class AdminLoginLogServiceImpl extends ExtendServiceImpl + implements AdminLoginLogService { + + /** + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param qo 查询参数对象 + * @return PageResult 分页数据 + */ + @Override + public PageResult queryPage(PageParam pageParam, AdminLoginLogQO qo) { + return baseMapper.queryPage(pageParam, qo); + } + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java index 450d4e73..5f36000a 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java @@ -1,9 +1,13 @@ package com.hccake.ballcat.admin.modules.log.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.log.mapper.AdminOperationLogMapper; import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; +import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO; +import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO; import com.hccake.ballcat.admin.modules.log.service.OperationLogAdminService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; /** @@ -13,7 +17,18 @@ import org.springframework.stereotype.Service; * @date 2019-10-15 20:42:32 */ @Service -public class OperationLogAdminServiceImpl extends ServiceImpl +public class OperationLogAdminServiceImpl extends ExtendServiceImpl implements OperationLogAdminService { + /** + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param qo 查询参数对象 + * @return PageResult 分页数据 + */ + @Override + public PageResult queryPage(PageParam pageParam, AdminOperationLogQO qo) { + return baseMapper.queryPage(pageParam, qo); + } + } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java index 11242150..d26607e0 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java @@ -1,14 +1,15 @@ package com.hccake.ballcat.admin.modules.lov.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.admin.modules.lov.model.Vo.LovVo; import com.hccake.ballcat.admin.modules.lov.model.dto.LovDTO; -import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; +import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.lov.model.vo.LovInfoVO; +import com.hccake.ballcat.admin.modules.lov.model.vo.LovVO; import com.hccake.ballcat.admin.modules.lov.service.LovService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; @@ -26,25 +27,25 @@ import org.springframework.web.bind.annotation.*; @Api(value = "lov", tags = "lov管理") public class LovController { - private final LovService service; + private final LovService lovService; /** * 分页查询 - * @param page 分页对象 - * @param entity 查询对象 + * @param pageParam 分页参数 + * @param qo 查询对象 * @return R 通用返回体 */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('sys:lov:read')") - public R> getLovPage(Page page, Lov entity) { - return R.ok(service.selectPage(page, entity)); + public R> getLovPage(PageParam pageParam, LovQO qo) { + return R.ok(lovService.queryPage(pageParam, qo)); } @ApiOperation("根据keyword获取lov数据") @GetMapping("/data/{keyword}") - public R getDataByKeyword(@PathVariable("keyword") String keyword) { - LovVo vo = service.getDataByKeyword(keyword); + public R getDataByKeyword(@PathVariable("keyword") String keyword) { + LovInfoVO vo = lovService.getDataByKeyword(keyword); return vo == null ? R.failed(BaseResultCode.UNKNOWN_ERROR, "获取失败!") : R.ok(vo); } @@ -58,7 +59,7 @@ public class LovController { @PutMapping @PreAuthorize("@per.hasPermission('sys:lov:add')") public R save(@RequestBody LovDTO dto) { - return service.save(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok() + return lovService.save(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增lov失败!"); } @@ -72,7 +73,7 @@ public class LovController { @PostMapping @PreAuthorize("@per.hasPermission('sys:lov:edit')") public R updateById(@RequestBody LovDTO dto) { - return service.update(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok() + return lovService.update(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改lov失败"); } @@ -86,7 +87,7 @@ public class LovController { @DeleteMapping("/{id}") @PreAuthorize("@per.hasPermission('sys:lov:del')") public R removeById(@PathVariable Integer id) { - return service.remove(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除lov失败"); + return lovService.remove(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除lov失败"); } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java index 012fdf3f..c3d0ff18 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java @@ -1,11 +1,11 @@ package com.hccake.ballcat.admin.modules.lov.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; /** * @author lingting 2020-08-10 17:23 */ -public interface LovBodyMapper extends BaseMapper { +public interface LovBodyMapper extends ExtendMapper { } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java index 161e2477..ab4e50d7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java @@ -1,11 +1,34 @@ package com.hccake.ballcat.admin.modules.lov.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; +import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.lov.model.vo.LovVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; /** * @author lingting 2020-08-10 17:20 */ -public interface LovMapper extends BaseMapper { +public interface LovMapper extends ExtendMapper { + + /** + * 分页查询 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return 分页结果数据 PageResult + */ + default PageResult queryPage(PageParam pageParam, LovQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(Lov.class) + .likeIfPresent(Lov::getKeyword, qo.getKeyword()).eqIfPresent(Lov::getMethod, qo.getMethod()) + .eqIfPresent(Lov::getPosition, qo.getPosition()).likeIfPresent(Lov::getUrl, qo.getUrl()) + .likeIfPresent(Lov::getTitle, qo.getTitle()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java index 17366c54..b0db6f29 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java @@ -1,11 +1,11 @@ package com.hccake.ballcat.admin.modules.lov.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; /** * @author lingting 2020-08-10 17:20 */ -public interface LovSearchMapper extends BaseMapper { +public interface LovSearchMapper extends ExtendMapper { } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java new file mode 100644 index 00000000..37bc49ef --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java @@ -0,0 +1,31 @@ +package com.hccake.ballcat.admin.modules.lov.model.qo; + +import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; +import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lingting 2020-08-12 21:35 + */ +@Data +@ApiModel(value = "lov查询对象") +public class LovQO { + + @ApiModelProperty("标题") + private String title; + + @ApiModelProperty("关键字，唯一，加载lov数据时通过关键字加载") + private String keyword; + + @ApiModelProperty("获取数据时请求路径") + private String url; + + @ApiModelProperty("http请求方式") + private HttpMethod method; + + @ApiModelProperty("http请求参数位置") + private HttpParamsPosition position; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/Vo/LovVo.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovInfoVO.java similarity index 93% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/Vo/LovVo.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovInfoVO.java index d5fddedc..2d549045 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/Vo/LovVo.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovInfoVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.lov.model.Vo; +package com.hccake.ballcat.admin.modules.lov.model.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; @@ -19,8 +19,8 @@ import java.util.List; */ @Data @Accessors(chain = true) -@ApiModel(value = "lov vo") -public class LovVo { +@ApiModel(value = "lov info vo") +public class LovInfoVO { @ApiModelProperty("标题") private String title; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovVO.java new file mode 100644 index 00000000..faa538c8 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovVO.java @@ -0,0 +1,63 @@ +package com.hccake.ballcat.admin.modules.lov.model.vo; + +import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; +import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import java.time.LocalDateTime; + +/** + * @author lingting 2020-08-12 21:35 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "lov vo") +public class LovVO { + + @ApiModelProperty("编号") + private Long id; + + @ApiModelProperty("标题") + private String title; + + @ApiModelProperty("关键字，唯一，加载lov数据时通过关键字加载") + private String keyword; + + @NotBlank + @ApiModelProperty("获取数据时请求路径") + private String url; + + @NotBlank + @ApiModelProperty("http请求方式") + private HttpMethod method; + + @NotBlank + @ApiModelProperty("http请求参数位置") + private HttpParamsPosition position; + + @ApiModelProperty("数据的key") + private String key; + + @ApiModelProperty("固定请求参数，请设置 jsonString, 默认值 {}") + private String fixedParams; + + @ApiModelProperty("是否需要多选") + private Boolean multiple; + + @ApiModelProperty("是否需要返回数据, false则不会有确定按钮") + private Boolean ret; + + @ApiModelProperty("返回数据的字段") + private String retField; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovBodyService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovBodyService.java index 3e3b9923..c1dd7d6b 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovBodyService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovBodyService.java @@ -1,11 +1,11 @@ package com.hccake.ballcat.admin.modules.lov.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** * @author lingting 2020-08-10 17:20 */ -public interface LovBodyService extends IService { +public interface LovBodyService extends ExtendService { } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovSearchService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovSearchService.java index d21ca5ac..bfa1ae1f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovSearchService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovSearchService.java @@ -1,11 +1,11 @@ package com.hccake.ballcat.admin.modules.lov.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** * @author lingting 2020-08-10 17:20 */ -public interface LovSearchService extends IService { +public interface LovSearchService extends ExtendService { } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java index a1bd8b40..d524cf6f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java @@ -1,26 +1,29 @@ package com.hccake.ballcat.admin.modules.lov.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.hccake.ballcat.admin.modules.lov.model.Vo.LovVo; import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.lov.model.vo.LovInfoVO; +import com.hccake.ballcat.admin.modules.lov.model.vo.LovVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; /** * @author lingting 2020-08-10 17:20 */ -public interface LovService extends IService { +public interface LovService extends ExtendService { /** - * 查询分页数据 - * @param page 分页参数 - * @param entity 查询参数对象 - * @return IPage 分页数据 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param qo 查询参数对象 + * @return PageResult 分页数据 */ - IPage selectPage(IPage page, Lov entity); + PageResult queryPage(PageParam pageParam, LovQO qo); /** * 更新实体类 @@ -56,6 +59,6 @@ public interface LovService extends IService { * @return com.hccake.ballcat.admin.modules.lov.model.Vo.LovVo * @author lingting 2020-08-12 21:38 */ - LovVo getDataByKeyword(String keyword); + LovInfoVO getDataByKeyword(String keyword); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovBodyServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovBodyServiceImpl.java index 3cdb5915..b2344966 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovBodyServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovBodyServiceImpl.java @@ -1,17 +1,15 @@ package com.hccake.ballcat.admin.modules.lov.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.lov.mapper.LovBodyMapper; import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; import com.hccake.ballcat.admin.modules.lov.service.LovBodyService; -import lombok.RequiredArgsConstructor; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; /** * @author lingting 2020-08-10 17:21 */ @Service -@RequiredArgsConstructor -public class LovBodyServiceImpl extends ServiceImpl implements LovBodyService { +public class LovBodyServiceImpl extends ExtendServiceImpl implements LovBodyService { } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovSearchServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovSearchServiceImpl.java index 84961092..a6c1857c 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovSearchServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovSearchServiceImpl.java @@ -1,17 +1,15 @@ package com.hccake.ballcat.admin.modules.lov.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.lov.mapper.LovSearchMapper; import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; import com.hccake.ballcat.admin.modules.lov.service.LovSearchService; -import lombok.RequiredArgsConstructor; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; /** * @author lingting 2020-08-10 17:21 */ @Service -@RequiredArgsConstructor -public class LovSearchServiceImpl extends ServiceImpl implements LovSearchService { +public class LovSearchServiceImpl extends ExtendServiceImpl implements LovSearchService { } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java index aec68a5e..b6132750 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java @@ -1,19 +1,21 @@ package com.hccake.ballcat.admin.modules.lov.service.impl; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.lov.mapper.LovMapper; -import com.hccake.ballcat.admin.modules.lov.model.Vo.LovVo; import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.lov.model.vo.LovInfoVO; +import com.hccake.ballcat.admin.modules.lov.model.vo.LovVO; import com.hccake.ballcat.admin.modules.lov.service.LovBodyService; import com.hccake.ballcat.admin.modules.lov.service.LovSearchService; import com.hccake.ballcat.admin.modules.lov.service.LovService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.core.result.BaseResultCode; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,25 +30,15 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class LovServiceImpl extends ServiceImpl implements LovService { +public class LovServiceImpl extends ExtendServiceImpl implements LovService { private final LovBodyService bodyService; private final LovSearchService searchService; @Override - public IPage selectPage(IPage page, Lov entity) { - return baseMapper.selectPage(page, Wrappers.lambdaQuery() - - .like(StrUtil.isNotEmpty(entity.getKeyword()), Lov::getKeyword, entity.getKeyword()) - - .eq(entity.getMethod() != null, Lov::getMethod, entity.getMethod()) - - .eq(entity.getPosition() != null, Lov::getPosition, entity.getPosition()) - - .like(StrUtil.isNotEmpty(entity.getUrl()), Lov::getUrl, entity.getUrl()) - - .like(StrUtil.isNotEmpty(entity.getTitle()), Lov::getTitle, entity.getTitle())); + public PageResult queryPage(PageParam pageParam, LovQO qo) { + return baseMapper.queryPage(pageParam, qo); } @Override @@ -128,12 +120,13 @@ public class LovServiceImpl extends ServiceImpl implements LovSe } @Override - public LovVo getDataByKeyword(String keyword) { + public LovInfoVO getDataByKeyword(String keyword) { Lov lov = baseMapper.selectOne(Wrappers.lambdaQuery().eq(Lov::getKeyword, keyword)); if (lov != null) { - LovVo vo = new LovVo().setKey(lov.getKey()).setFixedParams(lov.getFixedParams()).setMethod(lov.getMethod()) - .setKeyword(lov.getKeyword()).setMultiple(lov.getMultiple()).setPosition(lov.getPosition()) - .setRet(lov.getRet()).setTitle(lov.getTitle()).setUrl(lov.getUrl()).setRetField(lov.getRetField()); + LovInfoVO vo = new LovInfoVO().setKey(lov.getKey()).setFixedParams(lov.getFixedParams()) + .setMethod(lov.getMethod()).setKeyword(lov.getKeyword()).setMultiple(lov.getMultiple()) + .setPosition(lov.getPosition()).setRet(lov.getRet()).setTitle(lov.getTitle()).setUrl(lov.getUrl()) + .setRetField(lov.getRetField()); vo.setBodyList(bodyService.list(Wrappers.lambdaQuery().eq(LovBody::getKeyword, lov.getKeyword()))); vo.setSearchList( searchService.list(Wrappers.lambdaQuery().eq(LovSearch::getKeyword, lov.getKeyword()))); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/AnnouncementController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/AnnouncementController.java index 2ffa7972..61cb25f1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/AnnouncementController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/AnnouncementController.java @@ -1,7 +1,5 @@ package com.hccake.ballcat.admin.modules.notify.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hccake.ballcat.admin.modules.notify.model.dto.AnnouncementDTO; import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement; import com.hccake.ballcat.admin.modules.notify.model.qo.AnnouncementQO; @@ -11,6 +9,8 @@ import com.hccake.ballcat.admin.oauth.util.SecurityUtils; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; @@ -38,15 +38,15 @@ public class AnnouncementController { /** * 分页查询 - * @param page 分页对象 + * @param pageParam 分页对象 * @param announcementQO 公告信息查询对象 * @return R 通用返回体 */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('notify:announcement:read')") - public R> getAnnouncementPage(Page page, AnnouncementQO announcementQO) { - return R.ok(announcementService.selectPageVo(page, announcementQO)); + public R> getAnnouncementPage(PageParam pageParam, AnnouncementQO announcementQO) { + return R.ok(announcementService.queryPage(pageParam, announcementQO)); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/UserAnnouncementController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/UserAnnouncementController.java index 4f4f9256..778236b1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/UserAnnouncementController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/UserAnnouncementController.java @@ -1,23 +1,19 @@ package com.hccake.ballcat.admin.modules.notify.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement; import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO; import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO; import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * 用户公告表 * @@ -33,15 +29,16 @@ public class UserAnnouncementController { /** * 分页查询 - * @param page 分页对象 + * @param pageParam 分页参数 * @param userAnnouncementQO 用户公告表查询对象 * @return R 通用返回体 */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('notify:userannouncement:read')") - public R> getUserAnnouncementPage(Page page, UserAnnouncementQO userAnnouncementQO) { - return R.ok(userAnnouncementService.selectPageVo(page, userAnnouncementQO)); + public R> getUserAnnouncementPage(PageParam pageParam, + UserAnnouncementQO userAnnouncementQO) { + return R.ok(userAnnouncementService.queryPage(pageParam, userAnnouncementQO)); } } \ No newline at end of file diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/AnnouncementMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/AnnouncementMapper.java index 4aa6044c..5beb062f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/AnnouncementMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/AnnouncementMapper.java @@ -1,11 +1,14 @@ package com.hccake.ballcat.admin.modules.notify.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement; +import com.hccake.ballcat.admin.modules.notify.model.qo.AnnouncementQO; import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,15 +18,23 @@ import java.util.List; * * @author hccake 2020-12-15 17:01:15 */ -public interface AnnouncementMapper extends BaseMapper { +public interface AnnouncementMapper extends ExtendMapper { /** * 分页查询 - * @param page 分页对象 - * @param wrapper 查询wrapper - * @return IPage VO分页数据 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return 分页结果数据 PageResult */ - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + default PageResult queryPage(PageParam pageParam, AnnouncementQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(Announcement.class) + .likeIfPresent(Announcement::getTitle, qo.getTitle()) + .inIfPresent(Announcement::getStatus, (Object[]) qo.getStatus()) + .eqIfPresent(Announcement::getRecipientFilterType, qo.getRecipientFilterType()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } /** * 根据参数获取当前用户拉取过，或者未拉取过的有效的公告信息 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/UserAnnouncementMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/UserAnnouncementMapper.java index fa87b1b3..cdaf0746 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/UserAnnouncementMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/UserAnnouncementMapper.java @@ -1,26 +1,34 @@ package com.hccake.ballcat.admin.modules.notify.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement; +import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO; import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO; -import org.apache.ibatis.annotations.Param; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; /** * 用户公告表 * * @author hccake 2020-12-25 08:04:53 */ -public interface UserAnnouncementMapper extends BaseMapper { +public interface UserAnnouncementMapper extends ExtendMapper { /** * 分页查询 - * @param page 分页对象 - * @param wrapper 查询wrapper - * @return IPage VO分页数据 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return 分页结果数据 PageResult */ - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + default PageResult queryPage(PageParam pageParam, UserAnnouncementQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(UserAnnouncement.class) + .eqIfPresent(UserAnnouncement::getId, qo.getId()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } \ No newline at end of file diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/Announcement.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/Announcement.java index ff1866a1..701a7c9c 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/Announcement.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/Announcement.java @@ -1,7 +1,11 @@ package com.hccake.ballcat.admin.modules.notify.model.entity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.hccake.extend.mybatis.plus.alias.TableAlias; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,12 +19,15 @@ import java.util.List; * @author hccake 2020-12-15 17:01:15 */ @Data +@TableAlias(Announcement.TABLE_ALIAS) @TableName(value = "notify_announcement", autoResultMap = true) @ApiModel(value = "公告信息") public class Announcement { private static final long serialVersionUID = 1L; + public final static String TABLE_ALIAS = "a"; + /** * ID */ diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/UserAnnouncement.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/UserAnnouncement.java index 31f0f3cc..dab86df5 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/UserAnnouncement.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/model/entity/UserAnnouncement.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.hccake.extend.mybatis.plus.alias.TableAlias; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,12 +17,15 @@ import java.time.LocalDateTime; * @author hccake 2020-12-25 08:04:53 */ @Data +@TableAlias(UserAnnouncement.TABLE_ALIAS) @TableName("notify_user_announcement") @ApiModel(value = "用户公告表") public class UserAnnouncement { private static final long serialVersionUID = 1L; + public final static String TABLE_ALIAS = "ua"; + /** * ID */ diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/AnnouncementService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/AnnouncementService.java index df3598d3..0defb88b 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/AnnouncementService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/AnnouncementService.java @@ -1,11 +1,12 @@ package com.hccake.ballcat.admin.modules.notify.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.notify.model.dto.AnnouncementDTO; import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement; -import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementVO; import com.hccake.ballcat.admin.modules.notify.model.qo.AnnouncementQO; +import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -15,15 +16,15 @@ import java.util.List; * * @author hccake 2020-12-15 17:01:15 */ -public interface AnnouncementService extends IService { +public interface AnnouncementService extends ExtendService { /** - * 根据QueryObeject查询分页数据 + * 根据QueryObject查询分页数据 * @param page 分页参数 * @param qo 查询参数对象 - * @return IPage 分页数据 + * @return PageResult 分页数据 */ - IPage selectPageVo(IPage page, AnnouncementQO qo); + PageResult queryPage(PageParam page, AnnouncementQO qo); /** * 创建公告 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/UserAnnouncementService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/UserAnnouncementService.java index 0c31759a..140f71f7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/UserAnnouncementService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/UserAnnouncementService.java @@ -1,25 +1,26 @@ package com.hccake.ballcat.admin.modules.notify.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement; -import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO; import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO; +import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** * 用户公告表 * * @author hccake 2020-12-25 08:04:53 */ -public interface UserAnnouncementService extends IService { +public interface UserAnnouncementService extends ExtendService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 - * @return IPage 分页数据 + * @return PageResult 分页数据 */ - IPage selectPageVo(IPage page, UserAnnouncementQO qo); + PageResult queryPage(PageParam pageParam, UserAnnouncementQO qo); /** * 根据用户ID和公告id初始化一个新的用户公告关联对象 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java index 138ed68b..d1a09062 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java @@ -2,12 +2,8 @@ package com.hccake.ballcat.admin.modules.notify.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.admin.constants.AnnouncementStatusEnum; import com.hccake.ballcat.admin.modules.notify.event.AnnouncementCloseEvent; @@ -25,9 +21,12 @@ import com.hccake.ballcat.admin.modules.notify.service.AnnouncementService; import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService; import com.hccake.ballcat.admin.modules.sys.service.FileService; import com.hccake.ballcat.common.core.constant.enums.BooleanEnum; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.SystemResultCode; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationEventPublisher; @@ -50,11 +49,9 @@ import java.util.List; @Slf4j @Service @RequiredArgsConstructor -public class AnnouncementServiceImpl extends ServiceImpl +public class AnnouncementServiceImpl extends ExtendServiceImpl implements AnnouncementService { - private final static String TABLE_ALIAS_PREFIX = "a."; - private final ApplicationEventPublisher publisher; private final FileService fileService; @@ -63,18 +60,13 @@ public class AnnouncementServiceImpl extends ServiceImpl 分页数据 + * @return PageResult 分页数据 */ @Override - public IPage selectPageVo(IPage page, AnnouncementQO qo) { - QueryWrapper wrapper = Wrappers.query() - .like(StrUtil.isNotBlank(qo.getTitle()), TABLE_ALIAS_PREFIX + "title", qo.getTitle()) - .in(qo.getStatus() != null && qo.getStatus().length > 0, TABLE_ALIAS_PREFIX + "status", qo.getStatus()) - .eq(ObjectUtil.isNotNull(qo.getRecipientFilterType()), TABLE_ALIAS_PREFIX + "recipient_filter_type", - qo.getRecipientFilterType()); - return baseMapper.selectPageVo(page, wrapper); + public PageResult queryPage(PageParam pageParam, AnnouncementQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/UserAnnouncementServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/UserAnnouncementServiceImpl.java index daaf8e27..7848b363 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/UserAnnouncementServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/UserAnnouncementServiceImpl.java @@ -1,15 +1,13 @@ package com.hccake.ballcat.admin.modules.notify.service.impl; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement; -import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO; -import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO; import com.hccake.ballcat.admin.modules.notify.mapper.UserAnnouncementMapper; +import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement; +import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO; +import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO; import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -20,22 +18,18 @@ import java.time.LocalDateTime; * @author hccake 2020-12-25 08:04:53 */ @Service -public class UserAnnouncementServiceImpl extends ServiceImpl +public class UserAnnouncementServiceImpl extends ExtendServiceImpl implements UserAnnouncementService { - private final static String TABLE_ALIAS_PREFIX = "ua."; - /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 - * @return IPage 分页数据 + * @return PageResult 分页数据 */ @Override - public IPage selectPageVo(IPage page, UserAnnouncementQO qo) { - QueryWrapper wrapper = Wrappers.query().eq(ObjectUtil.isNotNull(qo.getId()), - TABLE_ALIAS_PREFIX + "id", qo.getId()); - return baseMapper.selectPageVo(page, wrapper); + public PageResult queryPage(PageParam pageParam, UserAnnouncementQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java index 5ef4f285..fc619ee4 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java @@ -1,14 +1,15 @@ package com.hccake.ballcat.admin.modules.sys.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; +import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigVO; +import com.hccake.ballcat.admin.modules.sys.service.SysConfigService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.R; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.hccake.ballcat.admin.modules.sys.service.SysConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -31,15 +32,15 @@ public class SysConfigController { /** * 分页查询 - * @param page 分页对象 - * @param sysConfig 系统配置表 - * @return + * @param pageParam 分页参数 + * @param sysConfigQO 系统配置表 + * @return R> */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('sys:config:read')") - public R> getSysConfigPage(Page page, SysConfig sysConfig) { - return R.ok(sysConfigService.page(page, Wrappers.query(sysConfig))); + public R> getSysConfigPage(PageParam pageParam, SysConfigQO sysConfigQO) { + return R.ok(sysConfigService.queryPage(pageParam, sysConfigQO)); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java index 4009d75f..dc241450 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java @@ -1,15 +1,17 @@ package com.hccake.ballcat.admin.modules.sys.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hccake.ballcat.admin.modules.sys.manager.SysDictManager; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; @@ -57,15 +59,15 @@ public class SysDictController { /** * 分页查询 - * @param page 分页对象 - * @param sysDictQO 字典表 - * @return R + * @param pageParam 分页参数 + * @param sysDictQO 字典查询参数 + * @return R> */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@per.hasPermission('sys:dict:read')") - public R> getSysDictPage(Page page, SysDictQO sysDictQO) { - return R.ok(sysDictManager.dictPage(page, sysDictQO)); + public R> getSysDictPage(PageParam pageParam, SysDictQO sysDictQO) { + return R.ok(sysDictManager.dictPage(pageParam, sysDictQO)); } /** @@ -111,15 +113,16 @@ public class SysDictController { /** * 分页查询 - * @param page 分页对象 + * @param pageParam 分页参数 * @param dictCode 字典标识 * @return R */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/item/page") @PreAuthorize("@per.hasPermission('sys:dict:read')") - public R> getSysDictItemPage(Page page, @RequestParam("dictCode") String dictCode) { - return R.ok(sysDictManager.dictItemPage(page, dictCode)); + public R> getSysDictItemPage(PageParam pageParam, + @RequestParam("dictCode") String dictCode) { + return R.ok(sysDictManager.dictItemPage(pageParam, dictCode)); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java index d6d5c869..b266143c 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java @@ -1,23 +1,24 @@ package com.hccake.ballcat.admin.modules.sys.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hccake.ballcat.admin.constants.SysRoleConst; import com.hccake.ballcat.admin.modules.sys.model.converter.SysRoleConverter; import com.hccake.ballcat.admin.modules.sys.model.dto.SysRoleUpdateDTO; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysRoleVO; import com.hccake.ballcat.admin.modules.sys.service.SysPermissionService; import com.hccake.ballcat.admin.modules.sys.service.SysRolePermissionService; import com.hccake.ballcat.admin.modules.sys.service.SysRoleService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; -import com.hccake.ballcat.common.core.vo.SelectData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -45,13 +46,13 @@ public class SysRoleController { /** * 分页查询角色信息 - * @param page 分页对象 - * @return 分页对象 + * @param pageParam 分页参数 + * @return PageResult 分页结果 */ @GetMapping("/page") @PreAuthorize("@per.hasPermission('sys:sysrole:read')") - public R> getRolePage(Page page, SysRoleQO sysRoleQo) { - return R.ok(sysRoleService.page(page, sysRoleQo)); + public R> getRolePage(PageParam pageParam, SysRoleQO sysRoleQo) { + return R.ok(sysRoleService.queryPage(pageParam, sysRoleQo)); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java index 52bb5702..e5d72cae 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java @@ -16,10 +16,12 @@ import com.hccake.ballcat.admin.modules.sys.service.SysUserService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.common.core.result.SystemResultCode; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.SelectData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -54,13 +56,13 @@ public class SysUserController { /** * 分页查询用户 - * @param page 参数集 + * @param pageParam 参数集 * @return 用户集合 */ @GetMapping("/page") @PreAuthorize("@per.hasPermission('sys:sysuser:read')") - public R> getUserPage(Page page, SysUserQO qo) { - return R.ok(sysUserService.selectPageVo(page, qo)); + public R> getUserPage(PageParam pageParam, SysUserQO qo) { + return R.ok(sysUserService.queryPage(pageParam, qo)); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java index 2fbcf237..d8ec74bd 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java @@ -2,9 +2,7 @@ package com.hccake.ballcat.admin.modules.sys.manager; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hccake.ballcat.admin.modules.sys.event.DictChangeEvent; import com.hccake.ballcat.admin.modules.sys.model.converter.SysDictConverter; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; @@ -12,9 +10,13 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO; import com.hccake.ballcat.admin.modules.sys.model.vo.DictItemVO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO; import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService; import com.hccake.ballcat.admin.modules.sys.service.SysDictService; import com.hccake.ballcat.common.core.constant.enums.BooleanEnum; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.core.result.BaseResultCode; import lombok.RequiredArgsConstructor; @@ -45,12 +47,12 @@ public class SysDictManager { /** * 字典表分页 - * @param page 分页参数 + * @param pageParam 分页参数 * @param sysDictQO 查询参数 * @return 字典表分页数据 */ - public IPage dictPage(Page page, SysDictQO sysDictQO) { - return sysDictService.page(page, sysDictQO); + public PageResult dictPage(PageParam pageParam, SysDictQO sysDictQO) { + return sysDictService.queryPage(pageParam, sysDictQO); } /** @@ -105,12 +107,12 @@ public class SysDictManager { /** * 字典项分页 - * @param page 分页属性 + * @param pageParam 分页属性 * @param dictCode 字典标识 * @return 字典项分页数据 */ - public IPage dictItemPage(Page page, String dictCode) { - return sysDictItemService.page(page, dictCode); + public PageResult dictItemPage(PageParam pageParam, String dictCode) { + return sysDictItemService.queryPage(pageParam, dictCode); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java index 0398e0bc..c83540ef 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java @@ -1,7 +1,13 @@ package com.hccake.ballcat.admin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; /** * 系统配置表 @@ -9,6 +15,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author ballcat code generator * @date 2019-10-14 17:42:23 */ -public interface SysConfigMapper extends BaseMapper { +public interface SysConfigMapper extends ExtendMapper { + + /** + * 分页查询 + * @param pageParam 分页参数 + * @param sysConfigQO 查询参数 + * @return PageResult + */ + default PageResult queryPage(PageParam pageParam, SysConfigQO sysConfigQO) { + IPage page = this.prodPage(pageParam); + this.selectByPage(page, Wrappers.emptyWrapper()); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java index e9edd88b..f54e7562 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java @@ -1,11 +1,13 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; -import com.hccake.ballcat.common.core.vo.SelectData; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; /** * 字典项 @@ -13,13 +15,20 @@ import java.util.List; * @author hccake * @date 2020-03-26 18:40:20 */ -public interface SysDictItemMapper extends BaseMapper { +public interface SysDictItemMapper extends ExtendMapper { /** - * 根据字典标识查询对应字典选择项 + * 分页查询 + * @param pageParam 分页参数 * @param dictCode 字典标识 - * @return 对应字典项的SelectData + * @return PageResult */ - List querySelectDataByDictCode(@Param("dictCode") String dictCode); + default PageResult queryPage(PageParam pageParam, String dictCode) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(SysDictItem.class).eq(SysDictItem::getDictCode, + dictCode); + this.selectByPage(page, wrapper); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java index e4d1b15e..70f3fe54 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java @@ -1,7 +1,15 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; +import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; /** * 字典表 @@ -9,6 +17,21 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; * @author hccake * @date 2020-03-26 18:40:20 */ -public interface SysDictMapper extends BaseMapper { +public interface SysDictMapper extends ExtendMapper { + + /** + * 分页查询 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return PageResult + */ + default PageResult queryPage(PageParam pageParam, SysDictQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(SysDict.class) + .like(StrUtil.isNotBlank(qo.getCode()), SysDict::getCode, qo.getCode()) + .like(StrUtil.isNotBlank(qo.getTitle()), SysDict::getTitle, qo.getTitle()); + this.selectByPage(page, wrapper); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java index 5b80000a..ed6809fb 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * * @author hccake 2020-09-23 12:09:43 */ -public interface SysOrganizationMapper extends BaseMapper { +public interface SysOrganizationMapper extends ExtendMapper { /** * 跟随父节点移动子节点 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java index 1cf15b87..ffbb22cc 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java @@ -1,22 +1,22 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysPermission; import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import java.util.List; /** * 菜单权限表 Mapper 接口 * - * @author + * @author hccake */ -public interface SysPermissionMapper extends BaseMapper { +public interface SysPermissionMapper extends ExtendMapper { /** * 通过角色ID查询权限 * @param roleCode 角色ID - * @return + * @return 指定角色拥有的权限列表 */ List listPermissionVOsByRoleCode(String roleCode); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java index 1d58943c..3b06abaa 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java @@ -1,8 +1,16 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysRoleVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import java.util.List; @@ -14,11 +22,28 @@ import java.util.List; * @author ballcat * @since 2017-10-29 */ -public interface SysRoleMapper extends BaseMapper { +public interface SysRoleMapper extends ExtendMapper { + + /** + * 分页查询 + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return PageResult + */ + default PageResult queryPage(PageParam pageParam, SysRoleQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .like(StrUtil.isNotBlank(qo.getName()), SysRole::getName, qo.getName()) + .like(StrUtil.isNotBlank(qo.getCode()), SysRole::getCode, qo.getCode()) + .between(StrUtil.isNotBlank(qo.getStartTime()) && StrUtil.isNotBlank(qo.getEndTime()), + SysRole::getCreateTime, qo.getStartTime(), qo.getEndTime()); + this.selectByPage(page, wrapper); + return new PageResult<>(page.getRecords(), page.getTotal()); + } /** * 获取角色下拉框数据 - * @return + * @return 下拉选择框数据集合 */ List> getSelectData(); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java index 0c4520ac..28fe297c 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java @@ -1,16 +1,16 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; /** *

* 角色菜单表 Mapper 接口 *

* - * @author + * @author hccake * @since 2017-10-29 */ -public interface SysRolePermissionMapper extends BaseMapper { +public interface SysRolePermissionMapper extends ExtendMapper { } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java index e946cbd6..dbf049e9 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java @@ -1,12 +1,17 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO; import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserVO; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.constant.GlobalConstants; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,15 +21,29 @@ import java.util.List; * * @author Hccake */ -public interface SysUserMapper extends BaseMapper { +public interface SysUserMapper extends ExtendMapper { /** * 分页查询 - * @param page 分页对象 - * @param wrapper 查询条件wrapper - * @return Page + * @param pageParam 分页参数 + * @param qo 查询对象 + * @return PageResult */ - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper wrapper); + default PageResult queryPage(PageParam pageParam, SysUserQO qo) { + IPage page = this.prodPage(pageParam); + LambdaAliasQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(SysUser.class); + wrapperX.eq(SysUser::getDeleted, GlobalConstants.NOT_DELETED_FLAG) + .likeIfPresent(SysUser::getUsername, qo.getUsername()).likeIfPresent(SysUser::getEmail, qo.getEmail()) + .likeIfPresent(SysUser::getPhone, qo.getPhone()).likeIfPresent(SysUser::getNickname, qo.getNickname()) + .eqIfPresent(SysUser::getStatus, qo.getStatus()).eqIfPresent(SysUser::getSex, qo.getSex()) + .eqIfPresent(SysUser::getType, qo.getType()) + .inIfPresent(SysUser::getOrganizationId, qo.getOrganizationId()); + if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { + wrapperX.between(SysUser::getCreateTime, qo.getStartTime(), qo.getEndTime()); + } + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } /** * 根据RoleCode 查询对应用户 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java index ed1c4fc4..a0c18010 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java @@ -1,8 +1,8 @@ package com.hccake.ballcat.admin.modules.sys.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; import com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,30 +12,30 @@ import java.util.List; * 用户角色表 Mapper 接口 *

* - * @author + * @author hccake * @since 2017-10-29 */ -public interface SysUserRoleMapper extends BaseMapper { +public interface SysUserRoleMapper extends ExtendMapper { /** - * 通过用户ID，查询角色s - * @param userId - * @return + * 通过用户ID，查询角色 + * @param userId 用户ID + * @return 用户拥有的角色集合 */ List getRoles(Integer userId); /** * 删除用户关联关系 - * @param userId - * @return + * @param userId 用户ID + * @return boolean 删除是否成功 */ Boolean deleteByUserId(@Param("userId") Integer userId); /** * 插入用户关联关系 - * @param userId - * @param roleCodes - * @return + * @param userId 用户ID + * @param roleCodes 角色标识集合 + * @return boolean 插入是否成功 */ Boolean insertUserRoles(@Param("userId") Integer userId, @Param("roleCodes") List roleCodes); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java index 689f0b70..e8f8b1a2 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java @@ -1,6 +1,7 @@ package com.hccake.ballcat.admin.modules.sys.model.entity; import com.baomidou.mybatisplus.annotation.*; +import com.hccake.extend.mybatis.plus.alias.TableAlias; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,6 +16,7 @@ import java.time.LocalDateTime; * @date 2019-09-12 20:39:31 */ @Data +@TableAlias("su") @TableName("sys_user") @ApiModel(value = "系统用户表") public class SysUser implements Serializable { diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java new file mode 100644 index 00000000..f138b7b9 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java @@ -0,0 +1,35 @@ +package com.hccake.ballcat.admin.modules.sys.model.qo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 系统配置表 + * + * @author ballcat code generator + * @date 2019-10-14 17:42:23 + */ +@Data +@ApiModel(value = "基础配置") +public class SysConfigQO { + + /** + * 配置名称 + */ + @ApiModelProperty(value = "配置名称") + private String name; + + /** + * 配置在缓存中的key名 + */ + @ApiModelProperty(value = "配置在缓存中的key名") + private String confKey; + + /** + * 分类 + */ + @ApiModelProperty(value = "分类") + private String category; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigVO.java new file mode 100644 index 00000000..171903e1 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigVO.java @@ -0,0 +1,67 @@ +package com.hccake.ballcat.admin.modules.sys.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 系统配置表 + * + * @author ballcat code generator + * @date 2019-10-14 17:42:23 + */ +@Data +@ApiModel(value = "基础配置") +public class SysConfigVO { + + /** + * 主键 + */ + @ApiModelProperty(value = "主键ID") + private Integer id; + + /** + * 配置名称 + */ + @ApiModelProperty(value = "配置名称") + private String name; + + /** + * 配置在缓存中的key名 + */ + @ApiModelProperty(value = "配置在缓存中的key名") + private String confKey; + + /** + * 配置值 + */ + @ApiModelProperty(value = "配置值") + private String confValue; + + /** + * 分类 + */ + @ApiModelProperty(value = "分类") + private String category; + + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String description; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + private LocalDateTime updateTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemVO.java new file mode 100644 index 00000000..b81668d2 --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemVO.java @@ -0,0 +1,79 @@ +package com.hccake.ballcat.admin.modules.sys.model.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Map; + +/** + * 字典项 + * + * @author hccake + * @date 2020-03-26 18:40:20 + */ +@Data +@ApiModel(value = "字典项") +public class SysDictItemVO { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ApiModelProperty(value = "ID") + private Integer id; + + /** + * 字典标识 + */ + @ApiModelProperty(value = "字典标识") + private String dictCode; + + /** + * 数据值 + */ + @ApiModelProperty(value = "数据值") + private String value; + + /** + * 文本值 + */ + @ApiModelProperty(value = "文本值") + private String name; + + /** + * 附加属性值 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + @ApiModelProperty(value = "附加属性值") + private Map attributes; + + /** + * 排序（升序） + */ + @ApiModelProperty(value = "排序（升序）") + private Integer sort; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remarks; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictVO.java new file mode 100644 index 00000000..5c7712ce --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictVO.java @@ -0,0 +1,75 @@ +package com.hccake.ballcat.admin.modules.sys.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 字典表 + * + * @author hccake + * @date 2020-03-26 18:40:20 + */ +@Data +@ApiModel(value = "字典表") +public class SysDictVO { + + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + @ApiModelProperty(value = "编号") + private Integer id; + + /** + * 标识 + */ + @ApiModelProperty(value = "标识") + private String code; + + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String title; + + /** + * Hash值 + */ + @ApiModelProperty(value = "Hash值") + private String hashCode; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remarks; + + /** + * 可编辑的 + */ + @ApiModelProperty(value = "1：是 0：否") + private Integer editable; + + /** + * 数据类型 + */ + @ApiModelProperty("数据类型,1:Number 2:String 3:Boolean") + private Integer valueType; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRoleVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRoleVO.java new file mode 100644 index 00000000..77d815fa --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRoleVO.java @@ -0,0 +1,47 @@ +package com.hccake.ballcat.admin.modules.sys.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + *

+ * 角色表 + *

+ * + * @author ballcat + * @since 2017-10-29 + */ +@Data +@ApiModel(value = "角色") +public class SysRoleVO { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "角色编号") + private Integer id; + + @ApiModelProperty(value = "角色名称") + private String name; + + @ApiModelProperty(value = "角色标识") + private String code; + + @ApiModelProperty(value = "角色备注") + private String note; + + @ApiModelProperty("角色类型，1：系统角色 2：业务角色") + private Integer type; + + @ApiModelProperty("数据权限：1全部，2本人，3本人及子部门，4本部门") + private Integer scopeType; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java index c8739c4a..45c88e62 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java @@ -1,7 +1,11 @@ package com.hccake.ballcat.admin.modules.sys.service; import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.baomidou.mybatisplus.extension.service.IService; +import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** * 系统配置表 @@ -9,11 +13,19 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author ballcat code generator * @date 2019-10-14 17:42:23 */ -public interface SysConfigService extends IService { +public interface SysConfigService extends ExtendService { + + /** + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param sysConfigQO 查询参数对象 + * @return 分页数据 + */ + PageResult queryPage(PageParam pageParam, SysConfigQO sysConfigQO); /** * 根据配置key获取对应value - * @param confKey + * @param confKey 配置key * @return confValue */ String getConfValueByKey(String confKey); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java index 3a0864b6..74684ca4 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java @@ -1,8 +1,10 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -12,20 +14,20 @@ import java.util.List; * @author hccake * @date 2020-03-26 18:40:20 */ -public interface SysDictItemService extends IService { +public interface SysDictItemService extends ExtendService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param dictCode 查询参数对象 * @return 分页数据 */ - IPage page(IPage page, String dictCode); + PageResult queryPage(PageParam pageParam, String dictCode); /** * 根据Code查询对应字典项数据 - * @param dictCode - * @return + * @param dictCode 字典标识 + * @return 该字典对应的字典项集合 */ List getByDictCode(String dictCode); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java index 111fd4a2..9da54356 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java @@ -1,9 +1,11 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -13,15 +15,15 @@ import java.util.List; * @author hccake * @date 2020-03-26 18:40:20 */ -public interface SysDictService extends IService { +public interface SysDictService extends ExtendService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 - * @return 分页数据 + * @return PageResult 分页数据 */ - IPage page(IPage page, SysDictQO qo); + PageResult queryPage(PageParam pageParam, SysDictQO qo); /** * 根据字典标识查询 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysOrganizationService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysOrganizationService.java index c0d18bd9..ed0db9b7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysOrganizationService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysOrganizationService.java @@ -1,9 +1,9 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.dto.SysOrganizationDTO; import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization; import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; * * @author hccake 2020-09-23 12:09:43 */ -public interface SysOrganizationService extends IService { +public interface SysOrganizationService extends ExtendService { /** * 返回组织架构的树形结构 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java index 7756c05a..19b82034 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java @@ -1,8 +1,8 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.entity.SysPermission; import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -11,10 +11,10 @@ import java.util.List; * 菜单权限表 服务类 *

* - * @author + * @author hccake * @since 2017-10-29 */ -public interface SysPermissionService extends IService { +public interface SysPermissionService extends ExtendService { /** * 通过角色编号查询URL 权限 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java index 4132db2e..cc1785fd 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java @@ -1,23 +1,23 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission; +import com.hccake.extend.mybatis.plus.service.ExtendService; /** *

* 角色菜单表 服务类 *

* - * @author + * @author hccake * @since 2017-10-29 */ -public interface SysRolePermissionService extends IService { +public interface SysRolePermissionService extends ExtendService { /** * 更新角色菜单 * @param roleCode 角色 * @param permissionIds 权限ID数组 - * @return + * @return 更新角色权限关联关系是否成功 */ Boolean saveRolePermissions(String roleCode, Integer[] permissionIds); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java index 066f25dc..af788e43 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java @@ -1,10 +1,12 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysRoleVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -16,26 +18,26 @@ import java.util.List; * @author hccake * @since 2020-01-12 */ -public interface SysRoleService extends IService { +public interface SysRoleService extends ExtendService { /** * 查询系统角色列表 - * @param page 分页对象 + * @param pageParam 分页参数 * @param qo 查询参数 * @return 分页对象 */ - IPage page(IPage page, SysRoleQO qo); + PageResult queryPage(PageParam pageParam, SysRoleQO qo); /** * 通过角色ID，删除角色 - * @param id - * @return + * @param id 角色ID + * @return 删除是否成功 */ Boolean removeRoleById(Integer id); /** * 角色的选择数据 - * @return + * @return 角色下拉列表数据集合 */ List> getSelectData(); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java index 56402a21..ae730ce7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java @@ -1,8 +1,8 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; import com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -11,34 +11,34 @@ import java.util.List; * * 用户角色关联表 */ -public interface SysUserRoleService extends IService { +public interface SysUserRoleService extends ExtendService { /** * 删除用户的角色 - * @param userId - * @return + * @param userId 用户ID + * @return 删除是否程 */ Boolean deleteByUserId(Integer userId); /** * 插入用户角色关联关系 - * @param userId - * @param roleCodes - * @return + * @param userId 用户ID + * @param roleCodes 角色标识集合 + * @return 插入是否成功 */ Boolean insertUserRoles(Integer userId, List roleCodes); /** * 更新用户关联关系 - * @param userId - * @param roleCodes + * @param userId 用户ID + * @param roleCodes 角色标识集合 * @return boolean */ boolean updateUserRoles(Integer userId, List roleCodes); /** * 通过用户ID，查询角色列表 - * @param userId + * @param userId 用户ID * @return List */ List getRoles(Integer userId); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java index 28dcfd36..ad1e47ec 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java @@ -1,14 +1,15 @@ package com.hccake.ballcat.admin.modules.sys.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO; import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserScope; import com.hccake.ballcat.admin.modules.sys.model.dto.UserInfoDTO; import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO; import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserVO; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.service.ExtendService; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -20,15 +21,15 @@ import java.util.List; * @author ballcat code generator * @date 2019-09-12 20:39:31 */ -public interface SysUserService extends IService { +public interface SysUserService extends ExtendService { /** * 根据QueryObject查询系统用户列表 - * @param page 分页参数 + * @param pageParam 分页参数 * @param qo 查询参数对象 - * @return IPage 分页数据 + * @return PageResult 分页数据 */ - IPage selectPageVo(IPage page, SysUserQO qo); + PageResult queryPage(PageParam pageParam, SysUserQO qo); /** * 根据用户名查询用户 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java index 0481862e..3c56e48e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java @@ -1,10 +1,14 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.hccake.ballcat.admin.modules.sys.service.SysConfigService; import com.hccake.ballcat.admin.modules.sys.mapper.SysConfigMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; +import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigVO; +import com.hccake.ballcat.admin.modules.sys.service.SysConfigService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; /** @@ -14,7 +18,18 @@ import org.springframework.stereotype.Service; * @date 2019-10-14 17:42:23 */ @Service -public class SysConfigServiceImpl extends ServiceImpl implements SysConfigService { +public class SysConfigServiceImpl extends ExtendServiceImpl implements SysConfigService { + + /** + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param sysConfigQO 查询参数对象 + * @return 分页数据 + */ + @Override + public PageResult queryPage(PageParam pageParam, SysConfigQO sysConfigQO) { + return baseMapper.queryPage(pageParam, sysConfigQO); + } /** * 根据配置key获取对应value diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java index f47ad383..ec840fed 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java @@ -1,12 +1,13 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.sys.mapper.SysDictItemMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO; import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -18,25 +19,24 @@ import java.util.List; * @date 2020-03-26 18:40:20 */ @Service -public class SysDictItemServiceImpl extends ServiceImpl implements SysDictItemService { +public class SysDictItemServiceImpl extends ExtendServiceImpl + implements SysDictItemService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 - * @param dictCode 查询参数对象 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 + * @param dictCode 字典标识 * @return 分页数据 */ @Override - public IPage page(IPage page, String dictCode) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery().eq(SysDictItem::getDictCode, - dictCode); - return baseMapper.selectPage(page, wrapper); + public PageResult queryPage(PageParam pageParam, String dictCode) { + return baseMapper.queryPage(pageParam, dictCode); } /** * 根据Code查询对应字典项数据 - * @param dictCode - * @return + * @param dictCode 字典标识 + * @return 字典项集合 */ @Override public List getByDictCode(String dictCode) { diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java index 94d1723d..405af4b1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java @@ -1,16 +1,16 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.admin.modules.sys.mapper.SysDictMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO; import com.hccake.ballcat.admin.modules.sys.service.SysDictService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -23,20 +23,17 @@ import java.util.List; * @date 2020-03-26 18:40:20 */ @Service -public class SysDictServiceImpl extends ServiceImpl implements SysDictService { +public class SysDictServiceImpl extends ExtendServiceImpl implements SysDictService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 - * @return 分页数据 + * @return PageResult 分页数据 */ @Override - public IPage page(IPage page, SysDictQO qo) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(qo.getCode()), SysDict::getCode, qo.getCode()) - .like(StrUtil.isNotBlank(qo.getTitle()), SysDict::getTitle, qo.getTitle()); - return baseMapper.selectPage(page, wrapper); + public PageResult queryPage(PageParam pageParam, SysDictQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** @@ -59,7 +56,7 @@ public class SysDictServiceImpl extends ServiceImpl impl if (dictCode == null || dictCode.length == 0) { return new ArrayList<>(); } - return baseMapper.selectList(Wrappers.lambdaQuery().in(SysDict::getCode, dictCode)); + return baseMapper.selectList(Wrappers.lambdaQuery().in(SysDict::getCode, (Object[]) dictCode)); } /** diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysOrganizationServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysOrganizationServiceImpl.java index ea047020..0b64f6f8 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysOrganizationServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysOrganizationServiceImpl.java @@ -2,7 +2,6 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.admin.modules.sys.mapper.SysOrganizationMapper; import com.hccake.ballcat.admin.modules.sys.model.converter.SysOrganizationConverter; @@ -12,6 +11,7 @@ import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree; import com.hccake.ballcat.admin.modules.sys.service.SysOrganizationService; import com.hccake.ballcat.common.core.constant.GlobalConstants; import com.hccake.ballcat.common.core.util.TreeUtil; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -22,11 +22,9 @@ import java.util.List; * @author hccake 2020-09-23 12:09:43 */ @Service -public class SysOrganizationServiceImpl extends ServiceImpl +public class SysOrganizationServiceImpl extends ExtendServiceImpl implements SysOrganizationService { - private final static String TABLE_ALIAS_PREFIX = "o."; - /** * 返回组织架构的树形结构 * @return OrganizationTree diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java index 4ffcbe9f..c86f58f9 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java @@ -2,7 +2,6 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.sys.mapper.SysPermissionMapper; import com.hccake.ballcat.admin.modules.sys.mapper.SysRolePermissionMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysPermission; @@ -11,6 +10,7 @@ import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO; import com.hccake.ballcat.admin.modules.sys.service.SysPermissionService; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.core.result.BaseResultCode; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,12 +22,12 @@ import java.util.List; * 菜单权限表 服务实现类 *

* - * @author + * @author hccake * @since 2017-10-29 */ @Service @RequiredArgsConstructor -public class SysPermissionServiceImpl extends ServiceImpl +public class SysPermissionServiceImpl extends ExtendServiceImpl implements SysPermissionService { private final SysRolePermissionMapper sysRolePermissionMapper; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java index cdeb857a..6e206145 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java @@ -2,31 +2,32 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.sys.mapper.SysRolePermissionMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission; import com.hccake.ballcat.admin.modules.sys.service.SysRolePermissionService; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** *

* 角色菜单表 服务实现类 *

* - * @author + * @author hccake */ @Service -public class SysRolePermissionServiceImpl extends ServiceImpl +public class SysRolePermissionServiceImpl extends ExtendServiceImpl implements SysRolePermissionService { /** * @param roleCode 角色 * @param permissionIds 权限ID集合 - * @return + * @return boolean */ @Override @Transactional(rollbackFor = Exception.class) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java index e5218c1d..f4959cbc 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java @@ -1,17 +1,17 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.admin.modules.sys.mapper.SysRoleMapper; import com.hccake.ballcat.admin.modules.sys.mapper.SysRolePermissionMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission; import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; +import com.hccake.ballcat.admin.modules.sys.model.vo.SysRoleVO; import com.hccake.ballcat.admin.modules.sys.service.SysRoleService; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,30 +28,25 @@ import java.util.List; */ @Service @RequiredArgsConstructor -public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { +public class SysRoleServiceImpl extends ExtendServiceImpl implements SysRoleService { private final SysRolePermissionMapper sysRolePermissionMapper; /** * 查询系统角色列表 - * @param page 分页对象 + * @param pageParam 分页对象 * @param qo 查询参数 * @return 分页对象 */ @Override - public IPage page(IPage page, SysRoleQO qo) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(qo.getName()), SysRole::getName, qo.getName()) - .like(StrUtil.isNotBlank(qo.getCode()), SysRole::getCode, qo.getCode()) - .between(StrUtil.isNotBlank(qo.getStartTime()) && StrUtil.isNotBlank(qo.getEndTime()), - SysRole::getCreateTime, qo.getStartTime(), qo.getEndTime()); - return baseMapper.selectPage(page, wrapper); + public PageResult queryPage(PageParam pageParam, SysRoleQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** * 通过角色ID，删除角色,并清空角色菜单缓存 - * @param id - * @return + * @param id 角色ID + * @return boolean */ @Override @Transactional(rollbackFor = Exception.class) @@ -64,7 +59,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl /** * 角色的选择数据 - * @return + * @return List> */ @Override public List> getSelectData() { diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java index a3bf1889..869e2983 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java @@ -1,11 +1,11 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hccake.ballcat.admin.modules.sys.mapper.SysUserRoleMapper; import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; import com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole; -import com.hccake.ballcat.admin.modules.sys.mapper.SysUserRoleMapper; import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,12 +17,13 @@ import java.util.List; * @author Hccake */ @Service -public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { +public class SysUserRoleServiceImpl extends ExtendServiceImpl + implements SysUserRoleService { /** * 根据UserId删除该用户角色关联关系 - * @param userId - * @return + * @param userId 用户ID + * @return boolean */ @Override public Boolean deleteByUserId(Integer userId) { @@ -31,9 +32,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl roleCodes) { @@ -42,8 +43,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl getRoles(Integer userId) { diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java index e2899b2b..228065eb 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,16 +1,12 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.admin.constants.SysUserConst; import com.hccake.ballcat.admin.modules.sys.checker.AdminUserChecker; @@ -27,8 +23,14 @@ import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO; import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserVO; import com.hccake.ballcat.admin.modules.sys.service.*; import com.hccake.ballcat.admin.oauth.util.SecurityUtils; +import com.hccake.ballcat.common.core.constant.GlobalConstants; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; import com.hccake.ballcat.common.core.util.PasswordUtil; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; @@ -51,7 +53,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SysUserServiceImpl extends ServiceImpl implements SysUserService { +public class SysUserServiceImpl extends ExtendServiceImpl implements SysUserService { private final FileService fileService; @@ -68,31 +70,15 @@ public class SysUserServiceImpl extends ServiceImpl impl @Value("${password.secret-key}") private String secretKey; - private final static String TABLE_ALIAS_PREFIX = "su."; - /** * 根据QueryObject查询分页数据 - * @param page 分页参数 + * @param pageParam 分页参数 * @param qo 查询参数对象 - * @return IPage 分页数据 + * @return PageResult 分页数据 */ @Override - public IPage selectPageVo(IPage page, SysUserQO qo) { - - QueryWrapper wrapper = Wrappers.query().eq(TABLE_ALIAS_PREFIX + "deleted", 0) - .like(ObjectUtil.isNotNull(qo.getUsername()), TABLE_ALIAS_PREFIX + "username", qo.getUsername()) - .like(ObjectUtil.isNotNull(qo.getEmail()), TABLE_ALIAS_PREFIX + "email", qo.getEmail()) - .like(ObjectUtil.isNotNull(qo.getPhone()), TABLE_ALIAS_PREFIX + "phone", qo.getPhone()) - .like(ObjectUtil.isNotNull(qo.getNickname()), TABLE_ALIAS_PREFIX + "nickname", qo.getNickname()) - .eq(ObjectUtil.isNotNull(qo.getStatus()), TABLE_ALIAS_PREFIX + "status", qo.getStatus()) - .eq(ObjectUtil.isNotNull(qo.getSex()), TABLE_ALIAS_PREFIX + "sex", qo.getSex()) - .eq(ObjectUtil.isNotNull(qo.getType()), TABLE_ALIAS_PREFIX + "type", qo.getType()) - .in(CollectionUtil.isNotEmpty(qo.getOrganizationId()), TABLE_ALIAS_PREFIX + "organization_id", - qo.getOrganizationId()); - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapper.between(TABLE_ALIAS_PREFIX + "create_time", qo.getStartTime(), qo.getEndTime()); - } - return baseMapper.selectPageVo(page, wrapper); + public PageResult queryPage(PageParam pageParam, SysUserQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** @@ -139,8 +125,7 @@ public class SysUserServiceImpl extends ServiceImpl impl Set permissions = new HashSet<>(); roles.forEach(code -> { List permissionList = sysPermissionService.findPermissionVOsByRoleCode(code).stream() - .filter(sysPermission -> StrUtil.isNotEmpty(sysPermission.getCode())).map(PermissionVO::getCode) - .collect(Collectors.toList()); + .map(PermissionVO::getCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList()); permissions.addAll(permissionList); }); userInfoDTO.setPermissions(new ArrayList<>(permissions)); diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/AdminOperationLogMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/AdminOperationLogMapper.xml deleted file mode 100644 index b5bf8f5c..00000000 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/AdminOperationLogMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/LoginLogMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/LoginLogMapper.xml deleted file mode 100644 index d4f2133a..00000000 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/LoginLogMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - ll.id, ll.trace_id, ll.username, ll.ip, ll.os, ll.status, ll.msg, ll.location, ll.browser, ll.event_type, ll.login_time, ll.create_time - - - - \ No newline at end of file diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/AnnouncementMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/AnnouncementMapper.xml index f14832d1..60726647 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/AnnouncementMapper.xml +++ b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/AnnouncementMapper.xml @@ -29,14 +29,12 @@ a.status, a.immortal, a.deadline, a.create_by, a.create_time, a.update_time - SELECT - - , su.username as create_username + ${ew.allAliasSqlSelect}, su.username as create_username FROM - notify_announcement a - LEFT JOIN sys_user su - ON a.create_by = su.user_id + notify_announcement a + LEFT JOIN sys_user su ON a.create_by = su.user_id ${ew.customSqlSegment} diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/UserAnnouncementMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/UserAnnouncementMapper.xml deleted file mode 100644 index 04bb6a29..00000000 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/notify/UserAnnouncementMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - id, announcement_id, user_id, state, read_time, create_time - - - ua.id, ua.announcement_id, ua.user_id, ua.state, ua.read_time, ua.create_time - - - \ No newline at end of file diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml index 95b2f69c..7c7f1af2 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml +++ b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml @@ -2,18 +2,7 @@ - - - - - - - - - - - - select name, code as value from @@ -22,5 +11,4 @@ deleted = 0 - diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RolePermissionMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RolePermissionMapper.xml deleted file mode 100644 index 21e534a8..00000000 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RolePermissionMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml index 35583339..56291394 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml +++ b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml @@ -17,10 +17,9 @@ su.update_time - SELECT - - , so.name as organization_name + ${ew.allAliasSqlSelect}, so.name as organization_name FROM sys_user su LEFT JOIN sys_organization so @@ -48,7 +47,7 @@ AND su.deleted = 0 - select username as name , user_id as value from diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml index f67066aa..ce1df33b 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml +++ b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml @@ -1,14 +1,6 @@ - - - - - - - - - insert into diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/DataSourceConfigController.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/DataSourceConfigController.java index a719c033..576bef37 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/DataSourceConfigController.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/DataSourceConfigController.java @@ -1,15 +1,15 @@ package com.hccake.ballcat.codegen.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hccake.ballcat.codegen.model.dto.DataSourceConfigDTO; import com.hccake.ballcat.codegen.model.entity.DataSourceConfig; import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO; import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO; import com.hccake.ballcat.codegen.service.DataSourceConfigService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.SelectData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -33,15 +33,16 @@ public class DataSourceConfigController { /** * 分页查询 - * @param page 分页对象 + * @param pageParam 分页对象 * @param dataSourceConfigQO 数据源 * @return R */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") // @PreAuthorize("@per.hasPermission('gen:datasourceconfig:read')" ) - public R> getDataSourceConfigPage(Page page, DataSourceConfigQO dataSourceConfigQO) { - return R.ok(dataSourceConfigService.selectPageVo(page, dataSourceConfigQO)); + public R> getDataSourceConfigPage(PageParam pageParam, + DataSourceConfigQO dataSourceConfigQO) { + return R.ok(dataSourceConfigService.queryPage(pageParam, dataSourceConfigQO)); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/GenerateController.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/GenerateController.java index a52e7a9d..58e00f62 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/GenerateController.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/GenerateController.java @@ -1,13 +1,13 @@ package com.hccake.ballcat.codegen.controller; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hccake.ballcat.codegen.model.dto.GeneratorOptionDTO; import com.hccake.ballcat.codegen.model.qo.TableInfoQO; import com.hccake.ballcat.codegen.model.vo.TableInfo; import com.hccake.ballcat.codegen.service.GeneratorService; import com.hccake.ballcat.codegen.service.TableInfoService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -35,14 +35,14 @@ public class GenerateController { /** * 表信息分页查询 - * @param page 分页对象 + * @param pageParam 分页参数 * @param tableInfoQO 表信息查询对象 * @return R */ @ApiOperation(value = "表信息分页查询", notes = "表信息分页查询") @GetMapping("/table-info/page") - public R> getDataSourceConfigPage(Page page, TableInfoQO tableInfoQO) { - return R.ok(tableInfoService.selectPageVo(page, tableInfoQO)); + public R> getDataSourceConfigPage(PageParam pageParam, TableInfoQO tableInfoQO) { + return R.ok(tableInfoService.queryPage(pageParam, tableInfoQO)); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplateGroupController.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplateGroupController.java index a66e76ad..1325246e 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplateGroupController.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplateGroupController.java @@ -6,9 +6,11 @@ import com.hccake.ballcat.codegen.model.entity.TemplateGroup; import com.hccake.ballcat.codegen.model.qo.TemplateGroupQO; import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO; import com.hccake.ballcat.codegen.service.TemplateGroupService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.SelectData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -32,15 +34,15 @@ public class TemplateGroupController { /** * 分页查询 - * @param page 分页对象 - * @param templateGroupQO 模板组 + * @param pageParam 分页参数 + * @param templateGroupQO 模板组查询对象 * @return R */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") // @PreAuthorize("@per.hasPermission('codegen:templategroup:read')" ) - public R> getTemplateGroupPage(Page page, TemplateGroupQO templateGroupQO) { - return R.ok(templateGroupService.selectPageVo(page, templateGroupQO)); + public R> getTemplateGroupPage(PageParam pageParam, TemplateGroupQO templateGroupQO) { + return R.ok(templateGroupService.queryPage(pageParam, templateGroupQO)); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java index f5a7e284..9f9ba96d 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java @@ -6,6 +6,8 @@ import com.hccake.ballcat.codegen.model.entity.TemplateProperty; import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO; import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; import com.hccake.ballcat.codegen.service.TemplatePropertyService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; @@ -30,11 +32,11 @@ public class TemplatePropertyController { private final TemplatePropertyService templatePropertyService; /** - * 分页查询 + * 查询模板组对应的所有属性 * @param templateGroupId 模板组ID * @return R */ - @ApiOperation(value = "分页查询", notes = "分页查询") + @ApiOperation(value = "模板组属性", notes = "模板组属性") @GetMapping("/list/{groupId}") public R> getTemplatePropertyList(@PathVariable("groupId") Integer templateGroupId) { return R.ok(templatePropertyService.list(templateGroupId)); @@ -42,15 +44,16 @@ public class TemplatePropertyController { /** * 分页查询 - * @param page 分页对象 + * @param pageParam 分页对象 * @param templatePropertyQO 模板属性配置 * @return R */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") // @PreAuthorize("@per.hasPermission('codegen:templateproperty:read')" ) - public R> getTemplatePropertyPage(Page page, TemplatePropertyQO templatePropertyQO) { - return R.ok(templatePropertyService.selectPageVo(page, templatePropertyQO)); + public R> getTemplatePropertyPage(PageParam pageParam, + TemplatePropertyQO templatePropertyQO) { + return R.ok(templatePropertyService.queryPage(pageParam, templatePropertyQO)); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java index ebdd9268..91b901de 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java @@ -1,13 +1,15 @@ package com.hccake.ballcat.codegen.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.hccake.ballcat.codegen.model.entity.DataSourceConfig; +import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO; import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO; -import com.hccake.ballcat.common.core.vo.SelectData; -import org.apache.ibatis.annotations.Param; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; import java.util.List; @@ -17,15 +19,21 @@ import java.util.List; * @author hccake * @date 2020-06-17 10:24:47 */ -public interface DataSourceConfigMapper extends BaseMapper { +public interface DataSourceConfigMapper extends ExtendMapper { /** * 分页查询 - * @param page - * @param wrapper - * @return VO分页数据 + * @param pageParam 分页参数 + * @param qo 查询条件 + * @return PageResult 分页结果数据 */ - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + default PageResult queryPage(PageParam pageParam, DataSourceConfigQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(DataSourceConfig.class) + .eqIfPresent(DataSourceConfig::getId, qo.getId()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } /** * 获取SelectData集合 diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TableInfoMapper.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TableInfoMapper.java index 4931ab64..53f79a7a 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TableInfoMapper.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TableInfoMapper.java @@ -1,8 +1,13 @@ package com.hccake.ballcat.codegen.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hccake.ballcat.codegen.model.qo.TableInfoQO; import com.hccake.ballcat.codegen.model.vo.ColumnInfo; import com.hccake.ballcat.codegen.model.vo.TableInfo; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,13 +21,29 @@ import java.util.List; @Mapper public interface TableInfoMapper { + /** + * 分页查询 + * @param pageParam 分页参数 + * @param qo 查询数据 + * @return PageResult + */ + default PageResult queryPage(PageParam pageParam, TableInfoQO qo) { + // TODO 等前端实现多列排序后，修改为支持多列排序 + Page page = new Page<>(pageParam.getCurrent(), pageParam.getSize()); + String sortField = pageParam.getSortField(); + OrderItem orderItem = pageParam.isSortAsc() ? OrderItem.asc(sortField) : OrderItem.desc(sortField); + page.addOrder(orderItem); + this.selectByPage(page, qo.getTableName()); + return new PageResult<>(page.getRecords(), page.getTotal()); + } + /** * 分页查询表格 * @param page 分页参数 * @param tableName 表名 * @return 填充后的分页数据 */ - IPage selectPageVo(IPage page, @Param("tableName") String tableName); + IPage selectByPage(IPage page, @Param("tableName") String tableName); /** * 根据表名查询对应表信息 diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateDirectoryEntryMapper.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateDirectoryEntryMapper.java index f552f6bd..e6fc5cc5 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateDirectoryEntryMapper.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateDirectoryEntryMapper.java @@ -1,12 +1,7 @@ package com.hccake.ballcat.codegen.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.hccake.ballcat.codegen.model.entity.TemplateDirectoryEntry; -import com.hccake.ballcat.codegen.model.vo.TemplateDirectoryEntryVO; -import org.apache.ibatis.annotations.Param; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; /** * 模板文件目录项 @@ -14,15 +9,6 @@ import org.apache.ibatis.annotations.Param; * @author hccake * @date 2020-06-19 19:11:41 */ -public interface TemplateDirectoryEntryMapper extends BaseMapper { - - /** - * 分页查询 - * @param page - * @param wrapper - * @return VO分页数据 - */ - IPage selectPageVo(IPage page, - @Param(Constants.WRAPPER) Wrapper wrapper); +public interface TemplateDirectoryEntryMapper extends ExtendMapper { } \ No newline at end of file diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateGroupMapper.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateGroupMapper.java index 9e1a6ae3..82abdcce 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateGroupMapper.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateGroupMapper.java @@ -1,13 +1,15 @@ package com.hccake.ballcat.codegen.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.hccake.ballcat.codegen.model.entity.TemplateGroup; +import com.hccake.ballcat.codegen.model.qo.TemplateGroupQO; import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO; -import com.hccake.ballcat.common.core.vo.SelectData; -import org.apache.ibatis.annotations.Param; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; import java.util.List; @@ -17,15 +19,21 @@ import java.util.List; * @author hccake * @date 2020-06-19 19:11:41 */ -public interface TemplateGroupMapper extends BaseMapper { +public interface TemplateGroupMapper extends ExtendMapper { /** * 分页查询 - * @param page - * @param wrapper - * @return VO分页数据 + * @param pageParam 分页参数 + * @param qo 查询条件 + * @return PageResult 分页数据 */ - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + default PageResult queryPage(PageParam pageParam, TemplateGroupQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(TemplateGroup.class) + .eq(TemplateGroup::getId, qo.getId()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } /** * 获取SelectData数据 diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateInfoMapper.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateInfoMapper.java index 57054602..9b0a1448 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateInfoMapper.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateInfoMapper.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.codegen.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hccake.ballcat.codegen.model.entity.TemplateInfo; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; ; @@ -11,6 +11,6 @@ import com.hccake.ballcat.codegen.model.entity.TemplateInfo; * @author hccake * @date 2020-06-19 18:09:08 */ -public interface TemplateInfoMapper extends BaseMapper { +public interface TemplateInfoMapper extends ExtendMapper { } \ No newline at end of file diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplatePropertyMapper.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplatePropertyMapper.java index 91bf1dce..0c40697e 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplatePropertyMapper.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplatePropertyMapper.java @@ -1,12 +1,14 @@ package com.hccake.ballcat.codegen.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.hccake.ballcat.codegen.model.entity.TemplateProperty; +import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO; import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; -import org.apache.ibatis.annotations.Param; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.hccake.extend.mybatis.plus.toolkit.WrappersX; /** * 模板属性配置 @@ -14,14 +16,21 @@ import org.apache.ibatis.annotations.Param; * @author hccake * @date 2020-06-22 15:46:39 */ -public interface TemplatePropertyMapper extends BaseMapper { +public interface TemplatePropertyMapper extends ExtendMapper { /** * 分页查询 - * @param page - * @param wrapper - * @return VO分页数据 + * @param pageParam 分页参数 + * @param qo 查询参数 + * @return PageResult 分页数据 */ - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + default PageResult queryPage(PageParam pageParam, TemplatePropertyQO qo) { + IPage page = this.prodPage(pageParam); + LambdaQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(TemplateProperty.class) + .eqIfPresent(TemplateProperty::getId, qo.getId()) + .eqIfPresent(TemplateProperty::getGroupId, qo.getGroupId()); + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } } \ No newline at end of file diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java index 9d218dfd..64f3e482 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/DataSourceConfig.java @@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -20,9 +18,8 @@ import java.time.LocalDateTime; */ @Data @TableName("gen_data_source_config") -@EqualsAndHashCode(callSuper = true) @ApiModel(value = "数据源") -public class DataSourceConfig extends Model { +public class DataSourceConfig { private static final long serialVersionUID = 1L; diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateDirectoryEntry.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateDirectoryEntry.java index 799ca13d..fb7a8a22 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateDirectoryEntry.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateDirectoryEntry.java @@ -1,11 +1,9 @@ package com.hccake.ballcat.codegen.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -17,9 +15,8 @@ import java.time.LocalDateTime; */ @Data @TableName("gen_template_directory_entry") -@EqualsAndHashCode(callSuper = true) @ApiModel(value = "模板文件目录项") -public class TemplateDirectoryEntry extends Model { +public class TemplateDirectoryEntry { private static final long serialVersionUID = 1L; @@ -27,7 +24,7 @@ public class TemplateDirectoryEntry extends Model { * ID */ @TableId - @ApiModelProperty(value = "") + @ApiModelProperty(value = "ID") private Integer id; /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateGroup.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateGroup.java index e817a30b..7839ee91 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateGroup.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateGroup.java @@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -20,9 +18,8 @@ import java.time.LocalDateTime; */ @Data @TableName("gen_template_group") -@EqualsAndHashCode(callSuper = true) @ApiModel(value = "模板组") -public class TemplateGroup extends Model { +public class TemplateGroup { private static final long serialVersionUID = 1L; diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateInfo.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateInfo.java index f30bf3a9..8d73763a 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateInfo.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateInfo.java @@ -1,11 +1,9 @@ package com.hccake.ballcat.codegen.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -17,9 +15,8 @@ import java.time.LocalDateTime; */ @Data @TableName("gen_template_info") -@EqualsAndHashCode(callSuper = true) @ApiModel(value = "模板信息") -public class TemplateInfo extends Model { +public class TemplateInfo { private static final long serialVersionUID = 1L; diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateProperty.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateProperty.java index b3b20e5d..852ac0e8 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateProperty.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/entity/TemplateProperty.java @@ -1,11 +1,9 @@ package com.hccake.ballcat.codegen.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.time.LocalDateTime; @@ -17,9 +15,8 @@ import java.time.LocalDateTime; */ @Data @TableName("gen_template_property") -@EqualsAndHashCode(callSuper = true) @ApiModel(value = "模板属性配置") -public class TemplateProperty extends Model { +public class TemplateProperty { private static final long serialVersionUID = 1L; diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/DataSourceConfigService.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/DataSourceConfigService.java index 823eabc7..682b8172 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/DataSourceConfigService.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/DataSourceConfigService.java @@ -1,12 +1,13 @@ package com.hccake.ballcat.codegen.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.codegen.model.dto.DataSourceConfigDTO; import com.hccake.ballcat.codegen.model.entity.DataSourceConfig; import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO; import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -16,15 +17,15 @@ import java.util.List; * @author hccake * @date 2020-06-17 10:24:47 */ -public interface DataSourceConfigService extends IService { +public interface DataSourceConfigService extends ExtendService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 * @return 分页数据 */ - IPage selectPageVo(IPage page, DataSourceConfigQO qo); + PageResult queryPage(PageParam pageParam, DataSourceConfigQO qo); /** * 获取 SelectData 集合 diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TableInfoService.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TableInfoService.java index be6d213e..1cc7f3e5 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TableInfoService.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TableInfoService.java @@ -1,9 +1,10 @@ package com.hccake.ballcat.codegen.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.hccake.ballcat.codegen.model.qo.TableInfoQO; import com.hccake.ballcat.codegen.model.vo.ColumnInfo; import com.hccake.ballcat.codegen.model.vo.TableInfo; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import java.util.List; @@ -16,12 +17,12 @@ import java.util.List; public interface TableInfoService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 * @return 分页数据 */ - IPage selectPageVo(IPage page, TableInfoQO qo); + PageResult queryPage(PageParam pageParam, TableInfoQO qo); /** * 根据表名查询对应表信息 diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateDirectoryEntryService.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateDirectoryEntryService.java index 8ae7983a..85c611dd 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateDirectoryEntryService.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateDirectoryEntryService.java @@ -1,10 +1,10 @@ package com.hccake.ballcat.codegen.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.codegen.model.bo.TemplateFile; import com.hccake.ballcat.codegen.model.dto.TemplateDirectoryCreateDTO; import com.hccake.ballcat.codegen.model.entity.TemplateDirectoryEntry; import com.hccake.ballcat.codegen.model.vo.TemplateDirectoryEntryVO; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; import java.util.Set; @@ -15,7 +15,7 @@ import java.util.Set; * @author hccake * @date 2020-06-19 19:11:41 */ -public interface TemplateDirectoryEntryService extends IService { +public interface TemplateDirectoryEntryService extends ExtendService { /** * 查询指定模板组下所有的目录项 @@ -73,7 +73,7 @@ public interface TemplateDirectoryEntryService extends IService findTemplateFiles(Integer groupId, Set templateFileIds); diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateGroupService.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateGroupService.java index 072d5078..a0e0c9b5 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateGroupService.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateGroupService.java @@ -1,12 +1,13 @@ package com.hccake.ballcat.codegen.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.codegen.model.bo.TemplateFile; import com.hccake.ballcat.codegen.model.entity.TemplateGroup; -import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO; import com.hccake.ballcat.codegen.model.qo.TemplateGroupQO; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; import java.util.Set; @@ -17,20 +18,20 @@ import java.util.Set; * @author hccake * @date 2020-06-19 19:11:41 */ -public interface TemplateGroupService extends IService { +public interface TemplateGroupService extends ExtendService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 * @return 分页数据 */ - IPage selectPageVo(IPage page, TemplateGroupQO qo); + PageResult queryPage(PageParam pageParam, TemplateGroupQO qo); /** * 查找指定模板组下所有的模板文件 * @param groupId 模板组ID - * @param templateFileIds + * @param templateFileIds 模板文件ID集合 * @return List */ List findTemplateFiles(Integer groupId, Set templateFileIds); @@ -43,8 +44,8 @@ public interface TemplateGroupService extends IService { /** * 复制模板组 - * @param resourceId - * @param templateGroup 模板组 + * @param resourceId 原模板组ID + * @param templateGroup 目标模板组 * @return boolean 复制成功: true */ boolean copy(Integer resourceId, TemplateGroup templateGroup); diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateInfoService.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateInfoService.java index 0bf37f4d..83aba34a 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateInfoService.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateInfoService.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.codegen.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.codegen.model.entity.TemplateInfo; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * @author hccake * @date 2020 -06-18 18:32:51 */ -public interface TemplateInfoService extends IService { +public interface TemplateInfoService extends ExtendService { /** * List template info list. diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java index da0504ce..7b1e9f5d 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java @@ -1,10 +1,11 @@ package com.hccake.ballcat.codegen.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.codegen.model.entity.TemplateProperty; import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO; import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; @@ -14,15 +15,15 @@ import java.util.List; * @author hccake * @date 2020-06-22 15:46:39 */ -public interface TemplatePropertyService extends IService { +public interface TemplatePropertyService extends ExtendService { /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 * @return 分页数据 */ - IPage selectPageVo(IPage page, TemplatePropertyQO qo); + PageResult queryPage(PageParam pageParam, TemplatePropertyQO qo); /** * 获取模板组的所有配置 diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java index 8091af75..6a9e8dab 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java @@ -1,15 +1,10 @@ package com.hccake.ballcat.codegen.service.impl; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.creator.DataSourceCreator; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.codegen.mapper.DataSourceConfigMapper; import com.hccake.ballcat.codegen.model.converter.DataSourceConfigConverter; @@ -18,7 +13,10 @@ import com.hccake.ballcat.codegen.model.entity.DataSourceConfig; import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO; import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO; import com.hccake.ballcat.codegen.service.DataSourceConfigService; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jasypt.encryption.StringEncryptor; @@ -40,11 +38,9 @@ import java.util.List; @Slf4j @Service @RequiredArgsConstructor -public class DataSourceConfigServiceImpl extends ServiceImpl +public class DataSourceConfigServiceImpl extends ExtendServiceImpl implements DataSourceConfigService { - private final static String TABLE_ALIAS_PREFIX = "dsc."; - private final StringEncryptor stringEncryptor; private final DataSourceCreator dataSourceCreator; @@ -53,16 +49,14 @@ public class DataSourceConfigServiceImpl extends ServiceImpl selectPageVo(IPage page, DataSourceConfigQO qo) { - QueryWrapper wrapper = Wrappers.query().eq(ObjectUtil.isNotNull(qo.getId()), - TABLE_ALIAS_PREFIX + "Id", qo.getId()); - return baseMapper.selectPageVo(page, wrapper); + public PageResult queryPage(PageParam pageParam, DataSourceConfigQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TableInfoServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TableInfoServiceImpl.java index ccb86631..abc73ba8 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TableInfoServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TableInfoServiceImpl.java @@ -1,12 +1,13 @@ package com.hccake.ballcat.codegen.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.hccake.ballcat.codegen.mapper.TableInfoMapper; import com.hccake.ballcat.codegen.model.qo.TableInfoQO; import com.hccake.ballcat.codegen.model.vo.ColumnInfo; import com.hccake.ballcat.codegen.model.vo.TableInfo; import com.hccake.ballcat.codegen.service.TableInfoService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -26,14 +27,14 @@ public class TableInfoServiceImpl implements TableInfoService { private final TableInfoMapper baseMapper; /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 * @return 分页数据 */ @Override - public IPage selectPageVo(IPage page, TableInfoQO qo) { - return baseMapper.selectPageVo(page, qo.getTableName()); + public PageResult queryPage(PageParam pageParam, TableInfoQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java index b8531ca0..f61b7475 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.codegen.constant.DirectoryEntryRemoveModeEnum; import com.hccake.ballcat.codegen.constant.DirectoryEntryTypeEnum; @@ -23,6 +22,7 @@ import com.hccake.ballcat.common.core.constant.GlobalConstants; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.core.result.BaseResultCode; import com.hccake.ballcat.common.core.util.TreeUtil; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,11 +39,10 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class TemplateDirectoryEntryServiceImpl extends ServiceImpl +public class TemplateDirectoryEntryServiceImpl + extends ExtendServiceImpl implements TemplateDirectoryEntryService { - private final static String TABLE_ALIAS_PREFIX = "tde."; - private final TemplateInfoService templateInfoService; /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateGroupServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateGroupServiceImpl.java index c6143511..879dc0af 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateGroupServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateGroupServiceImpl.java @@ -1,11 +1,6 @@ package com.hccake.ballcat.codegen.service.impl; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.codegen.mapper.TemplateGroupMapper; import com.hccake.ballcat.codegen.model.bo.TemplateFile; @@ -15,7 +10,10 @@ import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO; import com.hccake.ballcat.codegen.service.TemplateDirectoryEntryService; import com.hccake.ballcat.codegen.service.TemplateGroupService; import com.hccake.ballcat.codegen.service.TemplatePropertyService; -import com.hccake.ballcat.common.core.vo.SelectData; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.ballcat.common.core.domain.SelectData; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,26 +29,22 @@ import java.util.Set; */ @Service @RequiredArgsConstructor -public class TemplateGroupServiceImpl extends ServiceImpl +public class TemplateGroupServiceImpl extends ExtendServiceImpl implements TemplateGroupService { - private final static String TABLE_ALIAS_PREFIX = "tg."; - private final TemplateDirectoryEntryService templateDirectoryEntryService; private final TemplatePropertyService templatePropertyService; /** * 根据QueryObject查询分页数据 - * @param page 分页参数 + * @param pageParam 分页参数 * @param qo 查询参数对象 * @return 分页数据 */ @Override - public IPage selectPageVo(IPage page, TemplateGroupQO qo) { - QueryWrapper wrapper = Wrappers.query().eq(ObjectUtil.isNotNull(qo.getId()), - TABLE_ALIAS_PREFIX + "Id", qo.getId()); - return baseMapper.selectPageVo(page, wrapper); + public PageResult queryPage(PageParam pageParam, TemplateGroupQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateInfoServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateInfoServiceImpl.java index 1e43b8d4..802bb38d 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateInfoServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateInfoServiceImpl.java @@ -1,10 +1,10 @@ package com.hccake.ballcat.codegen.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.codegen.mapper.TemplateInfoMapper; import com.hccake.ballcat.codegen.model.entity.TemplateInfo; import com.hccake.ballcat.codegen.service.TemplateInfoService; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -16,11 +16,9 @@ import java.util.List; * @date 2020-06-18 18:32:51 */ @Service -public class TemplateInfoServiceImpl extends ServiceImpl +public class TemplateInfoServiceImpl extends ExtendServiceImpl implements TemplateInfoService { - private final static String TABLE_ALIAS_PREFIX = "gt."; - /** * List template info list. * @param templateGroupId the template group id diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java index 1c4c6025..e0677b65 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java @@ -1,17 +1,16 @@ package com.hccake.ballcat.codegen.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hccake.ballcat.codegen.mapper.TemplatePropertyMapper; import com.hccake.ballcat.codegen.model.converter.TemplatePropertyConverter; import com.hccake.ballcat.codegen.model.entity.TemplateProperty; import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO; import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; import com.hccake.ballcat.codegen.service.TemplatePropertyService; +import com.hccake.ballcat.common.core.domain.PageParam; +import com.hccake.ballcat.common.core.domain.PageResult; +import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.util.List; @@ -24,23 +23,18 @@ import java.util.stream.Collectors; * @date 2020-06-22 15:46:39 */ @Service -public class TemplatePropertyServiceImpl extends ServiceImpl +public class TemplatePropertyServiceImpl extends ExtendServiceImpl implements TemplatePropertyService { - private final static String TABLE_ALIAS_PREFIX = "tp."; - /** - * 根据QueryObeject查询分页数据 - * @param page 分页参数 + * 根据QueryObject查询分页数据 + * @param pageParam 分页参数 * @param qo 查询参数对象 * @return 分页数据 */ @Override - public IPage selectPageVo(IPage page, TemplatePropertyQO qo) { - QueryWrapper wrapper = Wrappers.query() - .eq(TABLE_ALIAS_PREFIX + "group_id", qo.getGroupId()) - .eq(ObjectUtil.isNotNull(qo.getId()), TABLE_ALIAS_PREFIX + "id", qo.getId()); - return baseMapper.selectPageVo(page, wrapper); + public PageResult queryPage(PageParam pageParam, TemplatePropertyQO qo) { + return baseMapper.queryPage(pageParam, qo); } /** diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml index 6d7febe8..e8d5f1ec 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml @@ -1,35 +1,7 @@ - - - - - - - - - - - - - id, name, username, password, url, create_time, update_time - - - - - dsc.id, dsc.name, dsc.username, dsc.password, dsc.url, dsc.create_time, dsc.update_time - - - - - select name , name as value from diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TableInfoMapper.xml b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TableInfoMapper.xml index e075363c..0fd02b08 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TableInfoMapper.xml +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TableInfoMapper.xml @@ -1,7 +1,7 @@ - SELECT `table_name`, engine, diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateDirectoryEntryMapper.xml b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateDirectoryEntryMapper.xml deleted file mode 100644 index a943f5b7..00000000 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateDirectoryEntryMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - id, group_id, name, type, p_id, create_time, update_time - - - tde.id, tde.group_id, tde.name, tde.type, tde.p_id, tde.create_time, tde.update_time - - \ No newline at end of file diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateGroupMapper.xml b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateGroupMapper.xml index a04284a0..0cd46e82 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateGroupMapper.xml +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateGroupMapper.xml @@ -2,30 +2,11 @@ - - - id, name, remarks, create_time, update_time - - - - tg.id, tg.name, tg.remarks, tg.create_time, tg.update_time - - - - - - select name, id as value from gen_template_group tg - \ No newline at end of file diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateInfoMapper.xml b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateInfoMapper.xml deleted file mode 100644 index 396e7d52..00000000 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateInfoMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - directory_entry_id, group_id, title, content, engine_type, remarks, deleted, create_time, update_time - - - t.directory_entry_id, t.group_id, t.title, t.content, t.engine_type, t.remarks, t.deleted, t.create_time, t.update_time - - \ No newline at end of file diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplatePropertyMapper.xml b/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplatePropertyMapper.xml deleted file mode 100644 index 481506d1..00000000 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplatePropertyMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - id, group_id, title, prop_key, default_value, required, remarks, create_time, update_time - - - tp.id, tp.group_id, tp.title, tp.prop_key, tp.default_value, tp.required, tp.remarks, tp.create_time, tp.update_time - - - \ No newline at end of file diff --git a/ballcat-common/ballcat-common-conf/pom.xml b/ballcat-common/ballcat-common-conf/pom.xml index 50b6429b..5b0595ad 100644 --- a/ballcat-common/ballcat-common-conf/pom.xml +++ b/ballcat-common/ballcat-common-conf/pom.xml @@ -16,6 +16,11 @@ com.hccake ballcat-common-core + + com.hccake + ballcat-extend-mybatis-plus + + com.hccake ballcat-extend-dingtalk diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java index 07542daa..7594528e 100644 --- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java +++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java @@ -1,12 +1,21 @@ package com.hccake.ballcat.common.conf.mybatis; import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.injector.ISqlInjector; +import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.hccake.extend.mybatis.plus.injector.CustomSqlInjector; +import com.hccake.extend.mybatis.plus.methods.SelectByPage; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; +import java.util.List; + /** * @author hccake * @date 2020/04/19 默认配置MybatisPlus分页插件，通过conditional注解达到覆盖效用 @@ -37,4 +46,19 @@ public class MybatisPlusConfig { return new FillMetaObjectHandle(); } + /** + * 自定义批量插入方法注入 + * @return ISqlInjector + */ + @Bean + @ConditionalOnMissingBean(ISqlInjector.class) + public ISqlInjector customSqlInjector() { + List list = new ArrayList<>(); + // 对于只在更新时进行填充的字段不做插入处理 + list.add(new InsertBatchSomeColumn(t -> t.getFieldFill() != FieldFill.UPDATE)); + // 分页查询 返回 VO 对象 + list.add(new SelectByPage()); + return new CustomSqlInjector(list); + } + } diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/SqlFilterArgumentResolver.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/PageParamArgumentResolver.java similarity index 84% rename from ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/SqlFilterArgumentResolver.java rename to ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/PageParamArgumentResolver.java index d91b7ae8..caff4768 100644 --- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/SqlFilterArgumentResolver.java +++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/PageParamArgumentResolver.java @@ -1,8 +1,7 @@ package com.hccake.ballcat.common.conf.web; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hccake.ballcat.common.core.domain.PageParam; import com.hccake.ballcat.common.core.exception.SqlCheckedException; import com.hccake.ballcat.common.core.result.BaseResultCode; import lombok.extern.slf4j.Slf4j; @@ -22,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; * 解决Mybatis Plus Order By SQL注入问题 */ @Slf4j -public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver { +public class PageParamArgumentResolver implements HandlerMethodArgumentResolver { private final static String[] KEYWORDS = { "master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop", "sleep" }; @@ -34,7 +33,7 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver */ @Override public boolean supportsParameter(MethodParameter parameter) { - return parameter.getParameterType().equals(Page.class); + return parameter.getParameterType().equals(PageParam.class); } /** @@ -57,12 +56,12 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver String sortField = request.getParameter("sortField"); String sortAsc = request.getParameter("sortAsc"); - Page page = new Page<>(); + PageParam pageParam = new PageParam(); if (StrUtil.isNotBlank(current)) { - page.setCurrent(Long.parseLong(current)); + pageParam.setCurrent(Long.parseLong(current)); } if (StrUtil.isNotBlank(size)) { - page.setSize(Long.parseLong(size)); + pageParam.setSize(Long.parseLong(size)); } if (StrUtil.isNotEmpty(sortField)) { @@ -72,11 +71,11 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver sortField = StrUtil.toUnderlineCase(sortField); // 正序/倒序 boolean isAsc = (StrUtil.isNotBlank(sortAsc) && Boolean.parseBoolean(sortAsc)); - OrderItem orderItem = isAsc ? OrderItem.asc(sortField) : OrderItem.desc(sortField); - - page.addOrder(orderItem); + pageParam.setSortAsc(isAsc); + pageParam.setSortField(sortField); } - return page; + + return pageParam; } /** diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/WebMvcConfig.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/WebMvcConfig.java index 3f47f362..f2b29561 100644 --- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/WebMvcConfig.java +++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/WebMvcConfig.java @@ -22,7 +22,7 @@ public class WebMvcConfig implements WebMvcConfigurer { */ @Override public void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(new SqlFilterArgumentResolver()); + argumentResolvers.add(new PageParamArgumentResolver()); } } diff --git a/ballcat-common/ballcat-common-core/pom.xml b/ballcat-common/ballcat-common-core/pom.xml index 48e5f27b..517683c3 100644 --- a/ballcat-common/ballcat-common-core/pom.xml +++ b/ballcat-common/ballcat-common-core/pom.xml @@ -62,5 +62,13 @@ org.jsoup jsoup - + + javax.validation + validation-api + + + org.hibernate.validator + hibernate-validator + + \ No newline at end of file diff --git a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageParam.java b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageParam.java new file mode 100644 index 00000000..5b459693 --- /dev/null +++ b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageParam.java @@ -0,0 +1,49 @@ +package com.hccake.ballcat.common.core.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Range; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * 分页查询参数 + * + * @author Hccake 2021/1/18 + * @version 1.0 + */ +@Data +@ApiModel("分页查询参数") +public class PageParam { + + /** + * 当前页 + */ + @ApiModelProperty(value = "当前页码，从 1 开始", required = true, example = "1") + @NotNull(message = "当前页码不能为空") + @Min(value = 1, message = "当前页不能小于 1") + private long current = 1; + + /** + * 每页显示条数，默认 10 + */ + @ApiModelProperty(value = "每页条数，最大值为 100", required = true, example = "10") + @NotNull(message = "每页条数不能为空") + @Range(min = 1, max = 100, message = "条数范围为 [1, 100]") + private long size = 10; + + /** + * 排序字段 + */ + @ApiModelProperty(value = "排序字段") + private String sortField; + + /** + * 是否正序排序 + */ + @ApiModelProperty(value = "是否正序排序") + private boolean sortAsc; + +} diff --git a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageResult.java b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageResult.java new file mode 100644 index 00000000..c2cb1cc6 --- /dev/null +++ b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/PageResult.java @@ -0,0 +1,44 @@ +package com.hccake.ballcat.common.core.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Collections; +import java.util.List; + +/** + * 分页返回结果 + * + * @author Hccake 2021/1/18 + * @version 1.0 + */ +@Data +@ApiModel("分页返回结果") +public class PageResult { + + /** + * 查询数据列表 + */ + @ApiModelProperty(value = "分页数据", required = true) + protected List records = Collections.emptyList(); + + /** + * 总数 + */ + @ApiModelProperty(value = "数据总量", required = true) + protected Long total = 0L; + + public PageResult() { + } + + public PageResult(long total) { + this.total = total; + } + + public PageResult(List records, long total) { + this.records = records; + this.total = total; + } + +} diff --git a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/SelectData.java b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/SelectData.java new file mode 100644 index 00000000..8c9d874c --- /dev/null +++ b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/domain/SelectData.java @@ -0,0 +1,52 @@ +package com.hccake.ballcat.common.core.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 下拉框所对应的视图类 + * + * @author Hccake + */ +@Data +@ApiModel("下拉框数据") +public class SelectData { + + /** + * 显示的数据 + */ + @ApiModelProperty(value = "显示的数据", required = true) + private String name; + + /** + * 选中获取的属性 + */ + @ApiModelProperty(value = "选中获取的属性", required = true) + private String value; + + /** + * 是否被选中 + */ + @ApiModelProperty(value = "是否被选中") + private String selected; + + /** + * 是否禁用 + */ + @ApiModelProperty(value = "是否禁用") + private String disabled; + + /** + * 分组标识 + */ + @ApiModelProperty(value = "分组标识") + private String type; + + /** + * 扩展对象 + */ + @ApiModelProperty(value = "扩展对象") + private T extendObj; + +} diff --git a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/vo/SelectData.java b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/vo/SelectData.java deleted file mode 100644 index 3a1f8b39..00000000 --- a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/vo/SelectData.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hccake.ballcat.common.core.vo; - -import lombok.Data; - -import java.util.Map; - -/** - * 下拉框所对应的视图类 - * - * @author Hccake - */ -@Data -public class SelectData { - - /** - * 显示的数据 - */ - private String name; - - /** - * 选中获取的属性 - */ - private String value; - - /** - * 是否被选中 - */ - private String selected; - - /** - * 是否禁用 - */ - private String disabled; - - /** - * 分组标识 - */ - private String type; - - /** - * 扩展对象 - */ - private T extendObj; - -} diff --git a/ballcat-extends/ballcat-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java b/ballcat-extends/ballcat-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java index 18cdf428..7dc7c6c9 100644 --- a/ballcat-extends/ballcat-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java +++ b/ballcat-extends/ballcat-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java @@ -3,8 +3,11 @@ package com.hccake.extend.mybatis.plus.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hccake.ballcat.common.core.domain.PageParam; import org.apache.ibatis.annotations.Param; import java.util.Collection; @@ -16,6 +19,21 @@ import java.util.Collection; */ public interface ExtendMapper extends BaseMapper { + /** + * 根据 PageParam 生成一个 IPage 实例 + * @param pageParam 分页参数 + * @param 返回的 Record 对象 + * @return IPage + */ + default IPage prodPage(PageParam pageParam) { + Page page = new Page<>(pageParam.getCurrent(), pageParam.getSize()); + // TODO 等前端实现多列排序后，修改为支持多列排序 + String sortField = pageParam.getSortField(); + OrderItem orderItem = pageParam.isSortAsc() ? OrderItem.asc(sortField) : OrderItem.desc(sortField); + page.addOrder(orderItem); + return page; + } + /** * 批量插入数据 实现类 {@link InsertBatchSomeColumn} * @param list 数据列表