From 9e306aadc55c76edaf0326c54f099cbfe63a7b03 Mon Sep 17 00:00:00 2001 From: Odboy Date: Thu, 15 Jan 2026 21:52:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E9=87=8D=E6=9E=84=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemAuthController.java | 2 +- .../controller/SystemDeptController.java | 6 +- .../controller/SystemDictController.java | 6 +- .../controller/SystemJobController.java | 4 +- .../SystemLocalStorageController.java | 2 +- .../controller/SystemMenuController.java | 10 +- .../controller/SystemMonitorController.java | 2 +- .../controller/SystemOnlineController.java | 4 +- .../SystemOssStorageController.java | 2 +- .../controller/SystemQuartzJobController.java | 4 +- .../controller/SystemRoleController.java | 8 +- .../controller/SystemUserController.java | 6 +- .../system/dal/dataobject/SystemDeptTb.java | 6 +- .../dal/dataobject/SystemDictDetailTb.java | 2 +- .../system/dal/dataobject/SystemDictTb.java | 4 +- .../dal/dataobject/SystemEmailConfigTb.java | 2 +- .../system/dal/dataobject/SystemJobTb.java | 6 +- .../system/dal/dataobject/SystemMenuTb.java | 4 +- .../dal/dataobject/SystemOperationLogTb.java | 2 +- .../dal/dataobject/SystemQuartzJobTb.java | 4 +- .../dal/dataobject/SystemQuartzLogTb.java | 2 +- .../system/dal/dataobject/SystemRoleTb.java | 6 +- .../system/dal/dataobject/SystemUserTb.java | 8 +- .../model/export/SystemDeptExportRowVo.java | 2 +- .../model/export/SystemDictExportRowVo.java | 2 +- .../model/export/SystemJobExportRowVo.java | 2 +- .../export/SystemLocalStorageExportRowVo.java | 2 +- .../model/export/SystemMenuExportRowVo.java | 2 +- .../export/SystemOssStorageExportRowVo.java | 2 +- .../export/SystemQuartzJobExportRowVo.java | 2 +- .../export/SystemQuartzLogExportRowVo.java | 2 +- .../model/export/SystemRoleExportRowVo.java | 2 +- .../model/export/SystemUserExportRowVo.java | 2 +- .../request/SystemCheckEmailCaptchaArgs.java | 2 +- .../model/request/SystemCreateDeptArgs.java | 4 +- .../model/request/SystemCreateDictArgs.java | 2 +- .../request/SystemCreateDictDetailArgs.java | 4 +- .../model/request/SystemCreateJobArgs.java | 4 +- .../model/request/SystemCreateRoleArgs.java | 6 +- .../model/request/SystemQueryDeptArgs.java | 2 +- .../dal/model/request/SystemQueryJobArgs.java | 4 +- .../model/request/SystemQueryMenuArgs.java | 2 +- .../request/SystemQueryQuartzJobArgs.java | 2 +- .../model/request/SystemQueryRoleArgs.java | 2 +- .../model/request/SystemQueryStorageArgs.java | 2 +- .../model/request/SystemQueryUserArgs.java | 4 +- .../model/request/SystemSendEmailArgs.java | 6 +- .../request/SystemUpdateQuartzJobArgs.java | 4 +- .../model/request/SystemUserLoginArgs.java | 2 +- .../dal/model/response/SystemDeptVo.java | 4 +- .../model/response/SystemMenuRouterVo.java | 2 +- .../dal/model/response/SystemMenuVo.java | 4 +- .../response/SystemProductLineTreeVo.java | 2 +- .../dal/model/response/SystemRoleVo.java | 8 +- .../model/response/SystemSimpleUserVo.java | 2 +- .../dal/model/response/SystemUserInfoVo.java | 4 +- .../dal/model/response/SystemUserJwtVo.java | 6 +- .../model/response/SystemUserOnlineVo.java | 2 +- .../dal/model/response/SystemUserVo.java | 4 +- .../dal/mysql/SystemDictDetailMapper.java | 2 +- .../system/dal/mysql/SystemMenuMapper.java | 4 + .../dal/mysql/SystemRoleDeptMapper.java | 2 +- .../system/dal/mysql/SystemRoleMapper.java | 2 +- .../dal/mysql/SystemRoleMenuMapper.java | 9 + .../system/dal/mysql/SystemUserJobMapper.java | 2 +- .../system/dal/mysql/SystemUserMapper.java | 4 +- .../dal/mysql/SystemUserRoleMapper.java | 8 +- .../dal/redis/SystemUserOnlineInfoDAO.java | 10 +- .../system/service/SystemAuthService.java | 2 +- .../system/service/SystemCaptchaService.java | 2 +- .../system/service/SystemDataService.java | 4 +- .../system/service/SystemDeptService.java | 12 +- .../service/SystemDictDetailService.java | 6 +- .../system/service/SystemDictService.java | 8 +- .../system/service/SystemEmailService.java | 2 +- .../system/service/SystemJobService.java | 8 +- .../service/SystemLocalStorageService.java | 8 +- .../system/service/SystemMenuService.java | 297 ++++++++++++------ .../system/service/SystemMonitorService.java | 14 +- .../service/SystemOssStorageService.java | 4 +- .../service/SystemQuartzJobService.java | 10 +- .../system/service/SystemRoleDeptService.java | 6 +- .../system/service/SystemRoleMenuService.java | 92 ++++-- .../system/service/SystemRoleService.java | 114 +++---- .../system/service/SystemUserDeptService.java | 2 +- .../system/service/SystemUserJobService.java | 6 +- .../system/service/SystemUserRoleService.java | 53 ++-- .../system/service/SystemUserService.java | 14 +- .../impl/SystemMinioStorageServiceImpl.java | 6 +- .../mapper/SystemDictDetailMapper.xml | 50 +-- .../resources/mapper/SystemRoleMapper.xml | 13 + .../resources/mapper/SystemRoleMenuMapper.xml | 40 +++ .../resources/mapper/SystemUserMapper.xml | 15 + .../resources/mapper/SystemUserRoleMapper.xml | 12 + .../dal/model/response/SystemRoleVo.java | 9 +- .../dal/mysql/SystemRoleMenuMapper.java | 10 +- .../dal/mysql/SystemUserRoleMapper.java | 4 +- .../system/service/SystemMenuService.java | 129 ++++---- .../system/service/SystemRoleMenuService.java | 67 ++-- .../system/service/SystemRoleService.java | 16 +- .../system/service/SystemUserRoleService.java | 19 +- .../resources/mapper/SystemRoleMenuMapper.xml | 48 ++- 102 files changed, 819 insertions(+), 538 deletions(-) create mode 100644 cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMapper.xml create mode 100644 cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml create mode 100644 cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index 0ae7a5c9..7ae1c964 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -21,7 +21,6 @@ import cn.odboy.system.dal.model.response.SystemAuthVo; import cn.odboy.system.service.SystemAuthService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -29,6 +28,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletRequest; /** * 授权、根据token获取用户详细信息 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index 1734281a..ffe08ca5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -26,9 +26,6 @@ import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -39,6 +36,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Set; @RestController @Api(tags = "系统：部门管理") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index 5a0d701e..c7be0e7e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -25,9 +25,6 @@ import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -37,6 +34,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Set; @RestController @Api(tags = "系统：字典管理") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index ec2f0e3d..f0364ecc 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -25,8 +25,6 @@ import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -36,6 +34,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; +import java.util.Set; @RestController @Api(tags = "系统：岗位管理") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index c7d362e2..c55c1b94 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -24,7 +24,6 @@ import cn.odboy.system.service.SystemLocalStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -36,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletResponse; @RestController @Api(tags = "工具：本地存储管理") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index fed5c3f4..73ade6c6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -27,9 +27,6 @@ import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -40,6 +37,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Set; @RestController @Api(tags = "系统：菜单管理") @@ -67,8 +67,8 @@ public class SystemMenuController { @ApiOperation("返回全部的菜单") @PostMapping(value = "/listMenuByPid") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> listMenuByPid(@RequestParam Long pid) { - List systemMenuTbs = systemMenuService.listMenuByPid(pid); + public ResponseEntity> listMenuByPid(@RequestParam Long pid) { + List systemMenuTbs = systemMenuService.listMenuByPid(pid); return ResponseEntity.ok(systemMenuTbs); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java index fe5f66e6..305e9456 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java @@ -19,13 +19,13 @@ import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; @RestController @Api(tags = "系统-服务监控管理") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index 32791fed..39798607 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -24,8 +24,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -35,6 +33,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; +import java.util.Set; @RestController @RequestMapping("/api/user/online") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index d47ba249..34b1bf84 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -25,7 +25,6 @@ import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -38,6 +37,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletResponse; @Slf4j @RestController diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index e8607939..def140c3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -28,8 +28,6 @@ import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -41,6 +39,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; +import java.util.Set; @Slf4j @RestController diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 573ed5af..4976e91b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -27,9 +27,6 @@ import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -39,6 +36,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Set; @RestController @Api(tags = "系统：角色管理") @@ -52,7 +52,7 @@ public class SystemRoleController { @PostMapping(value = "/getRoleById") @PreAuthorize("@el.check('roles:list')") public ResponseEntity getRoleById(@RequestBody SystemRoleTb args) { - return ResponseEntity.ok(systemRoleService.getRoleById(args.getId())); + return ResponseEntity.ok(systemRoleService.getRoleVoById(args.getId())); } @ApiOperation("导出角色数据") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 29f6614d..ce25a15b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -30,9 +30,6 @@ import cn.odboy.system.service.SystemUserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -45,6 +42,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Set; @Api(tags = "系统：用户管理") @RestController diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java index 9ffe2958..6098ddfc 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java @@ -20,11 +20,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import java.util.Objects; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.util.Objects; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java index 58c2ae3e..11dc5427 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java @@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java index 3411c062..50b6c8fd 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java @@ -22,10 +22,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java index 0b911bca..b91b65ad 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitObject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.NotBlank; /** * 邮件配置类，数据存覆盖式存入数据存 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java index feb25fc3..758a05b4 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java @@ -20,11 +20,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import java.util.Objects; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.util.Objects; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java index 97539e16..527084fe 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java @@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import java.util.Objects; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotNull; +import java.util.Objects; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java index 9c3fccb6..d24e9967 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java @@ -23,10 +23,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Getter; import lombok.Setter; import lombok.ToString; +import java.util.Date; /** *

diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java index 2e46ceb1..51010e21 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java @@ -22,10 +22,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java index e73c4ab3..b0790f6c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java @@ -22,9 +22,9 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; @Data @TableName("system_quartz_log") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java index 9fcef34a..890e0e9d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java @@ -23,11 +23,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import java.util.Objects; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.util.Objects; /** * 角色 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java index 4dec53bd..d316ffe8 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java @@ -21,13 +21,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.Objects; +import lombok.Getter; +import lombok.Setter; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Getter; -import lombok.Setter; +import java.util.Date; +import java.util.Objects; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java index a83c0cc0..ee234576 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java index 7f9595a1..0df68de8 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java index 94642e20..c54d90ce 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java index d175f1f1..7bec3a35 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java index f30f03bf..bb32d88c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java index 2b399cdf..86da25e1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java index 1f93e1b2..eb3dd3b4 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java index 5f4a3254..c1d546c1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java index eebd412c..cf89fb2e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java index 30ddcca6..c8f4a375 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java index b4c081ee..47bf284b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; -import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotBlank; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java index cf3a9722..56c481b5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java @@ -16,10 +16,10 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java index d7604f07..b2ea87f6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; -import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.NotBlank; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java index 1ab2b169..008a7565 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java @@ -17,10 +17,10 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import cn.odboy.system.dal.dataobject.SystemDictTb; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java index 6483f03a..82007e9c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java @@ -16,10 +16,10 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java index afe7c2c4..c60d9143 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java @@ -17,11 +17,11 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import java.util.Set; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.util.Set; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java index 9bb6801d..9669b314 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.Date; import java.util.List; -import lombok.Data; @Data public class SystemQueryDeptArgs { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java index 20b941ca..fe7f27d6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java @@ -16,10 +16,10 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; +import java.util.List; @Data @NoArgsConstructor diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java index a1c27634..d5a3de73 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.Date; import java.util.List; -import lombok.Data; @Data public class SystemQueryMenuArgs { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java index 28b26933..45e63cb8 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.Date; import java.util.List; -import lombok.Data; @Data public class SystemQueryQuartzJobArgs { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java index 04bcf729..b424c5be 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.Date; import java.util.List; -import lombok.Data; @Data public class SystemQueryRoleArgs { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java index 87c7070c..78d69aa2 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.Date; import java.util.List; -import lombok.Data; @Data public class SystemQueryStorageArgs { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java index 0ae886f9..6af6f08e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java @@ -17,12 +17,12 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; -import lombok.Data; -import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java index a22cfc32..33e2580d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java @@ -16,12 +16,12 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import java.util.List; /** * 发送邮件时，接收参数的类 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java index 5084233a..3dd546a1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java @@ -16,10 +16,10 @@ package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java index 23a93abf..636b9dd3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; +import jakarta.validation.constraints.NotBlank; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java index d94e8e17..1f1d19b5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java @@ -18,11 +18,11 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; import java.util.List; import java.util.Objects; import java.util.Set; -import lombok.Getter; -import lombok.Setter; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java index a1ffaab5..61d9a9ea 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import io.swagger.annotations.ApiModelProperty; -import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; /** * 构建前端路由时用到 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java index 58e83774..b967e836 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java @@ -18,11 +18,11 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; import java.util.List; import java.util.Objects; import java.util.Set; -import lombok.Getter; -import lombok.Setter; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java index 16d5cd68..891ee082 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; -import java.util.List; import lombok.Getter; import lombok.Setter; +import java.util.List; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java index 5d33c0c0..9c57efe8 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java @@ -18,12 +18,13 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemUserTb; import io.swagger.annotations.ApiModelProperty; -import java.util.Objects; -import java.util.Set; import lombok.Getter; import lombok.Setter; +import java.util.Objects; +import java.util.Set; @Getter @Setter @@ -45,7 +46,7 @@ public class SystemRoleVo extends KitBaseUserTimeTb { @ApiModelProperty(value = "用户", hidden = true) private Set users; @ApiModelProperty(value = "菜单", hidden = true) - private Set menus; + private Set menus; @ApiModelProperty(value = "部门", hidden = true) private Set depts; @@ -66,5 +67,4 @@ public class SystemRoleVo extends KitBaseUserTimeTb { return Objects.hash(id); } - } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java index 6e67d147..75862f38 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java @@ -20,9 +20,9 @@ import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import io.swagger.annotations.ApiModelProperty; -import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Set; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java index c85c3928..9a203890 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java @@ -16,11 +16,11 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import lombok.Data; -import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java index 0a3839e9..9d406451 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java @@ -17,12 +17,12 @@ package cn.odboy.system.dal.model.response; import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.security.core.userdetails.UserDetails; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; @Getter @AllArgsConstructor diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java index 5416122e..b4faeaa4 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java @@ -16,8 +16,8 @@ package cn.odboy.system.dal.model.response; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; +import java.util.Date; /** * 在线用户 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java index 971ca461..15c889ec 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java @@ -19,11 +19,11 @@ import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; import java.util.Date; import java.util.Objects; import java.util.Set; -import lombok.Getter; -import lombok.Setter; @Getter @Setter diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java index 830b0439..424eecd7 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java @@ -21,9 +21,9 @@ import cn.odboy.system.dal.model.response.SystemDictDetailVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; /** * 字典明细 Mapper diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java index 6c7b4124..b19e4afe 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemMenuMapper.java @@ -18,6 +18,7 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemMenuTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import java.util.List; /** * 菜单 Mapper @@ -27,4 +28,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemMenuMapper extends BaseMapper { + default List listAll() { + return selectList(null); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleDeptMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleDeptMapper.java index 80a3762e..ddec61d7 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleDeptMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleDeptMapper.java @@ -18,9 +18,9 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleDeptTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.Set; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Set; /** * 角色部门关联 Mapper diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMapper.java index 7d42b87a..8de3bf3c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMapper.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemRoleTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; /** * 角色 Mapper diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java index bf312c63..544d56e3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java @@ -15,9 +15,13 @@ */ package cn.odboy.system.dal.mysql; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Set; /** * 角色菜单关联 Mapper @@ -27,4 +31,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemRoleMenuMapper extends BaseMapper { + Set listMenuPermissionByRoleIds(@Param("roleIds") Set roleIds); + + List listMenuWithRoleIdsNeButton(@Param("roleIds") Set roleIds); + + List listMenuWithRoleIds(@Param("roleIds") Set roleIds); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserJobMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserJobMapper.java index ad5f3ad2..415c15c9 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserJobMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserJobMapper.java @@ -18,9 +18,9 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemUserJobTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.Set; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Set; /** * 用户职位关联 Mapper diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserMapper.java index 538f343e..d23f4744 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserMapper.java @@ -18,10 +18,10 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemUserTb; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; -import java.util.Set; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Set; /** * 用户 Mapper diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java index 9415901c..698fb37f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java @@ -18,14 +18,16 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; -import java.util.Set; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Set; @Mapper public interface SystemUserRoleMapper extends BaseMapper { Set listUserRoleByUserId(@Param("userId") Long userId); - List listUserRoleLevelByUserId(@Param("userId") Long userId); + + Set listUserRoleLevelByUserId(@Param("userId") Long userId); + + Set listUserRoleIdByUserId(@Param("userId") Long userId); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index c668a932..2aac9cb9 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -30,17 +30,17 @@ import cn.odboy.util.KitIPUtil; import cn.odboy.util.KitPageUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; @Slf4j @Component diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java index 429185d1..801d9dab 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java @@ -29,13 +29,13 @@ import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitRsaEncryptUtil; import cn.odboy.util.KitValidUtil; -import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import jakarta.servlet.http.HttpServletRequest; /** * 用户认证 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java index 9f329856..91d2ac7e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java @@ -25,9 +25,9 @@ import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.model.response.SystemCaptchaVo; import cn.odboy.system.dal.redis.SystemCacheKey; import com.wf.captcha.base.Captcha; -import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.concurrent.TimeUnit; /** * 验证码 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java index c63e3ecc..5e1a39ee 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java @@ -20,14 +20,14 @@ import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.model.response.SystemUserVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; /** * 数据权限 diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index e588241d..9fd4905d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -36,6 +36,10 @@ import cn.odboy.util.KitClassUtil; import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -47,10 +51,6 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemDeptService { @@ -129,7 +129,7 @@ public class SystemDeptService { /** * 更新父节点中子节点数目 -> TestPassed * - * @param deptId / + * @param deptId 部门id */ @Transactional(rollbackFor = Exception.class) public void updateDeptSubCnt(Long deptId) { @@ -179,7 +179,7 @@ public class SystemDeptService { /** * 查询所有数据 * - * @param args 条件 + * @param args / * @param isQuery / * @return / * @throws Exception / diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index b40009e0..691e3b6e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -31,14 +31,14 @@ import cn.odboy.util.KitValidUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemDictDetailService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index 9e3c8b0f..e01bfb06 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -29,13 +29,13 @@ import cn.odboy.util.KitPageUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import jakarta.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; @Service public class SystemDictService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java index f7cc154f..de0c69ad 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java @@ -30,11 +30,11 @@ import cn.odboy.system.dal.model.request.SystemSendEmailArgs; import cn.odboy.system.dal.mysql.SystemEmailConfigMapper; import cn.odboy.util.KitDesEncryptUtil; import cn.odboy.util.KitResourceTemplateUtil; -import java.util.Collections; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; @Slf4j @Service diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index 6e9b6735..aef9d605 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -29,13 +29,13 @@ import cn.odboy.util.KitPageUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import jakarta.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; @Service public class SystemJobService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index d8d68ad1..5db8f625 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -35,16 +35,16 @@ import cn.odboy.util.KitPageUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.io.File; -import java.util.Date; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; @Slf4j @Service diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index d9ec7590..f3f88ec6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -27,7 +27,6 @@ import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemMenuMetaVo; import cn.odboy.system.dal.model.response.SystemMenuRouterVo; import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; @@ -36,19 +35,20 @@ import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; -import java.util.Objects; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemMenuService { @@ -59,23 +59,27 @@ public class SystemMenuService { private SystemRoleMenuService systemRoleMenuService; @Autowired private SystemUserRoleService systemUserRoleService; + @Lazy + @Autowired + private SystemMenuService proxyService; /** - * 创建 + * 创建 -> TestPassed * * @param args / */ @Transactional(rollbackFor = Exception.class) public void saveMenu(SystemMenuTb args) { - if (this.getMenuByTitle(args.getTitle()) != null) { + if (this.existMenuWithTitle(args.getTitle())) { throw new BadRequestException("菜单标题已存在"); } if (StrUtil.isNotBlank(args.getComponentName())) { - if (this.getMenuByComponentName(args.getComponentName()) != null) { + if (this.existMenuWithComponentName(args.getComponentName())) { throw new BadRequestException("菜单组件名称已存在"); } } if (Long.valueOf(0L).equals(args.getPid())) { + // 顶级目录 args.setPid(null); } if (args.getIFrame()) { @@ -92,7 +96,57 @@ public class SystemMenuService { } /** - * 编辑 + * 根据组件名称查询菜单是否存在 -> TestPassed + * + * @param componentName 组件名称 + * @return / + */ + private boolean existMenuWithComponentName(String componentName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemMenuTb::getComponentName, componentName); + return systemMenuMapper.exists(wrapper); + } + + /** + * 根据组件名称查询菜单是否存在 -> TestPassed + * + * @param componentName 组件名称 + * @return / + */ + private boolean existMenuWithComponentNameNeSelf(String componentName, Long currentMenuId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemMenuTb::getComponentName, componentName); + wrapper.ne(SystemMenuTb::getId, currentMenuId); + return systemMenuMapper.exists(wrapper); + } + + /** + * 根据菜单标题查询菜单是否存在 -> TestPassed + * + * @param title 菜单标题 + * @return / + */ + private boolean existMenuWithTitle(String title) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemMenuTb::getTitle, title); + return systemMenuMapper.exists(wrapper); + } + + /** + * 根据菜单标题查询菜单是否存在 -> TestPassed + * + * @param title 菜单标题 + * @return / + */ + private boolean existMenuWithTitleNeSelf(String title, Long currentMenuId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemMenuTb::getTitle, title); + wrapper.ne(SystemMenuTb::getId, currentMenuId); + return systemMenuMapper.exists(wrapper); + } + + /** + * 编辑 -> TestPassed * * @param args / */ @@ -108,8 +162,7 @@ public class SystemMenuService { throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); } } - SystemMenuTb menu1 = this.getMenuByTitle(args.getTitle()); - if (menu1 != null && !menu1.getId().equals(menu.getId())) { + if (this.existMenuWithTitleNeSelf(args.getTitle(), menu.getId())) { throw new BadRequestException("菜单标题已存在"); } if (args.getPid().equals(0L)) { @@ -119,8 +172,7 @@ public class SystemMenuService { Long oldPid = menu.getPid(); Long newPid = args.getPid(); if (StrUtil.isNotBlank(args.getComponentName())) { - menu1 = this.getMenuByComponentName(args.getComponentName()); - if (menu1 != null && !menu1.getId().equals(menu.getId())) { + if (this.existMenuWithComponentNameNeSelf(args.getTitle(), menu.getId())) { throw new BadRequestException("菜单组件名称已存在"); } } @@ -139,36 +191,101 @@ public class SystemMenuService { // auto fill menu.setUpdateBy(null); menu.setUpdateTime(null); - systemMenuMapper.insertOrUpdate(menu); + systemMenuMapper.updateById(menu); // 计算父级菜单节点数目 this.updateMenuSubCnt(oldPid); this.updateMenuSubCnt(newPid); } /** - * 删除 + * 删除 -> TestPassed */ @Transactional(rollbackFor = Exception.class) public void deleteMenuByIds(Set ids) { - Set menuSet = new HashSet<>(); - for (Long id : ids) { - List menuList = this.listMenuByPid(id); - menuSet.add(this.getMenuVoById(id)); - menuSet = this.queryChildMenuByArgs(menuList, menuSet); + // Set menuSet = new HashSet<>(); + // for (Long id : ids) { + // List menuList = this.listMenuByPid(id); + // menuSet.add(this.getMenuVoById(id)); + // menuSet = this.queryChildMenuByArgs(menuList, menuSet); + // } + // List menuIds = menuSet.stream().map(SystemMenuVo::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + // if (CollUtil.isNotEmpty(menuIds)) { + // systemRoleMenuService.deleteRoleMenuByMenuIds(menuIds); + // systemMenuMapper.deleteByIds(menuIds); + // } + // for (SystemMenuVo menu : menuSet) { + // this.updateMenuSubCnt(menu.getPid()); + // } + // ========= 优化 20260114 ========= + if (CollUtil.isEmpty(ids)) { + return; } - List menuIds = - menuSet.stream().map(SystemMenuVo::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); - if (CollUtil.isNotEmpty(menuIds)) { - systemRoleMenuService.deleteRoleMenuByMenuIds(menuIds); - systemMenuMapper.deleteByIds(menuIds); - } - for (SystemMenuVo menu : menuSet) { - this.updateMenuSubCnt(menu.getPid()); + // 查询所有菜单数据 + List allMenus = systemMenuMapper.listAll(); + // 根据ID集合获取当前菜单和其子菜单 + Set allMenuIds = this.getAllMenuIdsWithChildren(ids, allMenus); + if (CollUtil.isNotEmpty(allMenuIds)) { + // 删除角色菜单关联 + systemRoleMenuService.deleteRoleMenuByMenuIds(allMenuIds); + // 批量删除菜单 + systemMenuMapper.deleteByIds(allMenuIds); + // 更新父级菜单子节点数量 + this.updateParentMenuCounts(allMenuIds, allMenus); } } - private SystemMenuVo getMenuVoById(Long id) { - return KitBeanUtil.copyToClass(systemMenuMapper.selectById(id), SystemMenuVo.class); + /** + * 从所有菜单中找出指定ID及其子菜单ID + * + * @param rootIds 要删除的根菜单ID集合 + * @param allMenus 所有菜单数据 + * @return 包含根菜单及其所有子菜单的ID集合 + */ + private Set getAllMenuIdsWithChildren(Set rootIds, List allMenus) { + Set result = new HashSet<>(rootIds); + Set currentLevelIds = new HashSet<>(rootIds); + // 构建父ID到子菜单的映射 + Map> parentToChildrenMap = allMenus.stream().filter(menu -> menu.getPid() != null) + .collect(Collectors.groupingBy(SystemMenuTb::getPid)); + while (!currentLevelIds.isEmpty()) { + Set nextLevelIds = new HashSet<>(); + // 对于当前层级的每个菜单ID，查找其子菜单 + for (Long parentId : currentLevelIds) { + List children = parentToChildrenMap.get(parentId); + if (children != null && !children.isEmpty()) { + for (SystemMenuTb child : children) { + if (result.add(child.getId())) { // 如果成功添加（之前不存在），则继续查找其子菜单 + nextLevelIds.add(child.getId()); + } + } + } + } + currentLevelIds = nextLevelIds; + } + return result; + } + + /** + * 更新被删除菜单的父菜单子节点计数 + */ + private void updateParentMenuCounts(Set deletedMenuIds, List allMenus) { + // 获取被删除菜单的父ID + Set parentIds = + allMenus.stream().filter(menu -> deletedMenuIds.contains(menu.getId()) && menu.getPid() != null) + .map(SystemMenuTb::getPid).collect(Collectors.toSet()); + // 更新每个父菜单的子节点计数 + for (Long parentId : parentIds) { + proxyService.updateMenuSubCnt(parentId); + } + } + + /** + * 根据菜单id查询目录 -> TestPassed + * + * @param id 菜单id + */ + private SystemMenuTb getMenuById(Long id) { + return systemMenuMapper.selectById(id); } @Transactional(rollbackFor = Exception.class) @@ -217,29 +334,30 @@ public class SystemMenuService { * @param currentUserId / * @return / */ - public List listMenuByUserId(Long currentUserId) { - List roles = systemUserRoleService.listRoleVoByUsersId(currentUserId); - Set roleIds = roles.stream().map(SystemRoleVo::getId).collect(Collectors.toSet()); - return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds)); + public List listMenuByUserId(Long currentUserId) { +// List roles = systemUserRoleService.listRoleVoByUsersId(currentUserId); +// Set roleIds = roles.stream().map(SystemRoleVo::getId).collect(Collectors.toSet()); + Set roleIds = systemUserRoleService.listUserRoleIdByUserId(currentUserId); + return systemRoleMenuService.listMenuByRoleIds(roleIds, false); } - /** - * 查询所有子节点, 包含自身ID - * - * @param menuList / - * @param menuSet / - * @return / - */ - public Set queryChildMenuByArgs(List menuList, Set menuSet) { - for (SystemMenuVo menu : menuList) { - menuSet.add(menu); - List menus = this.listMenuByPid(menu.getId()); - if (CollUtil.isNotEmpty(menus)) { - queryChildMenuByArgs(menus, menuSet); - } - } - return menuSet; - } +// /** +// * 查询所有子节点, 包含自身ID +// * +// * @param menuList / +// * @param menuSet / +// * @return / +// */ +// public Set queryChildMenuByArgs(List menuList, Set menuSet) { +// for (SystemMenuTb menu : menuList) { +// menuSet.add(menu); +// List menus = this.listMenuByPid(menu.getId()); +// if (CollUtil.isNotEmpty(menus)) { +// queryChildMenuByArgs(menus, menuSet); +// } +// } +// return menuSet; +// } /** * 懒加载菜单数据 @@ -247,13 +365,13 @@ public class SystemMenuService { * @param pid / * @return / */ - public List listMenuByPid(Long pid) { - List menus; + public List listMenuByPid(Long pid) { + List menus; if (pid != null && !pid.equals(0L)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemMenuTb::getPid, pid); wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class); + return systemMenuMapper.selectList(wrapper); } else { menus = this.listRootMenu(); } @@ -261,19 +379,19 @@ public class SystemMenuService { } /** - * 根据ID查询同级与上级数据 + * 根据ID查询同级与上级数据 -> TestPassed * * @param menu / * @param menus / * @return / */ - public List querySuperiorMenuByArgs(SystemMenuVo menu, List menus) { + public List querySuperiorMenuByArgs(SystemMenuTb menu, List menus) { if (menu.getPid() == null) { menus.addAll(this.listRootMenu()); return menus; } menus.addAll(this.listMenuByPid(menu.getPid())); - return querySuperiorMenuByArgs(this.getMenuVoById(menu.getPid()), menus); + return querySuperiorMenuByArgs(this.getMenuById(menu.getPid()), menus); } /** @@ -282,14 +400,15 @@ public class SystemMenuService { * @param menus 原始数据 * @return / */ - public List buildMenuTree(List menus) { + public List buildMenuTree(List menus) { + List systemMenuVos = KitBeanUtil.copyToList(menus, SystemMenuVo.class); List trees = new ArrayList<>(); Set ids = new HashSet<>(); - for (SystemMenuVo menu : menus) { + for (SystemMenuVo menu : systemMenuVos) { if (menu.getPid() == null) { trees.add(menu); } - for (SystemMenuVo it : menus) { + for (SystemMenuVo it : systemMenuVos) { if (menu.getId().equals(it.getPid())) { if (menu.getChildren() == null) { menu.setChildren(new ArrayList<>()); @@ -300,7 +419,7 @@ public class SystemMenuService { } } if (CollUtil.isNotEmpty(trees)) { - trees = menus.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); + trees = systemMenuVos.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); } return trees; } @@ -375,20 +494,8 @@ public class SystemMenuService { return menuVo1; } - public List listMenuByIds(List ids) { - return KitBeanUtil.copyToList(systemMenuMapper.selectByIds(ids), SystemMenuVo.class); - } - - private SystemMenuTb getMenuByComponentName(String componentName) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemMenuTb::getComponentName, componentName); - return systemMenuMapper.selectOne(wrapper); - } - - private SystemMenuTb getMenuByTitle(String title) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemMenuTb::getTitle, title); - return systemMenuMapper.selectOne(wrapper); + public List listMenuByIds(List ids) { + return systemMenuMapper.selectByIds(ids); } private Long countMenuByPid(Long pid) { @@ -412,35 +519,39 @@ public class SystemMenuService { return systemMenuMapper.selectList(wrapper); } - private List listRootMenu() { + /** + * 查询根目录 -> TestPassed + */ + private List listRootMenu() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.isNull(SystemMenuTb::getPid); wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class); + return systemMenuMapper.selectList(wrapper); } public List buildFrontMenus() { - List originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); + List originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); List targetMenus = this.buildMenuTree(originMenus); return this.buildMenuVo(targetMenus); } public Set listChildMenuSetByMenuId(Long id) { - Set menuSet = new HashSet<>(); - List menuList = this.listMenuByPid(id); - menuSet.add(this.getMenuVoById(id)); - menuSet = this.queryChildMenuByArgs(menuList, menuSet); - return menuSet.stream().map(SystemMenuVo::getId).collect(Collectors.toSet()); +// Set menuSet = new HashSet<>(); +// List menuList = this.listMenuByPid(id); +// menuSet.add(this.getMenuById(id)); +// menuSet = this.queryChildMenuByArgs(menuList, menuSet); +// return menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); + List allMenus = systemMenuMapper.listAll(); + return this.getAllMenuIdsWithChildren(CollUtil.newHashSet(id), allMenus); } public List listMenuSuperior(List ids) { - Set menus; - List systemMenuTbs; + Set menus; if (CollUtil.isNotEmpty(ids)) { menus = new LinkedHashSet<>(this.listMenuByIds(ids)); - for (SystemMenuVo menu : menus) { - List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); - for (SystemMenuVo data : menuList) { + for (SystemMenuTb menu : menus) { + List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); + for (SystemMenuTb data : menuList) { if (data.getId().equals(menu.getPid())) { data.setSubCount(data.getSubCount() - 1); } @@ -449,12 +560,12 @@ public class SystemMenuService { } // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); - List newMenuList = new ArrayList<>(menus); - systemMenuTbs = this.buildMenuTree(newMenuList); + List newMenuList = new ArrayList<>(menus); + return this.buildMenuTree(newMenuList); } else { - systemMenuTbs = this.listMenuByPid(null); + List records = this.listMenuByPid(null); + return KitBeanUtil.copyToList(records, SystemMenuVo.class); } - return systemMenuTbs; } public void exportMenuXlsx(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java index b2e12644..50da4422 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java @@ -20,13 +20,6 @@ import cn.hutool.core.date.DateUtil; import cn.odboy.constant.SystemConst; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitIPUtil; -import java.lang.management.ManagementFactory; -import java.text.DecimalFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import oshi.SystemInfo; @@ -39,6 +32,13 @@ import oshi.software.os.OSFileStore; import oshi.software.os.OperatingSystem; import oshi.util.FormatUtil; import oshi.util.Util; +import java.lang.management.ManagementFactory; +import java.text.DecimalFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Slf4j @Service diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java index f8aed6c0..de41a08e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java @@ -21,9 +21,9 @@ import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.dal.model.response.SystemOssStorageVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; /** *

diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index 15433f44..76525590 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -37,15 +37,15 @@ import cn.odboy.util.KitPageUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import jakarta.servlet.http.HttpServletResponse; import org.quartz.CronExpression; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import jakarta.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; @Service public class SystemQuartzJobService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java index d49b4493..c2232ffa 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleDeptService.java @@ -20,12 +20,12 @@ import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleDeptTb; import cn.odboy.system.dal.mysql.SystemRoleDeptMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; @Service public class SystemRoleDeptService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java index bb0a308a..c5624ca7 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java @@ -16,30 +16,30 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; -import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; -import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; @Service public class SystemRoleMenuService { @Autowired private SystemRoleMenuMapper systemRoleMenuMapper; - @Autowired - private SystemMenuMapper systemMenuMapper; + /** + * 删除角色菜单关联 -> TestPassed + * + * @param roleId 角色id + */ @Transactional(rollbackFor = Exception.class) public void deleteRoleMenuByRoleId(Long roleId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -47,11 +47,17 @@ public class SystemRoleMenuService { systemRoleMenuMapper.delete(wrapper); } + /** + * 批量绑定角色菜单关联 -> TestPassed + * + * @param menus 菜单集合 + * @param roleId 角色id + */ @Transactional(rollbackFor = Exception.class) - public void batchInsertRoleMenu(Set menus, Long roleId) { + public void batchInsertRoleMenu(Set menus, Long roleId) { if (CollUtil.isNotEmpty(menus)) { List records = new ArrayList<>(); - for (SystemMenuVo menu : menus) { + for (SystemMenuTb menu : menus) { SystemRoleMenuTb record = new SystemRoleMenuTb(); record.setMenuId(menu.getId()); record.setRoleId(roleId); @@ -61,6 +67,11 @@ public class SystemRoleMenuService { } } + /** + * 批量删除角色菜单关联 -> TestPassed + * + * @param roleIds 角色id集合 + */ @Transactional(rollbackFor = Exception.class) public void batchDeleteRoleMenu(Set roleIds) { if (CollUtil.isNotEmpty(roleIds)) { @@ -70,30 +81,40 @@ public class SystemRoleMenuService { } } - public LinkedHashSet queryMenuByRoleIds(Set roleIds) { + /** + * @param roleIds 角色id集合 -> TestPassed + * @return / + */ + public List listMenuByRoleIds(Set roleIds, boolean hasButton) { if (CollUtil.isEmpty(roleIds)) { - return new LinkedHashSet<>(); + return new ArrayList<>(); } - LambdaQueryWrapper roleMenuWrapper = new LambdaQueryWrapper<>(); - roleMenuWrapper.in(SystemRoleMenuTb::getRoleId, roleIds); - List menuIds = systemRoleMenuMapper.selectList(roleMenuWrapper).stream().map(SystemRoleMenuTb::getMenuId) - .collect(Collectors.toList()); - if (CollUtil.isEmpty(menuIds)) { - return new LinkedHashSet<>(); +// LambdaQueryWrapper roleMenuWrapper = new LambdaQueryWrapper<>(); +// roleMenuWrapper.in(SystemRoleMenuTb::getRoleId, roleIds); +// List menuIds = systemRoleMenuMapper.selectList(roleMenuWrapper).stream().map(SystemRoleMenuTb::getMenuId) +// .collect(Collectors.toList()); +// if (CollUtil.isEmpty(menuIds)) { +// return new ArrayList<>(); +// } +// LambdaQueryWrapper menuWrapper = new LambdaQueryWrapper<>(); +// menuWrapper.in(SystemMenuTb::getId, menuIds); +// // 排除"按钮" +// menuWrapper.ne(SystemMenuTb::getType, 2); +// menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); +// return systemMenuMapper.selectList(menuWrapper); + if (hasButton){ + return systemRoleMenuMapper.listMenuWithRoleIds(roleIds); } - LambdaQueryWrapper menuWrapper = new LambdaQueryWrapper<>(); - menuWrapper.in(SystemMenuTb::getId, menuIds); - // 排除"按钮" - menuWrapper.ne(SystemMenuTb::getType, 2); - menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); - - List systemMenuTbs = systemMenuMapper.selectList(menuWrapper); - List systemMenuVos = KitBeanUtil.copyToList(systemMenuTbs, SystemMenuVo.class); - return new LinkedHashSet<>(systemMenuVos); + return systemRoleMenuMapper.listMenuWithRoleIdsNeButton(roleIds); } + /** + * 批量删除菜单角色关联 -> TestPassed + * + * @param menuIds 菜单id集合 + */ @Transactional(rollbackFor = Exception.class) - public void deleteRoleMenuByMenuIds(List menuIds) { + public void deleteRoleMenuByMenuIds(Set menuIds) { if (CollUtil.isEmpty(menuIds)) { return; } @@ -101,4 +122,15 @@ public class SystemRoleMenuService { wrapper.in(SystemRoleMenuTb::getMenuId, menuIds); systemRoleMenuMapper.delete(wrapper); } + + /** + * 根据角色id集合查询菜单权限 -> TestPassed + * + * @param roleIds 角色id集合 + * @return / + */ + public List listMenuPermissionByRoleIds(Set roleIds) { + Set permissions = systemRoleMenuMapper.listMenuPermissionByRoleIds(roleIds); + return permissions.stream().filter(StrUtil::isNotBlank).collect(Collectors.toList()); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 38dc289d..87fe39f5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -20,11 +20,11 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.model.export.SystemRoleExportRowVo; import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.response.SystemMenuVo; import cn.odboy.system.dal.model.response.SystemRoleCodeVo; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.model.response.SystemUserVo; @@ -32,20 +32,20 @@ import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; -import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemRoleService { @@ -67,7 +67,7 @@ public class SystemRoleService { @Transactional(rollbackFor = Exception.class) public void saveRole(SystemCreateRoleArgs args) { checkRoleLevels(args.getLevel()); - if (this.countRoleByName(args.getName()) > 0) { + if (this.existRoleWithName(args.getName())) { throw new BadRequestException("角色名称已存在"); } SystemRoleTb roleTb = KitBeanUtil.copyToClass(args, SystemRoleTb.class); @@ -78,16 +78,17 @@ public class SystemRoleService { } } - private SystemRoleTb getRoleByName(String name) { + private boolean existRoleWithName(String name) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemRoleTb::getName, name); - return systemRoleMapper.selectOne(wrapper); + return systemRoleMapper.exists(wrapper); } - private long countRoleByName(String name) { + private boolean existRoleWithNameNeSelf(String name, Long roleId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemRoleTb::getName, name); - return systemRoleMapper.selectCount(wrapper); + wrapper.eq(SystemRoleTb::getId, roleId); + return systemRoleMapper.exists(wrapper); } /** @@ -98,9 +99,8 @@ public class SystemRoleService { @Transactional(rollbackFor = Exception.class) public void updateRoleById(SystemRoleVo args) { checkRoleLevels(args.getLevel()); - SystemRoleTb role = this.getRoleTbById(args.getId()); - SystemRoleTb role1 = this.getRoleByName(args.getName()); - if (role1 != null && !role1.getId().equals(role.getId())) { + SystemRoleTb role = systemRoleMapper.selectById(args.getId()); + if (this.existRoleWithNameNeSelf(args.getName(), role.getId())) { throw new BadRequestException("角色名称已存在"); } role.setName(args.getName()); @@ -108,7 +108,7 @@ public class SystemRoleService { role.setDataScope(args.getDataScope()); role.setLevel(args.getLevel()); // 更新 - systemRoleMapper.insertOrUpdate(role); + systemRoleMapper.updateById(role); // 删除关联部门数据 systemRoleDeptService.batchDeleteRoleDept(Collections.singleton(args.getId())); // 判断是否有部门数据, 若有, 则需更新关联 @@ -117,10 +117,6 @@ public class SystemRoleService { } } - private SystemRoleTb getRoleTbById(Long id) { - return systemRoleMapper.selectById(id); - } - /** * 修改绑定的菜单 -> TestPassed * @@ -132,8 +128,7 @@ public class SystemRoleService { checkRoleLevels(role.getLevel()); // 更新菜单 systemRoleMenuService.deleteRoleMenuByRoleId(role.getId()); - // 判断是否为空 - Set menus = args.getMenus(); + Set menus = args.getMenus(); if (CollUtil.isNotEmpty(menus)) { systemRoleMenuService.batchInsertRoleMenu(menus, role.getId()); } @@ -146,8 +141,7 @@ public class SystemRoleService { */ @Transactional(rollbackFor = Exception.class) public void deleteRoleByIds(Set ids) { - List roleLevels = systemRoleMapper.selectByIds(ids).stream().map(SystemRoleTb::getLevel).distinct() - .collect(Collectors.toList()); + List roleLevels = systemRoleMapper.listRoleLevelByRoleIds(new ArrayList<>(ids)); for (Integer roleLevel : roleLevels) { checkRoleLevels(roleLevel); } @@ -165,7 +159,7 @@ public class SystemRoleService { */ public List listAllRole() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.orderByAsc(SystemRoleTb::getLevel); + wrapper.orderByDesc(SystemRoleTb::getCreateTime); return systemRoleMapper.selectList(wrapper); } @@ -176,24 +170,21 @@ public class SystemRoleService { * @param rolePage 分页参数 * @return / */ - public List queryRoleByArgs(SystemQueryRoleArgs args, Page rolePage) { - KitValidUtil.notNull(args); - // 查询角色基本信息 + public List queryRoleByArgs(SystemQueryRoleArgs args, Page rolePage) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemRoleTb::getName, args.getBlurry()).or() - .like(SystemRoleTb::getDescription, args.getBlurry())); - if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { - wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + this.injectQueryParams(args, wrapper); + return systemRoleMapper.selectList(wrapper); + } + + private void injectQueryParams(SystemQueryRoleArgs args, LambdaQueryWrapper wrapper) { + if (args != null) { + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemRoleTb::getName, args.getBlurry()).or() + .like(SystemRoleTb::getDescription, args.getBlurry())); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + } } wrapper.orderByAsc(SystemRoleTb::getLevel); - List roles; - if (rolePage == null) { - roles = systemRoleMapper.selectList(wrapper); - } else { - Page page = systemRoleMapper.selectPage(rolePage, wrapper); - roles = page.getRecords(); - } - return roles.stream().map(systemUserRoleService::convertToRoleVo).collect(Collectors.toList()); } /** @@ -204,13 +195,14 @@ public class SystemRoleService { * @return / */ public KitPageResult searchRoleByArgs(SystemQueryRoleArgs args, Page page) { - List roles = this.queryRoleByArgs(args, page); - Long total = this.countRoleByArgs(args); - return KitPageUtil.toPage(roles, total); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQueryParams(args, wrapper); + IPage data = systemRoleMapper.selectPage(page, wrapper).convert(systemUserRoleService::convertToRoleVo); + return KitPageUtil.toPage(data); } /** - * 查询用户权限信息 -> TestPassed + * 查询用户权限信息 -> TestPassed? * * @param user 用户信息 * @return 权限信息 @@ -222,9 +214,17 @@ public class SystemRoleService { permissions.add("admin"); return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); } - List roles = systemUserRoleService.listRoleVoByUsersId(user.getId()); - permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuVo::getPermission) - .filter(StrUtil::isNotBlank).collect(Collectors.toSet()); +// List roles = systemUserRoleService.listRoleVoByUsersId(user.getId()); +// permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuVo::getPermission) +// .filter(StrUtil::isNotBlank).collect(Collectors.toSet()); +// return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); + Set roleIds = systemUserRoleService.listUserRoleIdByUserId(user.getId()); + // 查询角色权限 + if (CollUtil.isNotEmpty(roleIds)) { + return systemRoleMenuService.listMenuPermissionByRoleIds(roleIds).stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); + } + // 没有包含任何角色，赋予默认权限 + permissions.add("IsAJoker"); return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); } @@ -234,23 +234,12 @@ public class SystemRoleService { * @param ids / */ public void verifyBindRelationByIds(Set ids) { - if (systemUserRoleService.countUserByRoleIds(ids) > 0) { + if (systemUserRoleService.existUserWithRoleIds(ids)) { throw new BadRequestException("所选角色存在用户关联, 请解除关联再试！"); } } - public Long countRoleByArgs(SystemQueryRoleArgs args) { - KitValidUtil.notNull(args); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemRoleTb::getName, args.getBlurry()).or() - .like(SystemRoleTb::getDescription, args.getBlurry())); - if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { - wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); - } - return systemRoleMapper.selectCount(wrapper); - } - - public SystemRoleVo getRoleById(Long id) { + public SystemRoleVo getRoleVoById(Long id) { SystemRoleTb roleTb = systemRoleMapper.selectById(id); if (roleTb == null) { return null; @@ -268,8 +257,7 @@ public class SystemRoleService { * @return / */ private int checkRoleLevels(Integer level) { - List levels = systemUserRoleService.listRoleVoByUsersId(KitSecurityHelper.getCurrentUserId()).stream() - .map(SystemRoleVo::getLevel).collect(Collectors.toList()); + Set levels = systemUserRoleService.listUserRoleLevelByUserId(KitSecurityHelper.getCurrentUserId()); int min = Collections.min(levels); if (level != null) { if (level < min) { @@ -280,9 +268,9 @@ public class SystemRoleService { } public void exportRoleXlsx(HttpServletResponse response, SystemQueryRoleArgs args) { - List systemRoleVos = this.queryRoleByArgs(args, null); + List systemRoleVos = this.queryRoleByArgs(args, null); List rowVos = new ArrayList<>(); - for (SystemRoleVo dataObject : systemRoleVos) { + for (SystemRoleTb dataObject : systemRoleVos) { SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo(); rowVo.setName(dataObject.getName()); rowVo.setLevel(dataObject.getLevel()); diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java index d0da4e43..d5d7b468 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserDeptService.java @@ -18,9 +18,9 @@ package cn.odboy.system.service; import cn.odboy.system.dal.dataobject.SystemUserTb; import cn.odboy.system.dal.mysql.SystemUserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Set; @Service public class SystemUserDeptService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java index e2d75ac4..a994d5ee 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java @@ -20,12 +20,12 @@ import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemUserJobTb; import cn.odboy.system.dal.mysql.SystemUserJobMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; @Service public class SystemUserJobService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java index dda51c91..76d6e861 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java @@ -18,9 +18,9 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; -import cn.odboy.system.dal.model.response.SystemMenuVo; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; @@ -28,15 +28,16 @@ import cn.odboy.system.dal.mysql.SystemUserRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemUserRoleService { @@ -91,8 +92,8 @@ public class SystemUserRoleService { } SystemRoleVo roleVo = KitBeanUtil.copyToClass(role, SystemRoleVo.class); // 查询关联的菜单信息 - Set menus = systemRoleMenuService.queryMenuByRoleIds(Collections.singleton(role.getId())); - roleVo.setMenus(menus); + List menus = systemRoleMenuService.listMenuByRoleIds(Collections.singleton(role.getId()), true); + roleVo.setMenus(new HashSet<>(menus)); // 查询关联的部门信息 Set depts = systemRoleDeptService.listUserDeptByRoleId(role.getId()); roleVo.setDepts(depts); @@ -140,7 +141,7 @@ public class SystemUserRoleService { * @param args / */ public void checkLevel(SystemUserVo args) { - List roleLevels = systemUserRoleMapper.listUserRoleLevelByUserId(KitSecurityHelper.getCurrentUserId()); + Set roleLevels = systemUserRoleMapper.listUserRoleLevelByUserId(KitSecurityHelper.getCurrentUserId()); Integer currentLevel = Collections.min(roleLevels); Integer optLevel = this.getDeptLevelByRoles(args.getRoles()); if (currentLevel > optLevel) { @@ -148,15 +149,6 @@ public class SystemUserRoleService { } } - public long countUserByRoleIds(Set ids) { - if (CollUtil.isEmpty(ids)) { - return 0L; - } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemUserRoleTb::getRoleId, ids); - return systemUserRoleMapper.selectCount(wrapper); - } - /** * 根据用户id查询角色 -> TestPassed * @@ -168,12 +160,37 @@ public class SystemUserRoleService { } /** - * 根据用户id查询角色级别 -> TestPassed + * 根据用户id查询角色级别集合 -> TestPassed * * @param userId / * @return / */ - public List listUserRoleLevelByUserId(Long userId) { + public Set listUserRoleLevelByUserId(Long userId) { return systemUserRoleMapper.listUserRoleLevelByUserId(userId); } + + /** + * 根据用户id查询角色id集合 -> TestPassed + * + * @param userId / + * @return / + */ + public Set listUserRoleIdByUserId(Long userId) { + return systemUserRoleMapper.listUserRoleIdByUserId(userId); + } + + /** + * 根据角色id集合判断是否存在关联用户 -> TestPassed + * + * @param ids 角色id集合 + * @return / + */ + public boolean existUserWithRoleIds(Set ids) { + if (CollUtil.isEmpty(ids)) { + return false; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemUserRoleTb::getRoleId, ids); + return systemUserRoleMapper.exists(wrapper); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index a0c6d82c..08b535cd 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -45,6 +45,13 @@ import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; +import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.util.ArrayList; import java.util.Collections; @@ -54,13 +61,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.ObjectUtils; -import org.springframework.web.multipart.MultipartFile; @Service public class SystemUserService { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java index 50b6c46f..645b158d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java @@ -39,13 +39,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.io.File; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.List; /** *

diff --git a/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemDictDetailMapper.xml b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemDictDetailMapper.xml index ad6e4642..c8985ddd 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemDictDetailMapper.xml +++ b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemDictDetailMapper.xml @@ -1,29 +1,29 @@ - - + + diff --git a/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMapper.xml b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMapper.xml new file mode 100644 index 00000000..486a3730 --- /dev/null +++ b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMapper.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml new file mode 100644 index 00000000..c19292ae --- /dev/null +++ b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml @@ -0,0 +1,40 @@ + + + + + + + diff --git a/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml new file mode 100644 index 00000000..87c7aad5 --- /dev/null +++ b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserMapper.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserRoleMapper.xml b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserRoleMapper.xml index 177b248e..19b83a1f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserRoleMapper.xml +++ b/cutejava-springboot3/cutejava-module-system/src/main/resources/mapper/SystemUserRoleMapper.xml @@ -7,4 +7,16 @@ LEFT JOIN system_users_roles t2 ON t1.role_id = t2.role_id WHERE t2.user_id = #{userId} + + diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java index 5d33c0c0..1c080406 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java @@ -18,12 +18,14 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemUserTb; import io.swagger.annotations.ApiModelProperty; -import java.util.Objects; -import java.util.Set; import lombok.Getter; import lombok.Setter; +import java.util.List; +import java.util.Objects; +import java.util.Set; @Getter @Setter @@ -45,7 +47,7 @@ public class SystemRoleVo extends KitBaseUserTimeTb { @ApiModelProperty(value = "用户", hidden = true) private Set users; @ApiModelProperty(value = "菜单", hidden = true) - private Set menus; + private Set menus; @ApiModelProperty(value = "部门", hidden = true) private Set depts; @@ -66,5 +68,4 @@ public class SystemRoleVo extends KitBaseUserTimeTb { return Objects.hash(id); } - } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java index 7e784853..f990d0a5 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemRoleMenuMapper.java @@ -15,11 +15,13 @@ */ package cn.odboy.system.dal.mysql; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Set; /** * 角色菜单关联 Mapper @@ -29,5 +31,9 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface SystemRoleMenuMapper extends BaseMapper { - List listMenuPermissionByRoleIds(@Param("roleIds") List roleIds); + Set listMenuPermissionByRoleIds(@Param("roleIds") Set roleIds); + + List listMenuWithRoleIdsNeButton(@Param("roleIds") Set roleIds); + + List listMenuWithRoleIds(@Param("roleIds") Set roleIds); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java index 738d124a..ef71e9ff 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemUserRoleMapper.java @@ -28,7 +28,7 @@ public interface SystemUserRoleMapper extends BaseMapper { Set listUserRoleByUserId(@Param("userId") Long userId); - List listUserRoleLevelByUserId(@Param("userId") Long userId); + Set listUserRoleLevelByUserId(@Param("userId") Long userId); - List listUserRoleIdByUserId(@Param("userId") Long userId); + Set listUserRoleIdByUserId(@Param("userId") Long userId); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 27001178..c91b23fc 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -27,14 +27,19 @@ import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemMenuMetaVo; import cn.odboy.system.dal.model.response.SystemMenuRouterVo; import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; +import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitClassUtil; import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashSet; @@ -44,11 +49,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemMenuService { @@ -202,20 +202,20 @@ public class SystemMenuService { */ @Transactional(rollbackFor = Exception.class) public void deleteMenuByIds(Set ids) { -// Set menuSet = new HashSet<>(); -// for (Long id : ids) { -// List menuList = this.listMenuByPid(id); -// menuSet.add(this.getMenuVoById(id)); -// menuSet = this.queryChildMenuByArgs(menuList, menuSet); -// } -// List menuIds = menuSet.stream().map(SystemMenuVo::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); -// if (CollUtil.isNotEmpty(menuIds)) { -// systemRoleMenuService.deleteRoleMenuByMenuIds(menuIds); -// systemMenuMapper.deleteByIds(menuIds); -// } -// for (SystemMenuVo menu : menuSet) { -// this.updateMenuSubCnt(menu.getPid()); -// } + // Set menuSet = new HashSet<>(); + // for (Long id : ids) { + // List menuList = this.listMenuByPid(id); + // menuSet.add(this.getMenuVoById(id)); + // menuSet = this.queryChildMenuByArgs(menuList, menuSet); + // } + // List menuIds = menuSet.stream().map(SystemMenuVo::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + // if (CollUtil.isNotEmpty(menuIds)) { + // systemRoleMenuService.deleteRoleMenuByMenuIds(menuIds); + // systemMenuMapper.deleteByIds(menuIds); + // } + // for (SystemMenuVo menu : menuSet) { + // this.updateMenuSubCnt(menu.getPid()); + // } // ========= 优化 20260114 ========= if (CollUtil.isEmpty(ids)) { return; @@ -245,8 +245,7 @@ public class SystemMenuService { Set result = new HashSet<>(rootIds); Set currentLevelIds = new HashSet<>(rootIds); // 构建父ID到子菜单的映射 - Map> parentToChildrenMap = allMenus.stream() - .filter(menu -> menu.getPid() != null) + Map> parentToChildrenMap = allMenus.stream().filter(menu -> menu.getPid() != null) .collect(Collectors.groupingBy(SystemMenuTb::getPid)); while (!currentLevelIds.isEmpty()) { Set nextLevelIds = new HashSet<>(); @@ -271,10 +270,9 @@ public class SystemMenuService { */ private void updateParentMenuCounts(Set deletedMenuIds, List allMenus) { // 获取被删除菜单的父ID - Set parentIds = allMenus.stream() - .filter(menu -> deletedMenuIds.contains(menu.getId()) && menu.getPid() != null) - .map(SystemMenuTb::getPid) - .collect(Collectors.toSet()); + Set parentIds = + allMenus.stream().filter(menu -> deletedMenuIds.contains(menu.getId()) && menu.getPid() != null) + .map(SystemMenuTb::getPid).collect(Collectors.toSet()); // 更新每个父菜单的子节点计数 for (Long parentId : parentIds) { proxyService.updateMenuSubCnt(parentId); @@ -336,29 +334,30 @@ public class SystemMenuService { * @param currentUserId / * @return / */ - public List listMenuByUserId(Long currentUserId) { - List roles = systemUserRoleService.listRoleVoByUsersId(currentUserId); - Set roleIds = roles.stream().map(SystemRoleVo::getId).collect(Collectors.toSet()); - return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds)); + public List listMenuByUserId(Long currentUserId) { +// List roles = systemUserRoleService.listRoleVoByUsersId(currentUserId); +// Set roleIds = roles.stream().map(SystemRoleVo::getId).collect(Collectors.toSet()); + Set roleIds = systemUserRoleService.listUserRoleIdByUserId(currentUserId); + return systemRoleMenuService.listMenuByRoleIds(roleIds, false); } - /** - * 查询所有子节点, 包含自身ID - * - * @param menuList / - * @param menuSet / - * @return / - */ - public Set queryChildMenuByArgs(List menuList, Set menuSet) { - for (SystemMenuTb menu : menuList) { - menuSet.add(menu); - List menus = this.listMenuByPid(menu.getId()); - if (CollUtil.isNotEmpty(menus)) { - queryChildMenuByArgs(menus, menuSet); - } - } - return menuSet; - } +// /** +// * 查询所有子节点, 包含自身ID +// * +// * @param menuList / +// * @param menuSet / +// * @return / +// */ +// public Set queryChildMenuByArgs(List menuList, Set menuSet) { +// for (SystemMenuTb menu : menuList) { +// menuSet.add(menu); +// List menus = this.listMenuByPid(menu.getId()); +// if (CollUtil.isNotEmpty(menus)) { +// queryChildMenuByArgs(menus, menuSet); +// } +// } +// return menuSet; +// } /** * 懒加载菜单数据 @@ -401,14 +400,15 @@ public class SystemMenuService { * @param menus 原始数据 * @return / */ - public List buildMenuTree(List menus) { + public List buildMenuTree(List menus) { + List systemMenuVos = KitBeanUtil.copyToList(menus, SystemMenuVo.class); List trees = new ArrayList<>(); Set ids = new HashSet<>(); - for (SystemMenuVo menu : menus) { + for (SystemMenuVo menu : systemMenuVos) { if (menu.getPid() == null) { trees.add(menu); } - for (SystemMenuVo it : menus) { + for (SystemMenuVo it : systemMenuVos) { if (menu.getId().equals(it.getPid())) { if (menu.getChildren() == null) { menu.setChildren(new ArrayList<>()); @@ -419,7 +419,7 @@ public class SystemMenuService { } } if (CollUtil.isNotEmpty(trees)) { - trees = menus.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); + trees = systemMenuVos.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); } return trees; } @@ -530,27 +530,28 @@ public class SystemMenuService { } public List buildFrontMenus() { - List originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); + List originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); List targetMenus = this.buildMenuTree(originMenus); return this.buildMenuVo(targetMenus); } public Set listChildMenuSetByMenuId(Long id) { - Set menuSet = new HashSet<>(); - List menuList = this.listMenuByPid(id); - menuSet.add(this.getMenuById(id)); - menuSet = this.queryChildMenuByArgs(menuList, menuSet); - return menuSet.stream().map(SystemMenuVo::getId).collect(Collectors.toSet()); +// Set menuSet = new HashSet<>(); +// List menuList = this.listMenuByPid(id); +// menuSet.add(this.getMenuById(id)); +// menuSet = this.queryChildMenuByArgs(menuList, menuSet); +// return menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); + List allMenus = systemMenuMapper.listAll(); + return this.getAllMenuIdsWithChildren(CollUtil.newHashSet(id), allMenus); } public List listMenuSuperior(List ids) { Set menus; - List systemMenuTbs; if (CollUtil.isNotEmpty(ids)) { menus = new LinkedHashSet<>(this.listMenuByIds(ids)); for (SystemMenuTb menu : menus) { - List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); - for (SystemMenuVo data : menuList) { + List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); + for (SystemMenuTb data : menuList) { if (data.getId().equals(menu.getPid())) { data.setSubCount(data.getSubCount() - 1); } @@ -559,12 +560,12 @@ public class SystemMenuService { } // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); - List newMenuList = new ArrayList<>(menus); - systemMenuTbs = this.buildMenuTree(newMenuList); + List newMenuList = new ArrayList<>(menus); + return this.buildMenuTree(newMenuList); } else { - systemMenuTbs = this.listMenuByPid(null); + List records = this.listMenuByPid(null); + return KitBeanUtil.copyToList(records, SystemMenuVo.class); } - return systemMenuTbs; } public void exportMenuXlsx(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java index 681ffa6e..c5624ca7 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java @@ -19,27 +19,21 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; -import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; -import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; @Service public class SystemRoleMenuService { @Autowired private SystemRoleMenuMapper systemRoleMenuMapper; - @Autowired - private SystemMenuMapper systemMenuMapper; /** * 删除角色菜单关联 -> TestPassed @@ -60,10 +54,10 @@ public class SystemRoleMenuService { * @param roleId 角色id */ @Transactional(rollbackFor = Exception.class) - public void batchInsertRoleMenu(Set menus, Long roleId) { + public void batchInsertRoleMenu(Set menus, Long roleId) { if (CollUtil.isNotEmpty(menus)) { List records = new ArrayList<>(); - for (SystemMenuVo menu : menus) { + for (SystemMenuTb menu : menus) { SystemRoleMenuTb record = new SystemRoleMenuTb(); record.setMenuId(menu.getId()); record.setRoleId(roleId); @@ -87,26 +81,31 @@ public class SystemRoleMenuService { } } - public LinkedHashSet queryMenuByRoleIds(Set roleIds) { + /** + * @param roleIds 角色id集合 -> TestPassed + * @return / + */ + public List listMenuByRoleIds(Set roleIds, boolean hasButton) { if (CollUtil.isEmpty(roleIds)) { - return new LinkedHashSet<>(); + return new ArrayList<>(); } - LambdaQueryWrapper roleMenuWrapper = new LambdaQueryWrapper<>(); - roleMenuWrapper.in(SystemRoleMenuTb::getRoleId, roleIds); - List menuIds = systemRoleMenuMapper.selectList(roleMenuWrapper).stream().map(SystemRoleMenuTb::getMenuId) - .collect(Collectors.toList()); - if (CollUtil.isEmpty(menuIds)) { - return new LinkedHashSet<>(); +// LambdaQueryWrapper roleMenuWrapper = new LambdaQueryWrapper<>(); +// roleMenuWrapper.in(SystemRoleMenuTb::getRoleId, roleIds); +// List menuIds = systemRoleMenuMapper.selectList(roleMenuWrapper).stream().map(SystemRoleMenuTb::getMenuId) +// .collect(Collectors.toList()); +// if (CollUtil.isEmpty(menuIds)) { +// return new ArrayList<>(); +// } +// LambdaQueryWrapper menuWrapper = new LambdaQueryWrapper<>(); +// menuWrapper.in(SystemMenuTb::getId, menuIds); +// // 排除"按钮" +// menuWrapper.ne(SystemMenuTb::getType, 2); +// menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); +// return systemMenuMapper.selectList(menuWrapper); + if (hasButton){ + return systemRoleMenuMapper.listMenuWithRoleIds(roleIds); } - LambdaQueryWrapper menuWrapper = new LambdaQueryWrapper<>(); - menuWrapper.in(SystemMenuTb::getId, menuIds); - // 排除"按钮" - menuWrapper.ne(SystemMenuTb::getType, 2); - menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); - - List systemMenuTbs = systemMenuMapper.selectList(menuWrapper); - List systemMenuVos = KitBeanUtil.copyToList(systemMenuTbs, SystemMenuVo.class); - return new LinkedHashSet<>(systemMenuVos); + return systemRoleMenuMapper.listMenuWithRoleIdsNeButton(roleIds); } /** @@ -124,8 +123,14 @@ public class SystemRoleMenuService { systemRoleMenuMapper.delete(wrapper); } - public List listMenuPermissionByRoleIds(List roleIds) { - List permissions = systemRoleMenuMapper.listMenuPermissionByRoleIds(roleIds); + /** + * 根据角色id集合查询菜单权限 -> TestPassed + * + * @param roleIds 角色id集合 + * @return / + */ + public List listMenuPermissionByRoleIds(Set roleIds) { + Set permissions = systemRoleMenuMapper.listMenuPermissionByRoleIds(roleIds); return permissions.stream().filter(StrUtil::isNotBlank).collect(Collectors.toList()); } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 1c5a3eb1..07fd61c1 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -20,11 +20,11 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.model.export.SystemRoleExportRowVo; import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.response.SystemMenuVo; import cn.odboy.system.dal.model.response.SystemRoleCodeVo; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.model.response.SystemUserVo; @@ -36,16 +36,16 @@ import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemRoleService { @@ -128,7 +128,7 @@ public class SystemRoleService { checkRoleLevels(role.getLevel()); // 更新菜单 systemRoleMenuService.deleteRoleMenuByRoleId(role.getId()); - Set menus = args.getMenus(); + Set menus = args.getMenus(); if (CollUtil.isNotEmpty(menus)) { systemRoleMenuService.batchInsertRoleMenu(menus, role.getId()); } @@ -218,7 +218,7 @@ public class SystemRoleService { // permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuVo::getPermission) // .filter(StrUtil::isNotBlank).collect(Collectors.toSet()); // return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); - List roleIds = systemUserRoleService.listUserRoleIdByUserId(user.getId()); + Set roleIds = systemUserRoleService.listUserRoleIdByUserId(user.getId()); // 查询角色权限 if (CollUtil.isNotEmpty(roleIds)) { return systemRoleMenuService.listMenuPermissionByRoleIds(roleIds).stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); @@ -257,7 +257,7 @@ public class SystemRoleService { * @return / */ private int checkRoleLevels(Integer level) { - List levels = systemUserRoleService.listUserRoleLevelByUserId(KitSecurityHelper.getCurrentUserId()); + Set levels = systemUserRoleService.listUserRoleLevelByUserId(KitSecurityHelper.getCurrentUserId()); int min = Collections.min(levels); if (level != null) { if (level < min) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java index 41f74ecf..76d6e861 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java @@ -18,9 +18,9 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; -import cn.odboy.system.dal.model.response.SystemMenuVo; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; @@ -28,15 +28,16 @@ import cn.odboy.system.dal.mysql.SystemUserRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class SystemUserRoleService { @@ -91,8 +92,8 @@ public class SystemUserRoleService { } SystemRoleVo roleVo = KitBeanUtil.copyToClass(role, SystemRoleVo.class); // 查询关联的菜单信息 - Set menus = systemRoleMenuService.queryMenuByRoleIds(Collections.singleton(role.getId())); - roleVo.setMenus(menus); + List menus = systemRoleMenuService.listMenuByRoleIds(Collections.singleton(role.getId()), true); + roleVo.setMenus(new HashSet<>(menus)); // 查询关联的部门信息 Set depts = systemRoleDeptService.listUserDeptByRoleId(role.getId()); roleVo.setDepts(depts); @@ -140,7 +141,7 @@ public class SystemUserRoleService { * @param args / */ public void checkLevel(SystemUserVo args) { - List roleLevels = systemUserRoleMapper.listUserRoleLevelByUserId(KitSecurityHelper.getCurrentUserId()); + Set roleLevels = systemUserRoleMapper.listUserRoleLevelByUserId(KitSecurityHelper.getCurrentUserId()); Integer currentLevel = Collections.min(roleLevels); Integer optLevel = this.getDeptLevelByRoles(args.getRoles()); if (currentLevel > optLevel) { @@ -164,7 +165,7 @@ public class SystemUserRoleService { * @param userId / * @return / */ - public List listUserRoleLevelByUserId(Long userId) { + public Set listUserRoleLevelByUserId(Long userId) { return systemUserRoleMapper.listUserRoleLevelByUserId(userId); } @@ -174,7 +175,7 @@ public class SystemUserRoleService { * @param userId / * @return / */ - public List listUserRoleIdByUserId(Long userId) { + public Set listUserRoleIdByUserId(Long userId) { return systemUserRoleMapper.listUserRoleIdByUserId(userId); } diff --git a/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml index 596ebc48..c19292ae 100644 --- a/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml +++ b/cutejava/cutejava-module-system/src/main/resources/mapper/SystemRoleMenuMapper.xml @@ -1,16 +1,40 @@ - + + +