From f920d593c9dbc80101fef12cca6ac84e911117fe Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 23 Aug 2023 10:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orion-server-module-service-impl.java.vm | 25 +++++++++++++------ .../orion-server-provider-api-impl.java.vm | 14 ++++++----- .../controller/SystemMenuController.java | 7 +++--- .../controller/SystemRoleController.java | 8 +++--- .../controller/SystemUserController.java | 8 +++--- .../ops/module/infra/dao/SystemMenuDAO.java | 6 ++--- .../ops/module/infra/dao/SystemRoleDAO.java | 6 ++--- .../module/infra/dao/SystemRoleMenuDAO.java | 6 ++--- .../ops/module/infra/dao/SystemUserDAO.java | 6 ++--- .../module/infra/dao/SystemUserRoleDAO.java | 6 ++--- .../infra/service/SystemMenuService.java | 6 ++--- .../infra/service/SystemRoleService.java | 8 +++--- .../infra/service/SystemUserService.java | 8 +++--- .../service/impl/SystemMenuServiceImpl.java | 8 +++--- .../service/impl/SystemRoleServiceImpl.java | 10 ++++---- .../service/impl/SystemUserServiceImpl.java | 12 ++++----- .../resources/mapper/SystemMenuMapper.xml | 2 +- .../resources/mapper/SystemRoleMapper.xml | 2 +- .../resources/mapper/SystemRoleMenuMapper.xml | 2 +- .../resources/mapper/SystemUserMapper.xml | 2 +- .../resources/mapper/SystemUserRoleMapper.xml | 2 +- 21 files changed, 82 insertions(+), 72 deletions(-) diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm index cd16e4bf..23ec212d 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm @@ -83,10 +83,8 @@ public class ${table.serviceImplName} implements ${table.serviceName} { @Override public List<${type}VO> get${type}List(${type}QueryRequest request) { - // 转换 - ${type}DO record = ${type}Convert.MAPPER.to(request); - // 构造条件 - LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.queryCondition(record); + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); // 查询 return ${typeLower}DAO.of() .wrapper(wrapper) @@ -95,10 +93,8 @@ public class ${table.serviceImplName} implements ${table.serviceName} { @Override public DataGrid<${type}VO> get${type}Page(${type}QueryRequest request) { - // 转换 - ${type}DO record = ${type}Convert.MAPPER.to(request); - // 构造条件 - LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.queryCondition(record); + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); // 查询 return ${typeLower}DAO.of() .wrapper(wrapper) @@ -140,5 +136,18 @@ public class ${table.serviceImplName} implements ${table.serviceName} { boolean present = ${typeLower}DAO.of().wrapper(wrapper).present(); Valid.isFalse(present, ErrorMessage.DATA_PRESENT); } + + /** + * 构建查询 wrapper + * + * @param request request + * @return wrapper + */ + private LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request) { + return ${typeLower}DAO.wrapper() + #foreach($field in ${table.fields}) + .eq(${type}DO::get${field.capitalName}, request.get${field.capitalName}())#if(!$foreach.hasNext);#end + #end + } } diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm b/orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm index 66821feb..d14dfd93 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm @@ -88,13 +88,15 @@ public class ${type}ApiImpl implements ${type}Api { public List<${type}DTO> get${type}List(${type}QueryDTO dto) { log.info("${type}Api.get${type}List dto: {}", JSON.toJSONString(dto)); Valid.valid(dto); - // 转换条件 - ${type}DO domain = ${type}ProviderConvert.MAPPER.to(dto); + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.wrapper() + #foreach($field in ${table.fields}) + .eq(${type}DO::get${field.capitalName}, dto.get${field.capitalName}())#if(!$foreach.hasNext);#end + #end // 查询 - LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.queryCondition(domain); - List<${type}DO> rows = ${typeLower}DAO.selectList(wrapper); - // 转换结果 - return ${type}ProviderConvert.MAPPER.toList(rows); + return ${typeLower}DAO.of() + .wrapper(wrapper) + .dataGrid(${type}ProviderConvert.MAPPER::to); } @Override diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java index 88644a96..12381d0e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java @@ -6,7 +6,6 @@ import com.orion.ops.framework.common.constant.IgnoreLogMode; import com.orion.ops.module.infra.entity.request.menu.*; import com.orion.ops.module.infra.entity.vo.SystemMenuVO; import com.orion.ops.module.infra.service.SystemMenuService; -import com.orion.ops.module.infra.service.SystemRoleMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -48,7 +47,7 @@ public class SystemMenuController { @Operation(summary = "通过 id 更新菜单") @PreAuthorize("@ss.hasPermission('infra:system-menu:update')") public Integer updateSystemMenu(@RequestBody SystemMenuUpdateRequest request) { - return systemMenuService.updateSystemMenu(request); + return systemMenuService.updateSystemMenuById(request); } @PutMapping("/update-status") @@ -64,7 +63,7 @@ public class SystemMenuController { @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('infra:system-menu:query')") public SystemMenuVO getSystemMenu(@RequestParam("id") Long id) { - return systemMenuService.getSystemMenu(id); + return systemMenuService.getSystemMenuById(id); } @IgnoreLog(IgnoreLogMode.RET) @@ -72,7 +71,7 @@ public class SystemMenuController { @Operation(summary = "查询菜单") @PreAuthorize("@ss.hasPermission('infra:system-menu:query')") public List getSystemMenuList(@Validated @RequestBody SystemMenuQueryRequest request) { - return systemMenuService.getSystemMenuList(request); + return systemMenuService.getSystemMenuByIdList(request); } @DeleteMapping("/delete") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java index b024d019..5225adec 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java @@ -56,7 +56,7 @@ public class SystemRoleController { @Operation(summary = "通过 id 更新角色") @PreAuthorize("@ss.hasPermission('infra:system-role:update')") public Integer updateSystemRole(@Validated @RequestBody SystemRoleUpdateRequest request) { - return systemRoleService.updateSystemRole(request); + return systemRoleService.updateSystemRoleById(request); } @PutMapping("/update-status") @@ -72,7 +72,7 @@ public class SystemRoleController { @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('infra:system-role:query')") public SystemRoleVO getSystemRole(@RequestParam("id") Long id) { - return systemRoleService.getSystemRole(id); + return systemRoleService.getSystemRoleById(id); } @IgnoreLog(IgnoreLogMode.RET) @@ -80,7 +80,7 @@ public class SystemRoleController { @Operation(summary = "查询所有角色") @PreAuthorize("@ss.hasPermission('infra:system-role:query')") public List getSystemRoleList() { - return systemRoleService.getSystemRoleList(); + return systemRoleService.getSystemRoleByIdList(); } @IgnoreLog(IgnoreLogMode.RET) @@ -103,7 +103,7 @@ public class SystemRoleController { @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('infra:system-role:delete')") public Integer deleteSystemRole(@RequestParam("id") Long id) { - return systemRoleService.deleteSystemRole(id); + return systemRoleService.deleteSystemRoleById(id); } @PutMapping("/bind") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java index 322e6f83..c775a2df 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java @@ -54,7 +54,7 @@ public class SystemUserController { @Operation(summary = "通过 id 更新用户") @PreAuthorize("@ss.hasPermission('infra:system-user:update')") public Integer updateSystemUser(@Validated @RequestBody SystemUserUpdateRequest request) { - return systemUserService.updateSystemUser(request); + return systemUserService.updateSystemUserById(request); } // TODO 修改头像 最后再说 可有可无的功能 要是有 http 文件需求就写 @@ -93,7 +93,7 @@ public class SystemUserController { @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('infra:system-user:query')") public SystemUserVO getSystemUser(@RequestParam("id") Long id) { - return systemUserService.getSystemUser(id); + return systemUserService.getSystemUserById(id); } @IgnoreLog(IgnoreLogMode.RET) @@ -101,7 +101,7 @@ public class SystemUserController { @Operation(summary = "查询所有用户") @PreAuthorize("@ss.hasPermission('infra:system-user:query')") public List getSystemUserList() { - return systemUserService.getSystemUserList(); + return systemUserService.getSystemUserByIdList(); } @IgnoreLog(IgnoreLogMode.RET) @@ -125,7 +125,7 @@ public class SystemUserController { @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('infra:system-user:delete')") public Integer deleteSystemUser(@RequestParam("id") Long id) { - return systemUserService.deleteSystemUser(id); + return systemUserService.deleteSystemUserById(id); } } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java index 34e90a17..da001f93 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java @@ -16,12 +16,12 @@ import org.apache.ibatis.annotations.Mapper; public interface SystemMenuDAO extends IMapper { /** - * 获取全部条件 + * 获取查询条件 * * @param entity entity - * @return 全部条件 + * @return 查询条件 */ - default LambdaQueryWrapper condition(SystemMenuDO entity) { + default LambdaQueryWrapper queryCondition(SystemMenuDO entity) { return this.wrapper() .eq(SystemMenuDO::getId, entity.getId()) .eq(SystemMenuDO::getParentId, entity.getParentId()) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java index a237c9ed..af56e923 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java @@ -19,12 +19,12 @@ import java.util.List; public interface SystemRoleDAO extends IMapper { /** - * 获取全部条件 + * 获取查询条件 * * @param entity entity - * @return 全部条件 + * @return 查询条件 */ - default LambdaQueryWrapper condition(SystemRoleDO entity) { + default LambdaQueryWrapper queryCondition(SystemRoleDO entity) { return this.wrapper() .eq(SystemRoleDO::getId, entity.getId()) .eq(SystemRoleDO::getName, entity.getName()) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java index f0176f2c..319d34dc 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java @@ -18,12 +18,12 @@ import java.util.List; public interface SystemRoleMenuDAO extends IMapper { /** - * 获取全部条件 + * 获取查询条件 * * @param entity entity - * @return 全部条件 + * @return 查询条件 */ - default LambdaQueryWrapper condition(SystemRoleMenuDO entity) { + default LambdaQueryWrapper queryCondition(SystemRoleMenuDO entity) { return this.wrapper() .eq(SystemRoleMenuDO::getId, entity.getId()) .eq(SystemRoleMenuDO::getRoleId, entity.getRoleId()) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java index f5be014d..ffee0958 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java @@ -16,12 +16,12 @@ import org.apache.ibatis.annotations.Mapper; public interface SystemUserDAO extends IMapper { /** - * 获取全部条件 + * 获取查询条件 * * @param entity entity - * @return 全部条件 + * @return 查询条件 */ - default LambdaQueryWrapper condition(SystemUserDO entity) { + default LambdaQueryWrapper queryCondition(SystemUserDO entity) { return this.wrapper() .eq(SystemUserDO::getId, entity.getId()) .eq(SystemUserDO::getUsername, entity.getUsername()) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java index b71cb782..3597e9ac 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java @@ -19,12 +19,12 @@ import java.util.stream.Collectors; public interface SystemUserRoleDAO extends IMapper { /** - * 获取全部条件 + * 获取查询条件 * * @param entity entity - * @return 全部条件 + * @return 查询条件 */ - default LambdaQueryWrapper condition(SystemUserRoleDO entity) { + default LambdaQueryWrapper queryCondition(SystemUserRoleDO entity) { return this.wrapper() .eq(SystemUserRoleDO::getId, entity.getId()) .eq(SystemUserRoleDO::getUserId, entity.getUserId()) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java index 0d438f9e..cc80a7fe 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java @@ -31,7 +31,7 @@ public interface SystemMenuService { * @param request request * @return effect */ - Integer updateSystemMenu(SystemMenuUpdateRequest request); + Integer updateSystemMenuById(SystemMenuUpdateRequest request); /** * 通过 id 查询菜单 @@ -39,7 +39,7 @@ public interface SystemMenuService { * @param id id * @return row */ - SystemMenuVO getSystemMenu(Long id); + SystemMenuVO getSystemMenuById(Long id); /** * 查询菜单 @@ -47,7 +47,7 @@ public interface SystemMenuService { * @param request request * @return rows */ - List getSystemMenuList(SystemMenuQueryRequest request); + List getSystemMenuByIdList(SystemMenuQueryRequest request); /** * 构建菜单树 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java index dda3b08b..72bce04e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java @@ -32,7 +32,7 @@ public interface SystemRoleService { * @param request request * @return effect */ - Integer updateSystemRole(SystemRoleUpdateRequest request); + Integer updateSystemRoleById(SystemRoleUpdateRequest request); /** * 更新角色状态 @@ -48,14 +48,14 @@ public interface SystemRoleService { * @param id id * @return row */ - SystemRoleVO getSystemRole(Long id); + SystemRoleVO getSystemRoleById(Long id); /** * 查询所有角色 * * @return rows */ - List getSystemRoleList(); + List getSystemRoleByIdList(); /** * 分页查询角色 @@ -71,6 +71,6 @@ public interface SystemRoleService { * @param id id * @return effect */ - Integer deleteSystemRole(Long id); + Integer deleteSystemRoleById(Long id); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java index 8b6e5df6..8e778afe 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java @@ -29,7 +29,7 @@ public interface SystemUserService { * @param request request * @return effect */ - Integer updateSystemUser(SystemUserUpdateRequest request); + Integer updateSystemUserById(SystemUserUpdateRequest request); /** * 修改用户状态 @@ -45,14 +45,14 @@ public interface SystemUserService { * @param id id * @return row */ - SystemUserVO getSystemUser(Long id); + SystemUserVO getSystemUserById(Long id); /** * 查询所有用户 * * @return rows */ - List getSystemUserList(); + List getSystemUserByIdList(); /** * 分页查询用户 @@ -68,7 +68,7 @@ public interface SystemUserService { * @param id id * @return effect */ - Integer deleteSystemUser(Long id); + Integer deleteSystemUserById(Long id); /** * 重置密码 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java index 6d6fdad4..f2afd463 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java @@ -73,7 +73,7 @@ public class SystemMenuServiceImpl implements SystemMenuService { } @Override - public Integer updateSystemMenu(SystemMenuUpdateRequest request) { + public Integer updateSystemMenuById(SystemMenuUpdateRequest request) { // 查询 Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); SystemMenuDO record = systemMenuDAO.selectById(id); @@ -84,7 +84,7 @@ public class SystemMenuServiceImpl implements SystemMenuService { this.validateRequest(updateRecord, request.getType()); // 更新 int effect = systemMenuDAO.updateById(updateRecord); - log.info("SystemMenuService-updateSystemMenu effect: {}, updateRecord: {}", effect, JSON.toJSONString(updateRecord)); + log.info("SystemMenuService-updateSystemMenuById effect: {}, updateRecord: {}", effect, JSON.toJSONString(updateRecord)); // 重新查询转换为缓存 SystemMenuCacheDTO cache = SystemMenuConvert.MAPPER.toCache(systemMenuDAO.selectById(id)); // 获取原始缓存 @@ -100,7 +100,7 @@ public class SystemMenuServiceImpl implements SystemMenuService { } @Override - public SystemMenuVO getSystemMenu(Long id) { + public SystemMenuVO getSystemMenuById(Long id) { // 查询 SystemMenuDO record = systemMenuDAO.selectById(id); Valid.notNull(record, ErrorMessage.DATA_ABSENT); @@ -109,7 +109,7 @@ public class SystemMenuServiceImpl implements SystemMenuService { } @Override - public List getSystemMenuList(SystemMenuQueryRequest request) { + public List getSystemMenuByIdList(SystemMenuQueryRequest request) { String name = request.getName(); Integer type = request.getType(); Integer status = request.getStatus(); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java index 0d80a608..a26fc52b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java @@ -72,7 +72,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { } @Override - public Integer updateSystemRole(SystemRoleUpdateRequest request) { + public Integer updateSystemRoleById(SystemRoleUpdateRequest request) { // 查询 Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); SystemRoleDO record = systemRoleDAO.selectById(id); @@ -83,7 +83,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { this.checkNamePresent(updateRecord); // 更新 int effect = systemRoleDAO.updateById(updateRecord); - log.info("SystemRoleService-updateSystemRole effect: {}, updateRecord: {}", effect, JSON.toJSONString(updateRecord)); + log.info("SystemRoleService-updateSystemRoleById effect: {}, updateRecord: {}", effect, JSON.toJSONString(updateRecord)); // 设置到缓存 SystemRoleDO roleCache = permissionService.getRoleCache().get(record.getCode()); roleCache.setName(updateRecord.getName()); @@ -112,7 +112,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { } @Override - public SystemRoleVO getSystemRole(Long id) { + public SystemRoleVO getSystemRoleById(Long id) { // 查询角色 SystemRoleDO record = systemRoleDAO.selectById(id); Valid.notNull(record, ErrorMessage.ROLE_ABSENT); @@ -121,7 +121,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { } @Override - public List getSystemRoleList() { + public List getSystemRoleByIdList() { // 查询 List records = systemRoleDAO.selectList(null); if (records.isEmpty()) { @@ -148,7 +148,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { @Override @Transactional(rollbackFor = Exception.class) - public Integer deleteSystemRole(Long id) { + public Integer deleteSystemRoleById(Long id) { // 查询角色 SystemRoleDO record = systemRoleDAO.selectById(id); Valid.notNull(record, ErrorMessage.DATA_ABSENT); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java index 24ba6671..7de80aa0 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java @@ -66,7 +66,7 @@ public class SystemUserServiceImpl implements SystemUserService { } @Override - public Integer updateSystemUser(SystemUserUpdateRequest request) { + public Integer updateSystemUserById(SystemUserUpdateRequest request) { // 查询 Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); SystemUserDO record = systemUserDAO.selectById(id); @@ -77,7 +77,7 @@ public class SystemUserServiceImpl implements SystemUserService { this.checkNicknamePresent(updateRecord); // 更新 int effect = systemUserDAO.updateById(updateRecord); - log.info("SystemUserService-updateSystemUser effect: {}, updateRecord: {}", effect, JSON.toJSONString(updateRecord)); + log.info("SystemUserService-updateSystemUserById effect: {}, updateRecord: {}", effect, JSON.toJSONString(updateRecord)); // 更新缓存中的花名 RedisUtils.processSetJson(UserCacheKeyDefine.USER_INFO, s -> { s.setNickname(request.getNickname()); @@ -116,7 +116,7 @@ public class SystemUserServiceImpl implements SystemUserService { } @Override - public SystemUserVO getSystemUser(Long id) { + public SystemUserVO getSystemUserById(Long id) { // 查询 SystemUserDO record = systemUserDAO.selectById(id); Valid.notNull(record, ErrorMessage.USER_ABSENT); @@ -125,7 +125,7 @@ public class SystemUserServiceImpl implements SystemUserService { } @Override - public List getSystemUserList() { + public List getSystemUserByIdList() { // 查询 List records = systemUserDAO.selectList(null); if (records.isEmpty()) { @@ -154,12 +154,12 @@ public class SystemUserServiceImpl implements SystemUserService { @Override @Transactional(rollbackFor = Exception.class) - public Integer deleteSystemUser(Long id) { + public Integer deleteSystemUserById(Long id) { if (id.equals(SecurityUtils.getLoginUserId())) { throw ErrorCode.UNSUPPOETED.exception(); } int effect = systemUserDAO.deleteById(id); - log.info("SystemUserService-deleteSystemUser id: {}, effect: {}", id, effect); + log.info("SystemUserService-deleteSystemUserById id: {}, effect: {}", id, effect); // 删除角色关联 effect += systemUserRoleDAO.deleteByUserId(id); // 删除用户缓存 其他的会自动过期 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml index ea0d38b8..9c0d774f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml @@ -25,7 +25,7 @@ - create_time, update_time, creator, updater, deleted, id, parent_id, name, permission, type, sort, visible, status, cache, icon, path, component + id, parent_id, name, permission, type, sort, visible, status, cache, icon, path, component, create_time, update_time, creator, updater, deleted diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml index 94317d03..bae07f98 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml @@ -17,7 +17,7 @@ - create_time, update_time, creator, updater, deleted, id, name, code, status + id, name, code, status, create_time, update_time, creator, updater, deleted diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml index d6742694..df416887 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml @@ -16,7 +16,7 @@ - create_time, update_time, creator, updater, deleted, id, role_id, menu_id + id, role_id, menu_id, create_time, update_time, creator, updater, deleted diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml index fe911eb3..6ac63db1 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml @@ -22,7 +22,7 @@ - create_time, update_time, creator, updater, deleted, id, username, password, nickname, avatar, mobile, email, status, last_login_time + id, username, password, nickname, avatar, mobile, email, status, last_login_time, create_time, update_time, creator, updater, deleted diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml index e400f5c4..783e6356 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml @@ -16,7 +16,7 @@ - create_time, update_time, creator, updater, deleted, id, user_id, role_id + id, user_id, role_id, create_time, update_time, creator, updater, deleted