diff --git a/cutejava-springboot3/cutejava-module-system/pom.xml b/cutejava-springboot3/cutejava-module-system/pom.xml index 2c613898..e2468a86 100644 --- a/cutejava-springboot3/cutejava-module-system/pom.xml +++ b/cutejava-springboot3/cutejava-module-system/pom.xml @@ -1,25 +1,25 @@ - - cutejava - cn.odboy - 1.4.1 - - 4.0.0 - cutejava-module-system - 核心模块 - - - cn.odboy - cutejava-framework - 1.4.1 - - - - io.minio - minio - 8.5.17 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + cutejava + cn.odboy + 1.4.1 + + 4.0.0 + cutejava-module-system + 核心模块 + + + cn.odboy + cutejava-framework + 1.4.1 + + + + io.minio + minio + 8.5.17 + + diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java index 333dcfda..36f92dcc 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java @@ -24,37 +24,37 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum SystemCaptchaBizEnum { - /* 通过手机号码重置邮箱 */ - PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", - "通过手机号码重置邮箱"), /* 通过旧邮箱重置邮箱 */ - EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过旧邮箱重置邮箱"), - /* 通过手机号码重置密码 */ - PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置密码"), - /* 通过邮箱重置密码 */ - EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过邮箱重置密码"); - /** - * 业务编码 - */ - private final String bizCode; - /** - * redis中的key - */ - private final String redisKey; - /** - * resources文件夹，template中的模版名称 - */ - private final String templateName; - /** - * 业务描述 - */ - private final String description; + /* 通过手机号码重置邮箱 */ + PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", + "通过手机号码重置邮箱"), /* 通过旧邮箱重置邮箱 */ + EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过旧邮箱重置邮箱"), + /* 通过手机号码重置密码 */ + PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置密码"), + /* 通过邮箱重置密码 */ + EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过邮箱重置密码"); + /** + * 业务编码 + */ + private final String bizCode; + /** + * redis中的key + */ + private final String redisKey; + /** + * resources文件夹，template中的模版名称 + */ + private final String templateName; + /** + * 业务描述 + */ + private final String description; - public static SystemCaptchaBizEnum getByBizCode(String bizCode) { - for (SystemCaptchaBizEnum value : SystemCaptchaBizEnum.values()) { - if (value.getBizCode().equals(bizCode)) { - return value; - } + public static SystemCaptchaBizEnum getByBizCode(String bizCode) { + for (SystemCaptchaBizEnum value : SystemCaptchaBizEnum.values()) { + if (value.getBizCode().equals(bizCode)) { + return value; + } + } + return null; } - return null; - } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java index bb30f72b..27fdaeab 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java @@ -24,19 +24,19 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum SystemDataScopeEnum { - /* 全部的数据权限 */ - ALL("全部", "全部的数据权限"), /* 自己部门的数据权限 */ - THIS_LEVEL("本级", "自己部门的数据权限"), /* 自定义的数据权限 */ - CUSTOMIZE("自定义", "自定义的数据权限"); - private final String value; - private final String description; + /* 全部的数据权限 */ + ALL("全部", "全部的数据权限"), /* 自己部门的数据权限 */ + THIS_LEVEL("本级", "自己部门的数据权限"), /* 自定义的数据权限 */ + CUSTOMIZE("自定义", "自定义的数据权限"); + private final String value; + private final String description; - public static SystemDataScopeEnum find(String val) { - for (SystemDataScopeEnum dataScopeEnum : SystemDataScopeEnum.values()) { - if (dataScopeEnum.getValue().equals(val)) { - return dataScopeEnum; - } + public static SystemDataScopeEnum find(String val) { + for (SystemDataScopeEnum dataScopeEnum : SystemDataScopeEnum.values()) { + if (dataScopeEnum.getValue().equals(val)) { + return dataScopeEnum; + } + } + return null; } - return null; - } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java index 02a59fe7..d342fd0d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java @@ -17,7 +17,7 @@ package cn.odboy.system.constant; public interface TransferProtocolConst { - String PREFIX_HTTP = "http://"; - String PREFIX_HTTPS = "https://"; - String PREFIX_HTTPS_BAD_REQUEST = "外链必须以http://或者https://开头"; + String PREFIX_HTTP = "http://"; + String PREFIX_HTTPS = "https://"; + String PREFIX_HTTPS_BAD_REQUEST = "外链必须以http://或者https://开头"; } 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 3d9b9e66..38fa3dc5 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 @@ -36,10 +36,10 @@ import cn.odboy.util.KitRsaEncryptUtil; import com.wf.captcha.base.Captcha; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -62,98 +62,92 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "系统：系统授权接口") public class SystemAuthController { - @Autowired - private KitRedisHelper redisHelper; - @Autowired - private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; - @Autowired - private TokenProvider tokenProvider; - @Autowired - private AppProperties properties; - @Autowired - private PasswordEncoder passwordEncoder; - @Autowired - private UserDetailsHandler userDetailsService; + @Autowired private KitRedisHelper redisHelper; + @Autowired private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @Autowired private TokenProvider tokenProvider; + @Autowired private AppProperties properties; + @Autowired private PasswordEncoder passwordEncoder; + @Autowired private UserDetailsHandler userDetailsService; - @ApiOperation("登录授权") - @AnonymousPostMapping(value = "/login") - public ResponseEntity> login(@Validated @RequestBody SystemUserLoginArgs loginRequest, - HttpServletRequest request) throws Exception { - // 密码解密 - String password = - KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword()); - // 查询验证码 - String code = redisHelper.get(loginRequest.getUuid(), String.class); - // 清除验证码 - redisHelper.del(loginRequest.getUuid()); - if (StrUtil.isBlank(code)) { - throw new BadRequestException("验证码不存在或已过期"); + @ApiOperation("登录授权") + @AnonymousPostMapping(value = "/login") + public ResponseEntity> login(@Validated @RequestBody SystemUserLoginArgs loginRequest, + HttpServletRequest request) throws Exception { + // 密码解密 + String password = + KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword()); + // 查询验证码 + String code = redisHelper.get(loginRequest.getUuid(), String.class); + // 清除验证码 + redisHelper.del(loginRequest.getUuid()); + if (StrUtil.isBlank(code)) { + throw new BadRequestException("验证码不存在或已过期"); + } + if (StrUtil.isBlank(loginRequest.getCode()) || !loginRequest.getCode().equalsIgnoreCase(code)) { + throw new BadRequestException("验证码错误"); + } + // 获取用户信息 + SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername()); + // 验证用户密码 + if (!passwordEncoder.matches(password, jwtUser.getPassword())) { + throw new BadRequestException("登录密码错误"); + } + Authentication authentication = + new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(authentication); + // 生成令牌 + String token = tokenProvider.createToken(jwtUser); + // 返回 token 与 用户信息 + Map authInfo = new HashMap<>(2) {{ + put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); + put("user", BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class)); + }}; + if (properties.getLogin().isSingle()) { + // 踢掉之前已经登录的token + systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername()); + } + // 保存在线信息 + systemUserOnlineInfoDAO.saveUserJwtModelByToken(jwtUser, token, request); + // 返回登录信息 + return ResponseEntity.ok(authInfo); } - if (StrUtil.isBlank(loginRequest.getCode()) || !loginRequest.getCode().equalsIgnoreCase(code)) { - throw new BadRequestException("验证码错误"); - } - // 获取用户信息 - SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername()); - // 验证用户密码 - if (!passwordEncoder.matches(password, jwtUser.getPassword())) { - throw new BadRequestException("登录密码错误"); - } - Authentication authentication = - new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(authentication); - // 生成令牌 - String token = tokenProvider.createToken(jwtUser); - // 返回 token 与 用户信息 - Map authInfo = new HashMap<>(2) {{ - put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); - put("user", BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class)); - }}; - if (properties.getLogin().isSingle()) { - // 踢掉之前已经登录的token - systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername()); - } - // 保存在线信息 - systemUserOnlineInfoDAO.saveUserJwtModelByToken(jwtUser, token, request); - // 返回登录信息 - return ResponseEntity.ok(authInfo); - } - @ApiOperation("获取用户信息") - @PostMapping(value = "/info") - public ResponseEntity getUserInfo() { - SystemUserJwtVo jwtUser = (SystemUserJwtVo) KitSecurityHelper.getCurrentUser(); - SystemUserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class); - return ResponseEntity.ok(userInfoVo); - } - - @ApiOperation("获取验证码") - @AnonymousPostMapping(value = "/captcha/getImage") - public ResponseEntity> getCode() { - // 获取运算的结果 - Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha(); - String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); - //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型 - String captchaValue = captcha.text(); - if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() && - captchaValue.contains(SystemConst.SYMBOL_DOT)) { - captchaValue = captchaValue.split("\\.")[0]; + @ApiOperation("获取用户信息") + @PostMapping(value = "/info") + public ResponseEntity getUserInfo() { + SystemUserJwtVo jwtUser = (SystemUserJwtVo)KitSecurityHelper.getCurrentUser(); + SystemUserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class); + return ResponseEntity.ok(userInfoVo); } - // 保存 - redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(), - TimeUnit.MINUTES); - // 验证码信息 - Map imgResult = new HashMap(2) {{ - put("img", captcha.toBase64()); - put("uuid", uuid); - }}; - return ResponseEntity.ok(imgResult); - } - @ApiOperation("退出登录") - @AnonymousPostMapping(value = "/logout") - public ResponseEntity logout(HttpServletRequest request) { - String token = tokenProvider.getToken(request); - systemUserOnlineInfoDAO.logoutByToken(token); - return ResponseEntity.ok(null); - } + @ApiOperation("获取验证码") + @AnonymousPostMapping(value = "/captcha/getImage") + public ResponseEntity> getCode() { + // 获取运算的结果 + Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha(); + String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); + //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型 + String captchaValue = captcha.text(); + if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() && + captchaValue.contains(SystemConst.SYMBOL_DOT)) { + captchaValue = captchaValue.split("\\.")[0]; + } + // 保存 + redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(), + TimeUnit.MINUTES); + // 验证码信息 + Map imgResult = new HashMap(2) {{ + put("img", captcha.toBase64()); + put("uuid", uuid); + }}; + return ResponseEntity.ok(imgResult); + } + + @ApiOperation("退出登录") + @AnonymousPostMapping(value = "/logout") + public ResponseEntity logout(HttpServletRequest request) { + String token = tokenProvider.getToken(request); + systemUserOnlineInfoDAO.logoutByToken(token); + return ResponseEntity.ok(null); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java index 98fa7c20..c993f6f4 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java @@ -35,31 +35,30 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "系统：验证码管理") public class SystemCaptchaController { - @Autowired - private SystemEmailService systemEmailService; + @Autowired private SystemEmailService systemEmailService; - @ApiOperation("重置邮箱, 发送验证码") - @PostMapping(value = "/sendResetEmailCaptcha") - public ResponseEntity sendResetEmailCaptcha(@RequestParam String email) { - systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, email); - return ResponseEntity.ok(null); - } + @ApiOperation("重置邮箱, 发送验证码") + @PostMapping(value = "/sendResetEmailCaptcha") + public ResponseEntity sendResetEmailCaptcha(@RequestParam String email) { + systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, email); + return ResponseEntity.ok(null); + } - @ApiOperation("重置密码，发送验证码") - @PostMapping(value = "/sendResetPasswordCaptcha") - public ResponseEntity sendResetPasswordCaptcha(@RequestParam String email) { - systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_PWD_CODE, email); - return ResponseEntity.ok(null); - } + @ApiOperation("重置密码，发送验证码") + @PostMapping(value = "/sendResetPasswordCaptcha") + public ResponseEntity sendResetPasswordCaptcha(@RequestParam String email) { + systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_PWD_CODE, email); + return ResponseEntity.ok(null); + } - @ApiOperation("验证码验证") - @PostMapping(value = "/checkEmailCaptcha") - public ResponseEntity checkEmailCaptcha(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) { - SystemCaptchaBizEnum biEnum = SystemCaptchaBizEnum.getByBizCode(args.getBizCode()); - if (biEnum == null) { - throw new BadRequestException("不支持的业务"); + @ApiOperation("验证码验证") + @PostMapping(value = "/checkEmailCaptcha") + public ResponseEntity checkEmailCaptcha(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) { + SystemCaptchaBizEnum biEnum = SystemCaptchaBizEnum.getByBizCode(args.getBizCode()); + if (biEnum == null) { + throw new BadRequestException("不支持的业务"); + } + systemEmailService.checkEmailCaptcha(biEnum, args.getEmail(), args.getCode()); + return ResponseEntity.ok(null); } - systemEmailService.checkEmailCaptcha(biEnum, args.getEmail(), args.getCode()); - return ResponseEntity.ok(null); - } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java index ffb123a7..6d29a7ad 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java @@ -30,20 +30,19 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/component") public class SystemComponentController { - @Autowired - private SystemDeptService systemDeptService; + @Autowired private SystemDeptService systemDeptService; - @ApiOperation("查询部门下拉选择数据源") - @PostMapping(value = "/queryDeptSelectDataSource") - @PreAuthorize("@el.check()") - public ResponseEntity queryDeptSelectDataSource() { - return ResponseEntity.ok(systemDeptService.queryDeptSelectDataSource()); - } + @ApiOperation("查询部门下拉选择数据源") + @PostMapping(value = "/queryDeptSelectDataSource") + @PreAuthorize("@el.check()") + public ResponseEntity queryDeptSelectDataSource() { + return ResponseEntity.ok(systemDeptService.queryDeptSelectDataSource()); + } - @ApiOperation("查询部门下拉选择Pro数据源") - @PostMapping(value = "/queryDeptSelectProDataSource") - @PreAuthorize("@el.check()") - public ResponseEntity queryDeptSelectProDataSource() { - return ResponseEntity.ok(systemDeptService.queryDeptSelectProDataSource()); - } + @ApiOperation("查询部门下拉选择Pro数据源") + @PostMapping(value = "/queryDeptSelectProDataSource") + @PreAuthorize("@el.check()") + public ResponseEntity queryDeptSelectProDataSource() { + return ResponseEntity.ok(systemDeptService.queryDeptSelectProDataSource()); + } } 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 cb155658..799e989b 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 @@ -24,12 +24,9 @@ import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.ArrayList; -import java.util.LinkedHashSet; +import jakarta.servlet.http.HttpServletResponse; 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.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -46,76 +43,58 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/dept") public class SystemDeptController { - @Autowired - private SystemDeptService systemDeptService; + @Autowired private SystemDeptService systemDeptService; - @ApiOperation("导出部门数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('dept:list')") - public void exportDept(HttpServletResponse response, SystemQueryDeptArgs criteria) throws Exception { - systemDeptService.exportDeptExcel(systemDeptService.queryAllDept(criteria, false), response); - } - - @ApiOperation("查询部门") - @PostMapping - @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity> queryDept( - @Validated @RequestBody KitPageArgs args) throws Exception { - SystemQueryDeptArgs criteria = args.getArgs(); - List depts = systemDeptService.queryAllDept(criteria, true); - return ResponseEntity.ok(KitPageUtil.toPage(depts)); - } - - @ApiOperation("查询部门:根据ID获取同级与上级数据") - @PostMapping("/queryDeptSuperiorTree") - @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, - @RequestParam(defaultValue = "false") Boolean exclude) { - Set deptSet = new LinkedHashSet<>(); - for (Long id : ids) { - // 同级数据 - SystemDeptTb dept = systemDeptService.getDeptById(id); - // 上级数据 - List depts = systemDeptService.querySuperiorDeptListByPid(dept, new ArrayList<>()); - if (exclude) { - for (SystemDeptTb data : depts) { - if (data.getId().equals(dept.getPid())) { - data.setSubCount(data.getSubCount() - 1); - } - } - // 编辑部门时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 - depts = depts.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toList()); - } - deptSet.addAll(depts); + @ApiOperation("导出部门数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('dept:list')") + public void exportDept(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception { + systemDeptService.exportDeptExcel(systemDeptService.queryAllDeptByArgs(args, false), response); } - return ResponseEntity.ok(systemDeptService.buildDeptTree(new ArrayList<>(deptSet))); - } - @ApiOperation("新增部门") - @PostMapping(value = "/saveDept") - @PreAuthorize("@el.check('dept:add')") - public ResponseEntity saveDept(@Validated @RequestBody SystemCreateDeptArgs args) { - systemDeptService.saveDept(args); - return ResponseEntity.ok(null); - } + @ApiOperation("查询部门") + @PostMapping + @PreAuthorize("@el.check('user:list','dept:list')") + public ResponseEntity> queryDept( + @Validated @RequestBody KitPageArgs pageArgs) throws Exception { + SystemQueryDeptArgs args = pageArgs.getArgs(); + List depts = systemDeptService.queryAllDeptByArgs(args, true); + return ResponseEntity.ok(KitPageUtil.toPage(depts)); + } - @ApiOperation("修改部门") - @PostMapping(value = "/modifyDept") - @PreAuthorize("@el.check('dept:edit')") - public ResponseEntity modifyDept(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) { - systemDeptService.updateDept(args); - return ResponseEntity.ok(null); - } + @ApiOperation("查询部门:根据ID获取同级与上级数据") + @PostMapping("/queryDeptSuperiorTree") + @PreAuthorize("@el.check('user:list','dept:list')") + public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, + @RequestParam(defaultValue = "false") Boolean exclude) { + return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude)); + } - @ApiOperation("删除部门") - @PostMapping(value = "/removeDeptByIds") - @PreAuthorize("@el.check('dept:del')") - public ResponseEntity removeDeptByIds(@RequestBody Set ids) { - // 获取部门, 和其所有子部门 - Set depts = systemDeptService.traverseDeptByIdWithPids(ids); - // 验证是否被角色或用户关联 - systemDeptService.verifyBindRelationByIds(depts); - systemDeptService.removeDeptByIds(depts); - return ResponseEntity.ok(null); - } + @ApiOperation("新增部门") + @PostMapping(value = "/saveDept") + @PreAuthorize("@el.check('dept:add')") + public ResponseEntity saveDept(@Validated @RequestBody SystemCreateDeptArgs args) { + systemDeptService.saveDept(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("修改部门") + @PostMapping(value = "/modifyDept") + @PreAuthorize("@el.check('dept:edit')") + public ResponseEntity modifyDept(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) { + systemDeptService.updateDept(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("删除部门") + @PostMapping(value = "/removeDeptByIds") + @PreAuthorize("@el.check('dept:del')") + public ResponseEntity removeDeptByIds(@RequestBody Set ids) { + // 获取部门, 和其所有子部门 + Set depts = systemDeptService.traverseDeptByIdWithPids(ids); + // 验证是否被角色或用户关联 + systemDeptService.verifyBindRelationByIds(depts); + systemDeptService.deleteDeptByIds(depts); + return ResponseEntity.ok(null); + } } 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 66c3819b..236cf37c 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 @@ -24,10 +24,10 @@ 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 jakarta.servlet.http.HttpServletResponse; import java.io.IOException; 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; @@ -43,59 +43,53 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/dict") public class SystemDictController { - @Autowired - private SystemDictService systemDictService; + @Autowired private SystemDictService systemDictService; - @ApiOperation("导出字典数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('dict:list')") - public void exportDict(HttpServletResponse response, SystemQueryDictArgs criteria) throws IOException { - systemDictService.exportDictExcel(systemDictService.queryDictByArgs(criteria), response); - } - - @ApiOperation("查询字典") - @PostMapping(value = "/queryAllDict") - @PreAuthorize("@el.check('dict:list')") - public ResponseEntity> queryAllDict() { - return ResponseEntity.ok(systemDictService.queryDictByArgs(new SystemQueryDictArgs())); - } - - @ApiOperation("查询字典") - @PostMapping - @PreAuthorize("@el.check('dict:list')") - public ResponseEntity> queryDictByArgs( - @Validated @RequestBody KitPageArgs args) { - Page page; - SystemQueryDictArgs criteria = args.getArgs(); - if (args.getSize() != null) { - page = new Page<>(args.getPage(), args.getSize()); - } else { - page = new Page<>(criteria.getPage(), criteria.getSize()); + @ApiOperation("导出字典数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('dict:list')") + public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) throws IOException { + systemDictService.exportDictExcel(systemDictService.queryDictByArgs(args), response); } - return ResponseEntity.ok(systemDictService.queryDictByArgs(criteria, page)); - } - @ApiOperation("新增字典") - @PostMapping(value = "/saveDict") - @PreAuthorize("@el.check('dict:add')") - public ResponseEntity saveDict(@Validated @RequestBody SystemCreateDictArgs args) { - systemDictService.saveDict(args); - return ResponseEntity.ok(null); - } + @ApiOperation("查询字典") + @PostMapping(value = "/queryAllDict") + @PreAuthorize("@el.check('dict:list')") + public ResponseEntity> queryAllDict() { + return ResponseEntity.ok(systemDictService.queryDictByArgs(new SystemQueryDictArgs())); + } - @ApiOperation("修改字典") - @PostMapping(value = "/modifyDictById") - @PreAuthorize("@el.check('dict:edit')") - public ResponseEntity modifyDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) { - systemDictService.modifyDictById(args); - return ResponseEntity.ok(null); - } + @ApiOperation("查询字典") + @PostMapping + @PreAuthorize("@el.check('dict:list')") + public ResponseEntity> queryDictByArgs( + @Validated @RequestBody KitPageArgs pageArgs) { + Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); + SystemQueryDictArgs args = pageArgs.getArgs(); + return ResponseEntity.ok(systemDictService.searchDict(args, page)); + } - @ApiOperation("删除字典") - @PostMapping(value = "/removeDictByIds") - @PreAuthorize("@el.check('dict:del')") - public ResponseEntity removeDictByIds(@RequestBody Set ids) { - systemDictService.removeDictByIds(ids); - return ResponseEntity.ok(null); - } + @ApiOperation("新增字典") + @PostMapping(value = "/saveDict") + @PreAuthorize("@el.check('dict:add')") + public ResponseEntity saveDict(@Validated @RequestBody SystemCreateDictArgs args) { + systemDictService.saveDict(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("修改字典") + @PostMapping(value = "/modifyDictById") + @PreAuthorize("@el.check('dict:edit')") + public ResponseEntity modifyDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) { + systemDictService.updateDictById(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("删除字典") + @PostMapping(value = "/removeDictByIds") + @PreAuthorize("@el.check('dict:del')") + public ResponseEntity removeDictByIds(@RequestBody Set ids) { + systemDictService.deleteDictByIds(ids); + return ResponseEntity.ok(null); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index 8ec086c4..ebc23bed 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -44,58 +44,57 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/dictDetail") public class SystemDictDetailController { - @Autowired - private SystemDictDetailService systemDictDetailService; + @Autowired private SystemDictDetailService systemDictDetailService; - @ApiOperation("查询字典详情") - @PostMapping - public ResponseEntity> queryDictDetailByCrud( - @Validated @RequestBody KitPageArgs args) { - return queryDictDetailByArgs(args); - } - - @ApiOperation("查询字典详情") - @PostMapping(value = "/queryDictDetailByArgs") - public ResponseEntity> queryDictDetailByArgs( - @Validated @RequestBody KitPageArgs args) { - SystemQueryDictDetailArgs criteria = args.getArgs(); - Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemDictDetailService.queryDictDetailByArgs(criteria, page)); - } - - @ApiOperation("查询多个字典详情") - @GetMapping(value = "/getDictDetailMaps") - public ResponseEntity>> getDictDetailMaps(@RequestParam String dictName) { - String[] names = dictName.split("[,, ]"); - Map> dictMap = new HashMap<>(16); - for (String name : names) { - dictMap.put(name, systemDictDetailService.queryDictDetailByName(name)); + @ApiOperation("查询字典详情") + @PostMapping + public ResponseEntity> queryDictDetailByCrud( + @Validated @RequestBody KitPageArgs args) { + return queryDictDetailByArgs(args); } - return ResponseEntity.ok(dictMap); - } - @ApiOperation("新增字典详情") - @PostMapping(value = "/saveDictDetail") - @PreAuthorize("@el.check('dict:add')") - public ResponseEntity saveDictDetail(@Validated @RequestBody SystemCreateDictDetailArgs args) { - systemDictDetailService.saveDictDetail(args); - return ResponseEntity.ok(null); - } + @ApiOperation("查询字典详情") + @PostMapping(value = "/queryDictDetailByArgs") + public ResponseEntity> queryDictDetailByArgs( + @Validated @RequestBody KitPageArgs pageArgs) { + SystemQueryDictDetailArgs args = pageArgs.getArgs(); + Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); + return ResponseEntity.ok(systemDictDetailService.searchDictDetail(args, page)); + } - @ApiOperation("修改字典详情") - @PostMapping(value = "/modifyDictDetailById") - @PreAuthorize("@el.check('dict:edit')") - public ResponseEntity modifyDictDetailById( - @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) { - systemDictDetailService.modifyDictDetailById(args); - return ResponseEntity.ok(null); - } + @ApiOperation("查询多个字典详情") + @GetMapping(value = "/getDictDetailMaps") + public ResponseEntity>> getDictDetailMaps(@RequestParam String dictName) { + String[] names = dictName.split("[,, ]"); + Map> dictMap = new HashMap<>(16); + for (String name : names) { + dictMap.put(name, systemDictDetailService.listDictDetailByName(name)); + } + return ResponseEntity.ok(dictMap); + } - @ApiOperation("删除字典详情") - @PostMapping(value = "/removeDictDetailById") - @PreAuthorize("@el.check('dict:del')") - public ResponseEntity removeDictDetailById(@RequestBody SystemDictDetailTb args) { - systemDictDetailService.removeDictDetailById(args.getId()); - return ResponseEntity.ok(null); - } + @ApiOperation("新增字典详情") + @PostMapping(value = "/saveDictDetail") + @PreAuthorize("@el.check('dict:add')") + public ResponseEntity saveDictDetail(@Validated @RequestBody SystemCreateDictDetailArgs args) { + systemDictDetailService.saveDictDetail(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("修改字典详情") + @PostMapping(value = "/modifyDictDetailById") + @PreAuthorize("@el.check('dict:edit')") + public ResponseEntity modifyDictDetailById( + @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) { + systemDictDetailService.updateDictDetailById(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("删除字典详情") + @PostMapping(value = "/removeDictDetailById") + @PreAuthorize("@el.check('dict:del')") + public ResponseEntity removeDictDetailById(@RequestBody SystemDictDetailTb args) { + systemDictDetailService.deleteDictDetailById(args.getId()); + return ResponseEntity.ok(null); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 85a08725..211f6af3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -36,27 +36,26 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "工具：邮件管理") public class SystemEmailController { - @Autowired - private SystemEmailService systemEmailService; + @Autowired private SystemEmailService systemEmailService; - @ApiOperation("查询配置") - @PostMapping(value = "/getLastEmailConfig") - public ResponseEntity getLastEmailConfig() { - return ResponseEntity.ok(systemEmailService.getLastEmailConfig()); - } + @ApiOperation("查询配置") + @PostMapping(value = "/getLastEmailConfig") + public ResponseEntity getLastEmailConfig() { + return ResponseEntity.ok(systemEmailService.getLastEmailConfig()); + } - @ApiOperation("配置邮件") - @PostMapping(value = "/modifyEmailConfig") - public ResponseEntity modifyEmailConfig(@Validated @RequestBody SystemEmailConfigTb emailConfig) - throws Exception { - systemEmailService.modifyEmailConfig(emailConfig); - return ResponseEntity.ok(null); - } + @ApiOperation("配置邮件") + @PostMapping(value = "/modifyEmailConfig") + public ResponseEntity modifyEmailConfig(@Validated @RequestBody SystemEmailConfigTb emailConfig) + throws Exception { + systemEmailService.updateEmailConfigById(emailConfig); + return ResponseEntity.ok(null); + } - @ApiOperation("发送邮件") - @PostMapping(value = "/sendEmail") - public ResponseEntity sendEmail(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) { - systemEmailService.sendEmail(sendEmailRequest); - return ResponseEntity.ok(null); - } + @ApiOperation("发送邮件") + @PostMapping(value = "/sendEmail") + public ResponseEntity sendEmail(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) { + systemEmailService.sendEmail(sendEmailRequest); + return ResponseEntity.ok(null); + } } 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 422e0f51..490b9151 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 @@ -24,9 +24,9 @@ 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 jakarta.servlet.http.HttpServletResponse; import java.io.IOException; 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; @@ -42,57 +42,56 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/job") public class SystemJobController { - @Autowired - private SystemJobService systemJobService; + @Autowired private SystemJobService systemJobService; - @ApiOperation("导出岗位数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('job:list')") - public void exportJob(HttpServletResponse response, SystemQueryJobArgs criteria) throws IOException { - systemJobService.exportJobExcel(systemJobService.queryJobByArgs(criteria), response); - } + @ApiOperation("导出岗位数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('job:list')") + public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) throws IOException { + systemJobService.exportJobExcel(systemJobService.queryJobByArgs(args), response); + } - @ApiOperation("查询岗位") - @PostMapping(value = "/queryAllEnableJob") - @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJobByArgs( - @Validated @RequestBody KitPageArgs args) { - SystemQueryJobArgs criteria = args.getArgs(); - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return ResponseEntity.ok(systemJobService.queryJobByArgs(criteria, page)); - } + @ApiOperation("查询岗位") + @PostMapping(value = "/queryAllEnableJob") + @PreAuthorize("@el.check('job:list','user:list')") + public ResponseEntity> queryJobByArgs( + @Validated @RequestBody KitPageArgs pageArgs) { + SystemQueryJobArgs args = pageArgs.getArgs(); + Page page = new Page<>(args.getPage(), args.getSize()); + return ResponseEntity.ok(systemJobService.searchJobByArgs(args, page)); + } - @ApiOperation("查询岗位") - @PostMapping - @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJobByCrud( - @Validated @RequestBody KitPageArgs args) { - return queryJobByArgs(args); - } + @ApiOperation("查询岗位") + @PostMapping + @PreAuthorize("@el.check('job:list','user:list')") + public ResponseEntity> queryJobByCrud( + @Validated @RequestBody KitPageArgs args) { + return queryJobByArgs(args); + } - @ApiOperation("新增岗位") - @PostMapping(value = "/saveJob") - @PreAuthorize("@el.check('job:add')") - public ResponseEntity saveJob(@Validated @RequestBody SystemCreateJobArgs args) { - systemJobService.saveJob(args); - return ResponseEntity.ok(null); - } + @ApiOperation("新增岗位") + @PostMapping(value = "/saveJob") + @PreAuthorize("@el.check('job:add')") + public ResponseEntity saveJob(@Validated @RequestBody SystemCreateJobArgs args) { + systemJobService.saveJob(args); + return ResponseEntity.ok(null); + } - @ApiOperation("修改岗位") - @PostMapping(value = "/modifyJobById") - @PreAuthorize("@el.check('job:edit')") - public ResponseEntity modifyJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) { - systemJobService.modifyJobById(args); - return ResponseEntity.ok(null); - } + @ApiOperation("修改岗位") + @PostMapping(value = "/modifyJobById") + @PreAuthorize("@el.check('job:edit')") + public ResponseEntity modifyJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) { + systemJobService.updateJobById(args); + return ResponseEntity.ok(null); + } - @ApiOperation("删除岗位") - @PostMapping(value = "/removeJobByIds") - @PreAuthorize("@el.check('job:del')") - public ResponseEntity removeJobByIds(@RequestBody Set ids) { - // 验证是否被用户关联 - systemJobService.verifyBindRelationByIds(ids); - systemJobService.removeJobByIds(ids); - return ResponseEntity.ok(null); - } + @ApiOperation("删除岗位") + @PostMapping(value = "/removeJobByIds") + @PreAuthorize("@el.check('job:del')") + public ResponseEntity removeJobByIds(@RequestBody Set ids) { + // 验证是否被用户关联 + systemJobService.verifyBindRelationByIds(ids); + systemJobService.deleteJobByIds(ids); + return ResponseEntity.ok(null); + } } 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 4298b307..62df6ad9 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 @@ -26,8 +26,8 @@ import cn.odboy.util.KitFileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -45,58 +45,57 @@ import org.springframework.web.multipart.MultipartFile; @RequestMapping("/api/localStorage") public class SystemLocalStorageController { - @Autowired - private SystemLocalStorageService localStorageService; + @Autowired private SystemLocalStorageService localStorageService; - @ApiOperation("查询文件") - @PostMapping - @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryLocalStorage( - @Validated @RequestBody KitPageArgs args) { - SystemQueryStorageArgs criteria = args.getArgs(); - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return ResponseEntity.ok(localStorageService.queryLocalStorage(criteria, page)); - } - - @ApiOperation("导出数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('storage:list')") - public void exportFile(HttpServletResponse response, SystemQueryStorageArgs criteria) throws IOException { - localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorage(criteria), response); - } - - @ApiOperation("上传文件") - @PostMapping(value = "/uploadFile") - @PreAuthorize("@el.check('storage:add')") - public ResponseEntity uploadFile(@RequestParam String name, @RequestParam("file") MultipartFile file) { - localStorageService.uploadFile(name, file); - return ResponseEntity.ok(null); - } - - @ApiOperation("上传图片") - @PostMapping("/uploadPicture") - public ResponseEntity uploadPicture(@RequestParam MultipartFile file) { - // 判断文件是否为图片 - String suffix = KitFileUtil.getSuffix(file.getOriginalFilename()); - if (!FileTypeEnum.IMAGE.getCode().equals(KitFileUtil.getFileType(suffix))) { - throw new BadRequestException("只能上传图片"); + @ApiOperation("查询文件") + @PostMapping + @PreAuthorize("@el.check('storage:list')") + public ResponseEntity> queryLocalStorage( + @Validated @RequestBody KitPageArgs pageArgs) { + SystemQueryStorageArgs args = pageArgs.getArgs(); + Page page = new Page<>(args.getPage(), args.getSize()); + return ResponseEntity.ok(localStorageService.searchLocalStorage(args, page)); } - SystemLocalStorageTb localStorage = localStorageService.uploadFile(null, file); - return ResponseEntity.ok(localStorage); - } - @ApiOperation("修改文件") - @PostMapping(value = "/modifyLocalStorageById") - @PreAuthorize("@el.check('storage:edit')") - public ResponseEntity modifyLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) { - localStorageService.modifyLocalStorageById(args); - return ResponseEntity.ok(null); - } + @ApiOperation("导出数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('storage:list')") + public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { + localStorageService.exportLocalStorageExcel(localStorageService.queryLocalStorageByArgs(args), response); + } - @ApiOperation("多选删除") - @PostMapping(value = "/removeFileByIds") - public ResponseEntity deleteFileByIds(@RequestBody Long[] ids) { - localStorageService.removeFileByIds(ids); - return ResponseEntity.ok(null); - } + @ApiOperation("上传文件") + @PostMapping(value = "/uploadFile") + @PreAuthorize("@el.check('storage:add')") + public ResponseEntity uploadFile(@RequestParam String name, @RequestParam("file") MultipartFile file) { + localStorageService.uploadFile(name, file); + return ResponseEntity.ok(null); + } + + @ApiOperation("上传图片") + @PostMapping("/uploadPicture") + public ResponseEntity uploadPicture(@RequestParam MultipartFile file) { + // 判断文件是否为图片 + String suffix = KitFileUtil.getSuffix(file.getOriginalFilename()); + if (!FileTypeEnum.IMAGE.getCode().equals(KitFileUtil.getFileType(suffix))) { + throw new BadRequestException("只能上传图片"); + } + SystemLocalStorageTb localStorage = localStorageService.uploadFile(null, file); + return ResponseEntity.ok(localStorage); + } + + @ApiOperation("修改文件") + @PostMapping(value = "/modifyLocalStorageById") + @PreAuthorize("@el.check('storage:edit')") + public ResponseEntity modifyLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) { + localStorageService.updateLocalStorageById(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("多选删除") + @PostMapping(value = "/removeFileByIds") + public ResponseEntity deleteFileByIds(@RequestBody Long[] ids) { + localStorageService.deleteFileByIds(ids); + return ResponseEntity.ok(null); + } } 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 d228f47c..ed0dccda 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 @@ -28,13 +28,13 @@ import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashSet; 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.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -51,110 +51,108 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/menu") public class SystemMenuController { - @Autowired - private SystemMenuService systemMenuService; - @Autowired - private SystemMenuMapper systemMenuMapper; + @Autowired private SystemMenuService systemMenuService; + @Autowired private SystemMenuMapper systemMenuMapper; - @ApiOperation("导出菜单数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('menu:list')") - public void exportMenu(HttpServletResponse response, SystemQueryMenuArgs criteria) throws Exception { - systemMenuService.exportMenuExcel(systemMenuService.queryAllMenu(criteria, false), response); - } + @ApiOperation("导出菜单数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('menu:list')") + public void exportMenu(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception { + systemMenuService.exportMenuExcel(systemMenuService.queryAllMenu(args, false), response); + } - @PostMapping(value = "/buildMenus") - @ApiOperation("获取前端所需菜单") - public ResponseEntity> buildMenus() { - List menuList = systemMenuService.queryMenuListByUserId(KitSecurityHelper.getCurrentUserId()); - List menus = systemMenuService.buildMenuTree(menuList); - return ResponseEntity.ok(systemMenuService.buildMenuVo(menus)); - } + @PostMapping(value = "/buildMenus") + @ApiOperation("获取前端所需菜单") + public ResponseEntity> buildMenus() { + List menuList = systemMenuService.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); + List menus = systemMenuService.buildMenuTree(menuList); + return ResponseEntity.ok(systemMenuService.buildMenuVo(menus)); + } - @ApiOperation("返回全部的菜单") - @PostMapping(value = "/queryMenuListByPid") - @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> queryMenuListByPid(@RequestParam Long pid) { - return ResponseEntity.ok(systemMenuService.queryMenuByPid(pid)); - } + @ApiOperation("返回全部的菜单") + @PostMapping(value = "/queryMenuListByPid") + @PreAuthorize("@el.check('menu:list','roles:list')") + public ResponseEntity> queryMenuListByPid(@RequestParam Long pid) { + return ResponseEntity.ok(systemMenuService.listMenuByPid(pid)); + } - @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID") - @PostMapping(value = "/queryChildMenuSet") - @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> queryChildMenuSet(@RequestParam Long id) { - Set menuSet = new HashSet<>(); - List menuList = systemMenuService.queryMenuByPid(id); - menuSet.add(systemMenuMapper.selectById(id)); - menuSet = systemMenuService.queryChildMenu(menuList, menuSet); - Set ids = menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); - return ResponseEntity.ok(ids); - } + @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID") + @PostMapping(value = "/queryChildMenuSet") + @PreAuthorize("@el.check('menu:list','roles:list')") + public ResponseEntity> queryChildMenuSet(@RequestParam Long id) { + Set menuSet = new HashSet<>(); + List menuList = systemMenuService.listMenuByPid(id); + menuSet.add(systemMenuMapper.selectById(id)); + menuSet = systemMenuService.queryChildMenuByArgs(menuList, menuSet); + Set ids = menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); + return ResponseEntity.ok(ids); + } - @PostMapping - @ApiOperation("查询菜单") - @PreAuthorize("@el.check('menu:list')") - public ResponseEntity> queryAllMenuByCrud( - @Validated @RequestBody KitPageArgs args) throws Exception { - return queryAllMenu(args); - } + @PostMapping + @ApiOperation("查询菜单") + @PreAuthorize("@el.check('menu:list')") + public ResponseEntity> queryAllMenuByCrud( + @Validated @RequestBody KitPageArgs args) throws Exception { + return queryAllMenu(args); + } - @PostMapping(value = "/queryMenuByArgs") - @ApiOperation("查询菜单") - @PreAuthorize("@el.check('menu:list')") - public ResponseEntity> queryAllMenu( - @Validated @RequestBody KitPageArgs args) throws Exception { - SystemQueryMenuArgs criteria = args.getArgs(); - List menuList = systemMenuService.queryAllMenu(criteria, true); - return ResponseEntity.ok(KitPageUtil.toPage(menuList)); - } + @PostMapping(value = "/queryMenuByArgs") + @ApiOperation("查询菜单") + @PreAuthorize("@el.check('menu:list')") + public ResponseEntity> queryAllMenu( + @Validated @RequestBody KitPageArgs pageArgs) throws Exception { + SystemQueryMenuArgs args = pageArgs.getArgs(); + List menuList = systemMenuService.queryAllMenu(args, true); + return ResponseEntity.ok(KitPageUtil.toPage(menuList)); + } - @ApiOperation("查询菜单:根据ID获取同级与上级数据") - @PostMapping("/queryMenuSuperior") - @PreAuthorize("@el.check('menu:list')") - public ResponseEntity> queryMenuSuperior(@RequestBody List ids) { - Set menus; - if (CollectionUtil.isNotEmpty(ids)) { - menus = new LinkedHashSet<>(systemMenuService.queryMenuByIds(ids)); - for (SystemMenuTb menu : menus) { - List menuList = systemMenuService.querySuperiorMenuList(menu, new ArrayList<>()); - for (SystemMenuTb data : menuList) { - if (data.getId().equals(menu.getPid())) { - data.setSubCount(data.getSubCount() - 1); - } + @ApiOperation("查询菜单:根据ID获取同级与上级数据") + @PostMapping("/queryMenuSuperior") + @PreAuthorize("@el.check('menu:list')") + public ResponseEntity> queryMenuSuperior(@RequestBody List ids) { + Set menus; + if (CollectionUtil.isNotEmpty(ids)) { + menus = new LinkedHashSet<>(systemMenuService.listMenuByIds(ids)); + for (SystemMenuTb menu : menus) { + List menuList = systemMenuService.querySuperiorMenuByArgs(menu, new ArrayList<>()); + for (SystemMenuTb data : menuList) { + if (data.getId().equals(menu.getPid())) { + data.setSubCount(data.getSubCount() - 1); + } + } + menus.addAll(menuList); + } + // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 + menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); + return ResponseEntity.ok(systemMenuService.buildMenuTree(new ArrayList<>(menus))); } - menus.addAll(menuList); - } - // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 - menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); - return ResponseEntity.ok(systemMenuService.buildMenuTree(new ArrayList<>(menus))); + return ResponseEntity.ok(systemMenuService.listMenuByPid(null)); } - return ResponseEntity.ok(systemMenuService.queryMenuByPid(null)); - } - @ApiOperation("新增菜单") - @PostMapping(value = "/saveMenu") - @PreAuthorize("@el.check('menu:add')") - public ResponseEntity saveMenu(@Validated @RequestBody SystemMenuTb args) { - if (args.getId() != null) { - throw new BadRequestException("无效参数id"); + @ApiOperation("新增菜单") + @PostMapping(value = "/saveMenu") + @PreAuthorize("@el.check('menu:add')") + public ResponseEntity saveMenu(@Validated @RequestBody SystemMenuTb args) { + if (args.getId() != null) { + throw new BadRequestException("无效参数id"); + } + systemMenuService.saveMenu(args); + return ResponseEntity.ok(null); } - systemMenuService.saveMenu(args); - return ResponseEntity.ok(null); - } - @ApiOperation("修改菜单") - @PostMapping(value = "/modifyMenuById") - @PreAuthorize("@el.check('menu:edit')") - public ResponseEntity modifyMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) { - systemMenuService.modifyMenuById(args); - return ResponseEntity.ok(null); - } + @ApiOperation("修改菜单") + @PostMapping(value = "/modifyMenuById") + @PreAuthorize("@el.check('menu:edit')") + public ResponseEntity modifyMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) { + systemMenuService.updateMenuById(args); + return ResponseEntity.ok(null); + } - @ApiOperation("删除菜单") - @PostMapping(value = "/removeMenuByIds") - @PreAuthorize("@el.check('menu:del')") - public ResponseEntity removeMenuByIds(@RequestBody Set ids) { - systemMenuService.removeMenuByIds(ids); - return ResponseEntity.ok(null); - } + @ApiOperation("删除菜单") + @PostMapping(value = "/removeMenuByIds") + @PreAuthorize("@el.check('menu:del')") + public ResponseEntity removeMenuByIds(@RequestBody Set ids) { + systemMenuService.deleteMenuByIds(ids); + return ResponseEntity.ok(null); + } } 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 dd165cd2..1654599d 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 @@ -31,13 +31,12 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/monitor") public class SystemMonitorController { - @Autowired - private SystemMonitorService systemMonitorService; + @Autowired private SystemMonitorService systemMonitorService; - @PostMapping(value = "/queryServerMonitorInfo") - @ApiOperation("查询服务监控") - @PreAuthorize("@el.check('monitor:list')") - public ResponseEntity> queryServerMonitorInfo() { - return ResponseEntity.ok(systemMonitorService.queryServerMonitorInfo()); - } + @PostMapping(value = "/queryServerMonitorInfo") + @ApiOperation("查询服务监控") + @PreAuthorize("@el.check('monitor:list')") + public ResponseEntity> queryServerMonitorInfo() { + return ResponseEntity.ok(systemMonitorService.getServerMonitorInfo()); + } } 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 95912ea5..e5c341c5 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,9 +24,9 @@ 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 jakarta.servlet.http.HttpServletResponse; import java.io.IOException; 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; @@ -42,35 +42,34 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "系统：在线用户管理") public class SystemOnlineController { - @Autowired - private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @Autowired private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; - @ApiOperation("查询在线用户") - @PostMapping - @PreAuthorize("@el.check()") - public ResponseEntity> queryOnlineUser( - @Validated @RequestBody KitPageArgs args) { - IPage page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemUserOnlineInfoDAO.queryUserOnlineModelPage(args.getArgs(), page)); - } + @ApiOperation("查询在线用户") + @PostMapping + @PreAuthorize("@el.check()") + public ResponseEntity> queryOnlineUser( + @Validated @RequestBody KitPageArgs args) { + IPage page = new Page<>(args.getPage(), args.getSize()); + return ResponseEntity.ok(systemUserOnlineInfoDAO.queryUserOnlineModelPage(args.getArgs(), page)); + } - @ApiOperation("导出数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check()") - public void exportOnlineUser(HttpServletResponse response, String username) throws IOException { - systemUserOnlineInfoDAO.downloadUserOnlineModelExcel( - systemUserOnlineInfoDAO.queryUserOnlineModelListByUsername(username), response); - } + @ApiOperation("导出数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check()") + public void exportOnlineUser(HttpServletResponse response, String username) throws IOException { + systemUserOnlineInfoDAO.downloadUserOnlineModelExcel( + systemUserOnlineInfoDAO.queryUserOnlineModelListByUsername(username), response); + } - @ApiOperation("踢出用户") - @PostMapping(value = "/kickOutUser") - @PreAuthorize("@el.check()") - public ResponseEntity kickOutUser(@RequestBody Set keys) throws Exception { - for (String token : keys) { - // 解密Key - token = KitDesEncryptUtil.desDecrypt(token); - systemUserOnlineInfoDAO.logoutByToken(token); + @ApiOperation("踢出用户") + @PostMapping(value = "/kickOutUser") + @PreAuthorize("@el.check()") + public ResponseEntity kickOutUser(@RequestBody Set keys) throws Exception { + for (String token : keys) { + // 解密Key + token = KitDesEncryptUtil.desDecrypt(token); + systemUserOnlineInfoDAO.logoutByToken(token); + } + return ResponseEntity.ok(null); } - return ResponseEntity.ok(null); - } } 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 b4e1ec75..59232ff6 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 @@ -24,8 +24,8 @@ 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 java.io.IOException; import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -45,38 +45,37 @@ import org.springframework.web.multipart.MultipartFile; @RequestMapping("/api/ossStorage") public class SystemOssStorageController { - @Autowired - private SystemOssStorageService systemOssStorageService; + @Autowired private SystemOssStorageService systemOssStorageService; - @ApiOperation("查询文件") - @PostMapping - @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryOssStorage( - @Validated @RequestBody KitPageArgs args) { - SystemQueryStorageArgs criteria = args.getArgs(); - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return ResponseEntity.ok(systemOssStorageService.queryOssStorage(criteria, page)); - } + @ApiOperation("查询文件") + @PostMapping + @PreAuthorize("@el.check('storage:list')") + public ResponseEntity> queryOssStorage( + @Validated @RequestBody KitPageArgs pageArgs) { + SystemQueryStorageArgs args = pageArgs.getArgs(); + Page page = new Page<>(args.getPage(), args.getSize()); + return ResponseEntity.ok(systemOssStorageService.searchOssStorage(args, page)); + } - @ApiOperation("导出数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('storage:list')") - public void exportFile(HttpServletResponse response, SystemQueryStorageArgs criteria) throws IOException { - systemOssStorageService.exportOssStorageExcel(systemOssStorageService.queryOssStorage(criteria), response); - } + @ApiOperation("导出数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('storage:list')") + public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { + systemOssStorageService.exportOssStorageExcel(systemOssStorageService.queryOssStorage(args), response); + } - @ApiOperation("上传文件") - @PostMapping(value = "/uploadFile") - @PreAuthorize("@el.check('storage:add')") - public ResponseEntity uploadFile(@RequestParam("file") MultipartFile file) { - String fileUrl = systemOssStorageService.uploadFile(file); - return ResponseEntity.ok(fileUrl); - } + @ApiOperation("上传文件") + @PostMapping(value = "/uploadFile") + @PreAuthorize("@el.check('storage:add')") + public ResponseEntity uploadFile(@RequestParam("file") MultipartFile file) { + String fileUrl = systemOssStorageService.uploadFile(file); + return ResponseEntity.ok(fileUrl); + } - @ApiOperation("多选删除") - @PostMapping(value = "/removeFileByIds") - public ResponseEntity removeFileByIds(@RequestBody Long[] ids) { - systemOssStorageService.removeFileByIds(ids); - return ResponseEntity.ok(null); - } + @ApiOperation("多选删除") + @PostMapping(value = "/removeFileByIds") + public ResponseEntity removeFileByIds(@RequestBody Long[] ids) { + systemOssStorageService.deleteFileByIds(ids); + return ResponseEntity.ok(null); + } } 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 047d41c5..df5b0cae 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 @@ -27,9 +27,9 @@ import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; 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; @@ -49,99 +49,98 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "系统:定时任务管理") public class SystemQuartzJobController { - @Autowired - private SystemQuartzJobService systemQuartzJobService; + @Autowired private SystemQuartzJobService systemQuartzJobService; - @ApiOperation("查询定时任务") - @PostMapping - @PreAuthorize("@el.check('quartzJob:list')") - public ResponseEntity> queryQuartzJobByCrud( - @Validated @RequestBody KitPageArgs args) { - SystemQueryQuartzJobArgs criteria = args.getArgs(); - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return ResponseEntity.ok(systemQuartzJobService.queryQuartzJobByArgs(criteria, page)); - } - - @ApiOperation("导出任务数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('quartzJob:list')") - public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs criteria) throws IOException { - systemQuartzJobService.exportQuartzJobExcel(systemQuartzJobService.queryQuartzJobByArgs(criteria), response); - } - - @ApiOperation("导出日志数据") - @GetMapping(value = "/logs/download") - @PreAuthorize("@el.check('quartzJob:list')") - public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs criteria) throws IOException { - systemQuartzJobService.exportQuartzLogExcel(systemQuartzJobService.queryQuartzLogByArgs(criteria), response); - } - - @ApiOperation("查询任务执行日志") - @PostMapping(value = "/logs") - @PreAuthorize("@el.check('quartzJob:list')") - public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs args) { - Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemQuartzJobService.queryQuartzLogByArgs(args, page)); - } - - @ApiOperation("新增定时任务") - @PostMapping(value = "/createQuartzJob") - @PreAuthorize("@el.check('quartzJob:add')") - public ResponseEntity createQuartzJob(@Validated @RequestBody SystemQuartzJobTb args) { - if (args.getId() != null) { - throw new BadRequestException("无效参数id"); + @ApiOperation("查询定时任务") + @PostMapping + @PreAuthorize("@el.check('quartzJob:list')") + public ResponseEntity> queryQuartzJobByCrud( + @Validated @RequestBody KitPageArgs pageArgs) { + SystemQueryQuartzJobArgs args = pageArgs.getArgs(); + Page page = new Page<>(args.getPage(), args.getSize()); + return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(args, page)); } - // 验证Bean是不是合法的, 合法的定时任务 Bean 需要用 @Service 定义 - checkBean(args.getBeanName()); - systemQuartzJobService.createJob(args); - return ResponseEntity.ok(null); - } - @ApiOperation("修改定时任务") - @PutMapping - @PreAuthorize("@el.check('quartzJob:edit')") - public ResponseEntity updateQuartzJob( - @Validated(SystemQuartzJobTb.Update.class) @RequestBody SystemUpdateQuartzJobArgs args) { - // 验证Bean是不是合法的, 合法的定时任务 Bean 需要用 @Service 定义 - checkBean(args.getBeanName()); - systemQuartzJobService.modifyQuartzJobResumeCron(args); - return ResponseEntity.ok(null); - } - - @ApiOperation("更改定时任务状态") - @PostMapping(value = "/switchQuartzJobStatus/{id}") - @PreAuthorize("@el.check('quartzJob:edit')") - public ResponseEntity switchQuartzJobStatus(@PathVariable Long id) { - systemQuartzJobService.switchQuartzJobStatus(systemQuartzJobService.getQuartzJobById(id)); - return ResponseEntity.ok(null); - } - - @ApiOperation("执行定时任务") - @PostMapping(value = "/startQuartzJob/{id}") - @PreAuthorize("@el.check('quartzJob:edit')") - public ResponseEntity startQuartzJob(@PathVariable Long id) { - systemQuartzJobService.startQuartzJob(systemQuartzJobService.getQuartzJobById(id)); - return ResponseEntity.ok(null); - } - - @ApiOperation("删除定时任务") - @PostMapping(value = "/removeJobByIds") - @PreAuthorize("@el.check('quartzJob:del')") - public ResponseEntity removeJobByIds(@RequestBody Set ids) { - systemQuartzJobService.removeJobByIds(ids); - return ResponseEntity.ok(null); - } - - /** - * 验证Bean是不是合法的, 合法的定时任务 Bean 需要用 @Service 定义 - * - * @param beanName Bean名称 - */ - private void checkBean(String beanName) { - // 避免调用攻击者可以从SpringContextHolder获得控制jdbcTemplate类 - // 并使用getDeclaredMethod调用jdbcTemplate的queryForMap函数，执行任意sql命令。 - if (!KitSpringBeanHolder.getAllServiceBeanName().contains(beanName)) { - throw new BadRequestException("非法的 Bean，请重新输入！"); + @ApiOperation("导出任务数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('quartzJob:list')") + public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs args) throws IOException { + systemQuartzJobService.exportQuartzJobExcel(systemQuartzJobService.queryQuartzJobByArgs(args), response); + } + + @ApiOperation("导出日志数据") + @GetMapping(value = "/logs/download") + @PreAuthorize("@el.check('quartzJob:list')") + public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs args) throws IOException { + systemQuartzJobService.exportQuartzLogExcel(systemQuartzJobService.queryQuartzLogByArgs(args), response); + } + + @ApiOperation("查询任务执行日志") + @PostMapping(value = "/logs") + @PreAuthorize("@el.check('quartzJob:list')") + public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs args) { + Page page = new Page<>(args.getPage(), args.getSize()); + return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page)); + } + + @ApiOperation("新增定时任务") + @PostMapping(value = "/createQuartzJob") + @PreAuthorize("@el.check('quartzJob:add')") + public ResponseEntity createQuartzJob(@Validated @RequestBody SystemQuartzJobTb args) { + if (args.getId() != null) { + throw new BadRequestException("无效参数id"); + } + // 验证Bean是不是合法的, 合法的定时任务 Bean 需要用 @Service 定义 + checkBean(args.getBeanName()); + systemQuartzJobService.createJob(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("修改定时任务") + @PutMapping + @PreAuthorize("@el.check('quartzJob:edit')") + public ResponseEntity updateQuartzJob( + @Validated(SystemQuartzJobTb.Update.class) @RequestBody SystemUpdateQuartzJobArgs args) { + // 验证Bean是不是合法的, 合法的定时任务 Bean 需要用 @Service 定义 + checkBean(args.getBeanName()); + systemQuartzJobService.updateQuartzJobResumeCron(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("更改定时任务状态") + @PostMapping(value = "/switchQuartzJobStatus/{id}") + @PreAuthorize("@el.check('quartzJob:edit')") + public ResponseEntity switchQuartzJobStatus(@PathVariable Long id) { + systemQuartzJobService.switchQuartzJobStatus(systemQuartzJobService.getQuartzJobById(id)); + return ResponseEntity.ok(null); + } + + @ApiOperation("执行定时任务") + @PostMapping(value = "/startQuartzJob/{id}") + @PreAuthorize("@el.check('quartzJob:edit')") + public ResponseEntity startQuartzJob(@PathVariable Long id) { + systemQuartzJobService.startQuartzJob(systemQuartzJobService.getQuartzJobById(id)); + return ResponseEntity.ok(null); + } + + @ApiOperation("删除定时任务") + @PostMapping(value = "/removeJobByIds") + @PreAuthorize("@el.check('quartzJob:del')") + public ResponseEntity removeJobByIds(@RequestBody Set ids) { + systemQuartzJobService.deleteJobByIds(ids); + return ResponseEntity.ok(null); + } + + /** + * 验证Bean是不是合法的, 合法的定时任务 Bean 需要用 @Service 定义 + * + * @param beanName Bean名称 + */ + private void checkBean(String beanName) { + // 避免调用攻击者可以从SpringContextHolder获得控制jdbcTemplate类 + // 并使用getDeclaredMethod调用jdbcTemplate的queryForMap函数，执行任意sql命令。 + if (!KitSpringBeanHolder.getAllServiceBeanName().contains(beanName)) { + throw new BadRequestException("非法的 Bean，请重新输入！"); + } } - } } 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 2088971f..57d22e95 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 @@ -28,12 +28,12 @@ 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 jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collections; 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.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -49,102 +49,101 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/role") public class SystemRoleController { - @Autowired - private SystemRoleService systemRoleService; + @Autowired private SystemRoleService systemRoleService; - @ApiOperation("获取单个role") - @PostMapping(value = "/queryRoleById") - @PreAuthorize("@el.check('roles:list')") - public ResponseEntity queryRoleById(@RequestBody SystemRoleTb args) { - return ResponseEntity.ok(systemRoleService.getRoleById(args.getId())); - } - - @ApiOperation("导出角色数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('role:list')") - public void exportRole(HttpServletResponse response, SystemQueryRoleArgs criteria) throws IOException { - systemRoleService.exportRoleExcel(systemRoleService.queryRoleByArgs(criteria), response); - } - - @ApiOperation("返回全部的角色") - @PostMapping(value = "/queryRoleList") - @PreAuthorize("@el.check('roles:list','user:add','user:edit')") - public ResponseEntity> queryRoleList() { - return ResponseEntity.ok(systemRoleService.queryAllRole()); - } - - @ApiOperation("查询角色") - @PostMapping - @PreAuthorize("@el.check('roles:list')") - public ResponseEntity> queryRoleByArgs( - @Validated @RequestBody KitPageArgs args) { - SystemQueryRoleArgs criteria = args.getArgs(); - Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return ResponseEntity.ok(systemRoleService.queryRoleByArgs(criteria, page)); - } - - @ApiOperation("获取用户级别") - @PostMapping(value = "/queryRoleLevel") - public ResponseEntity queryRoleLevel() { - return ResponseEntity.ok(Dict.create().set("level", checkRoleLevels(null))); - } - - @ApiOperation("新增角色") - @PostMapping(value = "/saveRole") - @PreAuthorize("@el.check('roles:add')") - public ResponseEntity saveRole(@Validated @RequestBody SystemCreateRoleArgs args) { - checkRoleLevels(args.getLevel()); - systemRoleService.saveRole(args); - return ResponseEntity.ok(null); - } - - @ApiOperation("修改角色") - @PostMapping(value = "/modifyRoleById") - @PreAuthorize("@el.check('roles:edit')") - public ResponseEntity modifyRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) { - checkRoleLevels(args.getLevel()); - systemRoleService.modifyRoleById(args); - return ResponseEntity.ok(null); - } - - @ApiOperation("修改角色菜单") - @PostMapping(value = "/modifyBindMenuById") - @PreAuthorize("@el.check('roles:edit')") - public ResponseEntity modifyBindMenuById(@RequestBody SystemRoleVo args) { - SystemRoleTb role = systemRoleService.getRoleById(args.getId()); - checkRoleLevels(role.getLevel()); - systemRoleService.modifyBindMenuById(args); - return ResponseEntity.ok(null); - } - - @ApiOperation("删除角色") - @PostMapping(value = "/removeRoleByIds") - @PreAuthorize("@el.check('roles:del')") - public ResponseEntity removeRoleByIds(@RequestBody Set ids) { - for (Long id : ids) { - SystemRoleTb role = systemRoleService.getRoleById(id); - checkRoleLevels(role.getLevel()); + @ApiOperation("获取单个role") + @PostMapping(value = "/queryRoleById") + @PreAuthorize("@el.check('roles:list')") + public ResponseEntity queryRoleById(@RequestBody SystemRoleTb args) { + return ResponseEntity.ok(systemRoleService.getRoleById(args.getId())); } - // 验证是否被用户关联 - systemRoleService.verifyBindRelationByIds(ids); - systemRoleService.removeRoleByIds(ids); - return ResponseEntity.ok(null); - } - /** - * 检查用户的角色级别 - * - * @return / - */ - private int checkRoleLevels(Integer level) { - List levels = systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream() - .map(SystemRoleTb::getLevel).collect(Collectors.toList()); - int min = Collections.min(levels); - if (level != null) { - if (level < min) { - throw new BadRequestException("权限不足, 你的角色级别：" + min + ", 低于操作的角色级别：" + level); - } + @ApiOperation("导出角色数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('role:list')") + public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) throws IOException { + systemRoleService.exportRoleExcel(systemRoleService.queryRoleByArgs(args), response); + } + + @ApiOperation("返回全部的角色") + @PostMapping(value = "/queryRoleList") + @PreAuthorize("@el.check('roles:list','user:add','user:edit')") + public ResponseEntity> queryRoleList() { + return ResponseEntity.ok(systemRoleService.listAllRole()); + } + + @ApiOperation("查询角色") + @PostMapping + @PreAuthorize("@el.check('roles:list')") + public ResponseEntity> queryRoleByArgs( + @Validated @RequestBody KitPageArgs pageArgs) { + SystemQueryRoleArgs args = pageArgs.getArgs(); + Page page = new Page<>(args.getPage(), args.getSize()); + return ResponseEntity.ok(systemRoleService.searchRoleByArgs(args, page)); + } + + @ApiOperation("获取用户级别") + @PostMapping(value = "/queryRoleLevel") + public ResponseEntity queryRoleLevel() { + return ResponseEntity.ok(Dict.create().set("level", checkRoleLevels(null))); + } + + @ApiOperation("新增角色") + @PostMapping(value = "/saveRole") + @PreAuthorize("@el.check('roles:add')") + public ResponseEntity saveRole(@Validated @RequestBody SystemCreateRoleArgs args) { + checkRoleLevels(args.getLevel()); + systemRoleService.saveRole(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("修改角色") + @PostMapping(value = "/modifyRoleById") + @PreAuthorize("@el.check('roles:edit')") + public ResponseEntity modifyRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) { + checkRoleLevels(args.getLevel()); + systemRoleService.updateRoleById(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("修改角色菜单") + @PostMapping(value = "/modifyBindMenuById") + @PreAuthorize("@el.check('roles:edit')") + public ResponseEntity modifyBindMenuById(@RequestBody SystemRoleVo args) { + SystemRoleTb role = systemRoleService.getRoleById(args.getId()); + checkRoleLevels(role.getLevel()); + systemRoleService.updateBindMenuById(args); + return ResponseEntity.ok(null); + } + + @ApiOperation("删除角色") + @PostMapping(value = "/removeRoleByIds") + @PreAuthorize("@el.check('roles:del')") + public ResponseEntity removeRoleByIds(@RequestBody Set ids) { + for (Long id : ids) { + SystemRoleTb role = systemRoleService.getRoleById(id); + checkRoleLevels(role.getLevel()); + } + // 验证是否被用户关联 + systemRoleService.verifyBindRelationByIds(ids); + systemRoleService.deleteRoleByIds(ids); + return ResponseEntity.ok(null); + } + + /** + * 检查用户的角色级别 + * + * @return / + */ + private int checkRoleLevels(Integer level) { + List levels = systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream() + .map(SystemRoleTb::getLevel).collect(Collectors.toList()); + int min = Collections.min(levels); + if (level != null) { + if (level < min) { + throw new BadRequestException("权限不足, 你的角色级别：" + min + ", 低于操作的角色级别：" + level); + } + } + return min; } - return min; - } } 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 29a1aee9..bf74379b 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 @@ -39,12 +39,12 @@ import cn.odboy.util.KitRsaEncryptUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collections; 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.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -66,179 +66,173 @@ import org.springframework.web.multipart.MultipartFile; @RequestMapping("/api/user") public class SystemUserController { - @Autowired - private PasswordEncoder passwordEncoder; - @Autowired - private SystemUserService systemUserService; - @Autowired - private SystemDataService systemDataService; - @Autowired - private SystemDeptService systemDeptService; - @Autowired - private SystemRoleService systemRoleService; - @Autowired - private SystemEmailService systemEmailService; - @Autowired - private AppProperties properties; + @Autowired private PasswordEncoder passwordEncoder; + @Autowired private SystemUserService systemUserService; + @Autowired private SystemDataService systemDataService; + @Autowired private SystemDeptService systemDeptService; + @Autowired private SystemRoleService systemRoleService; + @Autowired private SystemEmailService systemEmailService; + @Autowired private AppProperties properties; - @ApiOperation("导出用户数据") - @GetMapping(value = "/download") - @PreAuthorize("@el.check('user:list')") - public void exportUserExcel(HttpServletResponse response, SystemQueryUserArgs criteria) throws IOException { - systemUserService.exportUserExcel(systemUserService.queryUserByArgs(criteria), response); - } - - @ApiOperation("查询用户") - @PostMapping - @PreAuthorize("@el.check('user:list')") - public ResponseEntity> queryUserByArgs( - @Validated @RequestBody KitPageArgs args) { - Page page = new Page<>(args.getPage(), args.getSize()); - SystemQueryUserArgs criteria = args.getArgs(); - if (!ObjectUtils.isEmpty(criteria.getDeptId())) { - criteria.getDeptIds().add(criteria.getDeptId()); - // 先查找是否存在子节点 - List data = systemDeptService.queryDeptByPid(criteria.getDeptId()); - // 然后把子节点的ID都加入到集合中 - criteria.getDeptIds().addAll(systemDeptService.queryChildDeptIdListByDeptIds(data)); + @ApiOperation("导出用户数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('user:list')") + public void exportUserExcel(HttpServletResponse response, SystemQueryUserArgs args) throws IOException { + systemUserService.exportUserExcel(systemUserService.queryUserByArgs(args), response); } - // 数据权限 - List dataScopes = systemDataService.findDeptIdListByArgs( - systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername())); - // criteria.getDeptIds() 不为空并且数据权限不为空则取交集 - if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) { - // 取交集 - criteria.getDeptIds().retainAll(dataScopes); - if (!CollectionUtil.isEmpty(criteria.getDeptIds())) { - return ResponseEntity.ok(systemUserService.queryUserByArgs(criteria, page)); - } - } else { - // 否则取并集 - criteria.getDeptIds().addAll(dataScopes); - return ResponseEntity.ok(systemUserService.queryUserByArgs(criteria, page)); + + @ApiOperation("查询用户") + @PostMapping + @PreAuthorize("@el.check('user:list')") + public ResponseEntity> queryUserByArgs( + @Validated @RequestBody KitPageArgs pageArgs) { + Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); + SystemQueryUserArgs args = pageArgs.getArgs(); + if (!ObjectUtils.isEmpty(args.getDeptId())) { + args.getDeptIds().add(args.getDeptId()); + // 先查找是否存在子节点 + List data = systemDeptService.listDeptByPid(args.getDeptId()); + // 然后把子节点的ID都加入到集合中 + args.getDeptIds().addAll(systemDeptService.queryChildDeptIdByDeptIds(data)); + } + // 数据权限 + List dataScopes = systemDataService.queryDeptIdByArgs( + systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername())); + // args.getDeptIds() 不为空并且数据权限不为空则取交集 + if (!CollectionUtils.isEmpty(args.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) { + // 取交集 + args.getDeptIds().retainAll(dataScopes); + if (!CollectionUtil.isEmpty(args.getDeptIds())) { + return ResponseEntity.ok(systemUserService.searchUserByArgs(args, page)); + } + } else { + // 否则取并集 + args.getDeptIds().addAll(dataScopes); + return ResponseEntity.ok(systemUserService.searchUserByArgs(args, page)); + } + return ResponseEntity.ok(KitPageUtil.emptyData()); } - return ResponseEntity.ok(KitPageUtil.emptyData()); - } - @ApiOperation("新增用户") - @PostMapping(value = "/saveUser") - @PreAuthorize("@el.check('user:add')") - public ResponseEntity saveUser(@Validated @RequestBody SystemUserVo args) { - checkLevel(args); - // 默认密码 123456 - args.setPassword(passwordEncoder.encode("123456")); - systemUserService.saveUser(args); - return ResponseEntity.ok(null); - } - - @ApiOperation("修改用户") - @PostMapping(value = "/modifyUserById") - @PreAuthorize("@el.check('user:edit')") - public ResponseEntity modifyUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) { - checkLevel(args); - systemUserService.modifyUserById(args); - return ResponseEntity.ok(null); - } - - @ApiOperation("修改用户：个人中心") - @PostMapping(value = "modifyUserCenterInfoById") - public ResponseEntity modifyUserCenterInfoById( - @Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) { - if (!args.getId().equals(KitSecurityHelper.getCurrentUserId())) { - throw new BadRequestException("不能修改他人资料"); + @ApiOperation("新增用户") + @PostMapping(value = "/saveUser") + @PreAuthorize("@el.check('user:add')") + public ResponseEntity saveUser(@Validated @RequestBody SystemUserVo args) { + checkLevel(args); + // 默认密码 123456 + args.setPassword(passwordEncoder.encode("123456")); + systemUserService.saveUser(args); + return ResponseEntity.ok(null); } - systemUserService.modifyUserCenterInfoById(args); - return ResponseEntity.ok(null); - } - @ApiOperation("删除用户") - @PostMapping(value = "/removeUserByIds") - @PreAuthorize("@el.check('user:del')") - public ResponseEntity removeUserByIds(@RequestBody Set ids) { - for (Long id : ids) { - Integer currentLevel = Collections.min( - systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream() - .map(SystemRoleTb::getLevel).collect(Collectors.toList())); - Integer optLevel = Collections.min( - systemRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel) - .collect(Collectors.toList())); - if (currentLevel > optLevel) { - throw new BadRequestException( - "角色权限不足, 不能删除：" + systemUserService.getUserById(id).getUsername()); - } + @ApiOperation("修改用户") + @PostMapping(value = "/modifyUserById") + @PreAuthorize("@el.check('user:edit')") + public ResponseEntity modifyUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) { + checkLevel(args); + systemUserService.updateUserById(args); + return ResponseEntity.ok(null); } - systemUserService.removeUserByIds(ids); - return ResponseEntity.ok(null); - } - @ApiOperation("修改密码") - @PostMapping(value = "/modifyUserPasswordByUsername") - public ResponseEntity modifyUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) - throws Exception { - String oldPass = - KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getOldPass()); - String newPass = - KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getNewPass()); - SystemUserTb user = systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername()); - if (!passwordEncoder.matches(oldPass, user.getPassword())) { - throw new BadRequestException("修改失败，旧密码错误"); + @ApiOperation("修改用户：个人中心") + @PostMapping(value = "modifyUserCenterInfoById") + public ResponseEntity modifyUserCenterInfoById( + @Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) { + if (!args.getId().equals(KitSecurityHelper.getCurrentUserId())) { + throw new BadRequestException("不能修改他人资料"); + } + systemUserService.updateUserCenterInfoById(args); + return ResponseEntity.ok(null); } - if (passwordEncoder.matches(newPass, user.getPassword())) { - throw new BadRequestException("新密码不能与旧密码相同"); + + @ApiOperation("删除用户") + @PostMapping(value = "/removeUserByIds") + @PreAuthorize("@el.check('user:del')") + public ResponseEntity removeUserByIds(@RequestBody Set ids) { + for (Long id : ids) { + Integer currentLevel = Collections.min( + systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream() + .map(SystemRoleTb::getLevel).collect(Collectors.toList())); + Integer optLevel = Collections.min( + systemRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel) + .collect(Collectors.toList())); + if (currentLevel > optLevel) { + throw new BadRequestException( + "角色权限不足, 不能删除：" + systemUserService.getUserById(id).getUsername()); + } + } + systemUserService.removeUserByIds(ids); + return ResponseEntity.ok(null); } - systemUserService.modifyUserPasswordByUsername(user.getUsername(), passwordEncoder.encode(newPass)); - return ResponseEntity.ok(null); - } - @ApiOperation("重置密码") - @PostMapping(value = "/resetUserPasswordByIds") - public ResponseEntity resetUserPasswordByIds(@RequestBody Set ids) { - String defaultPwd = passwordEncoder.encode("123456"); - systemUserService.resetUserPasswordByIds(ids, defaultPwd); - return ResponseEntity.ok(null); - } - - @ApiOperation("修改头像") - @PostMapping(value = "/modifyUserAvatar") - public ResponseEntity modifyUserAvatar(@RequestParam MultipartFile avatar) { - return ResponseEntity.ok(systemUserService.modifyUserAvatar(avatar)); - } - - @ApiOperation("修改邮箱") - @PostMapping(value = "/modifyUserEmailByUsername/{code}") - public ResponseEntity modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) - throws Exception { - String password = - KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), args.getPassword()); - SystemUserTb user = systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername()); - if (!passwordEncoder.matches(password, user.getPassword())) { - throw new BadRequestException("密码错误"); + @ApiOperation("修改密码") + @PostMapping(value = "/modifyUserPasswordByUsername") + public ResponseEntity modifyUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) + throws Exception { + String oldPass = + KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getOldPass()); + String newPass = + KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getNewPass()); + SystemUserTb user = systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername()); + if (!passwordEncoder.matches(oldPass, user.getPassword())) { + throw new BadRequestException("修改失败，旧密码错误"); + } + if (passwordEncoder.matches(newPass, user.getPassword())) { + throw new BadRequestException("新密码不能与旧密码相同"); + } + systemUserService.updateUserPasswordByUsername(user.getUsername(), passwordEncoder.encode(newPass)); + return ResponseEntity.ok(null); } - systemEmailService.checkEmailCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, args.getEmail(), code); - systemUserService.modifyUserEmailByUsername(user.getUsername(), args.getEmail()); - return ResponseEntity.ok(null); - } - /** - * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误 - * - * @param args / - */ - private void checkLevel(SystemUserVo args) { - Integer currentLevel = Collections.min( - systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream() - .map(SystemRoleTb::getLevel).collect(Collectors.toList())); - Integer optLevel = systemRoleService.getDeptLevelByRoles(args.getRoles()); - if (currentLevel > optLevel) { - throw new BadRequestException("角色权限不足"); + @ApiOperation("重置密码") + @PostMapping(value = "/resetUserPasswordByIds") + public ResponseEntity resetUserPasswordByIds(@RequestBody Set ids) { + String defaultPwd = passwordEncoder.encode("123456"); + systemUserService.resetUserPasswordByIds(ids, defaultPwd); + return ResponseEntity.ok(null); } - } - @ApiOperation("查询用户基础数据") - @PostMapping(value = "/queryUserMetadataOptions") - @PreAuthorize("@el.check('user:list')") - public ResponseEntity> queryUserMetadataOptions(@Validated @RequestBody KitPageArgs args) { - List collect = systemUserService.queryUserMetadataOptions(args); - return ResponseEntity.ok(collect); - } + @ApiOperation("修改头像") + @PostMapping(value = "/modifyUserAvatar") + public ResponseEntity modifyUserAvatar(@RequestParam MultipartFile avatar) { + return ResponseEntity.ok(systemUserService.updateUserAvatar(avatar)); + } + + @ApiOperation("修改邮箱") + @PostMapping(value = "/modifyUserEmailByUsername/{code}") + public ResponseEntity modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) + throws Exception { + String password = + KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), args.getPassword()); + SystemUserTb user = systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername()); + if (!passwordEncoder.matches(password, user.getPassword())) { + throw new BadRequestException("密码错误"); + } + systemEmailService.checkEmailCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, args.getEmail(), code); + systemUserService.updateUserEmailByUsername(user.getUsername(), args.getEmail()); + return ResponseEntity.ok(null); + } + + /** + * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误 + * + * @param args / + */ + private void checkLevel(SystemUserVo args) { + Integer currentLevel = Collections.min( + systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream() + .map(SystemRoleTb::getLevel).collect(Collectors.toList())); + Integer optLevel = systemRoleService.getDeptLevelByRoles(args.getRoles()); + if (currentLevel > optLevel) { + throw new BadRequestException("角色权限不足"); + } + } + + @ApiOperation("查询用户基础数据") + @PostMapping(value = "/queryUserMetadataOptions") + @PreAuthorize("@el.check('user:list')") + public ResponseEntity> queryUserMetadataOptions( + @Validated @RequestBody KitPageArgs args) { + List collect = systemUserService.queryUserMetadataOptions(args); + return ResponseEntity.ok(collect); + } } 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 0bd75d4f..fdef2076 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 @@ -22,11 +22,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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Objects; import java.util.Set; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -35,59 +35,46 @@ import lombok.Setter; @TableName("system_dept") public class SystemDeptTb extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) - @TableId(value = "dept_id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @TableField(exist = false) - @JSONField(serialize = false) - @ApiModelProperty(value = "角色") - private Set roles; - @TableField(exist = false) - @ApiModelProperty(value = "子部门") - private List children; - @ApiModelProperty(value = "排序") - private Integer deptSort; - @NotBlank - @ApiModelProperty(value = "部门名称") - private String name; - @NotNull - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "上级部门") - private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) - private Integer subCount = 0; + @NotNull(groups = Update.class) @TableId(value = "dept_id", type = IdType.AUTO) + @ApiModelProperty(value = "ID", hidden = true) private Long id; + @TableField(exist = false) @JSONField(serialize = false) @ApiModelProperty(value = "角色") private Set + roles; + @TableField(exist = false) @ApiModelProperty(value = "子部门") private List children; + @ApiModelProperty(value = "排序") private Integer deptSort; + @NotBlank @ApiModelProperty(value = "部门名称") private String name; + @NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "上级部门") private Long pid; + @ApiModelProperty(value = "子节点数目", hidden = true) private Integer subCount = 0; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SystemDeptTb dept = (SystemDeptTb)o; + return Objects.equals(id, dept.id) && Objects.equals(name, dept.name); } - if (o == null || getClass() != o.getClass()) { - return false; + + @Override + public int hashCode() { + return Objects.hash(id, name); } - SystemDeptTb dept = (SystemDeptTb) o; - return Objects.equals(id, dept.id) && Objects.equals(name, dept.name); - } - @Override - public int hashCode() { - return Objects.hash(id, name); - } + @ApiModelProperty(value = "是否有子节点") + public Boolean getHasChildren() { + return subCount > 0; + } - @ApiModelProperty(value = "是否有子节点") - public Boolean getHasChildren() { - return subCount > 0; - } + @ApiModelProperty(value = "是否为叶子") + public Boolean getLeaf() { + return subCount <= 0; + } - @ApiModelProperty(value = "是否为叶子") - public Boolean getLeaf() { - return subCount <= 0; - } - - @ApiModelProperty(value = "标签名称") - public String getLabel() { - return name; - } + @ApiModelProperty(value = "标签名称") + public String getLabel() { + return name; + } } \ No newline at end of file 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 082dae03..431ae226 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 @@ -30,17 +30,10 @@ import lombok.Setter; @TableName("system_dict_detail") public class SystemDictDetailTb extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) - @ApiModelProperty(value = "ID", hidden = true) - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @TableField(value = "dict_id") - @ApiModelProperty(hidden = true) - private Long dictId; - @ApiModelProperty(value = "字典标签") - private String label; - @ApiModelProperty(value = "字典值") - private String value; - @ApiModelProperty(value = "排序") - private Integer dictSort = 999; + @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) + @TableId(value = "id", type = IdType.AUTO) private Long id; + @TableField(value = "dict_id") @ApiModelProperty(hidden = true) private Long dictId; + @ApiModelProperty(value = "字典标签") private String label; + @ApiModelProperty(value = "字典值") private String value; + @ApiModelProperty(value = "排序") private Integer dictSort = 999; } \ No newline at end of file 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 d25eee83..35ed95d2 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 @@ -32,14 +32,8 @@ import lombok.Setter; @TableName("system_dict") public class SystemDictTb extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) - @ApiModelProperty(value = "ID", hidden = true) - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @NotBlank - @ApiModelProperty(value = "名称") - private String name; - @ApiModelProperty(value = "描述") - @TableField(updateStrategy = FieldStrategy.ALWAYS) - private String description; + @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) + @TableId(value = "id", type = IdType.AUTO) private Long id; + @NotBlank @ApiModelProperty(value = "名称") private String name; + @ApiModelProperty(value = "描述") @TableField(updateStrategy = FieldStrategy.ALWAYS) private String description; } \ No newline at end of file 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 a687fd4f..f59eb66a 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 @@ -31,21 +31,10 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemEmailConfigTb extends KitObject { - @TableId("config_id") - private Long id; - @NotBlank - @ApiModelProperty(value = "邮件服务器SMTP地址") - private String host; - @NotBlank - @ApiModelProperty(value = "邮件服务器 SMTP 端口") - private String port; - @NotBlank - @ApiModelProperty(value = "发件者用户名") - private String user; - @NotBlank - @ApiModelProperty(value = "密码") - private String password; - @NotBlank - @ApiModelProperty(value = "收件人") - private String fromUser; + @TableId("config_id") private Long id; + @NotBlank @ApiModelProperty(value = "邮件服务器SMTP地址") private String host; + @NotBlank @ApiModelProperty(value = "邮件服务器 SMTP 端口") private String port; + @NotBlank @ApiModelProperty(value = "发件者用户名") private String user; + @NotBlank @ApiModelProperty(value = "密码") private String password; + @NotBlank @ApiModelProperty(value = "收件人") private String fromUser; } 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 70f57a9b..a87bf567 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,9 +20,9 @@ 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 java.util.Objects; import lombok.Getter; import lombok.Setter; @@ -31,34 +31,26 @@ import lombok.Setter; @TableName("system_job") public class SystemJobTb extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @NotBlank - @ApiModelProperty(value = "岗位名称") - private String name; - @NotNull - @ApiModelProperty(value = "岗位排序") - private Long jobSort; - @NotNull - @ApiModelProperty(value = "是否启用") - private Boolean enabled; + @NotNull(groups = Update.class) @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "ID", hidden = true) private Long id; + @NotBlank @ApiModelProperty(value = "岗位名称") private String name; + @NotNull @ApiModelProperty(value = "岗位排序") private Long jobSort; + @NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SystemJobTb job = (SystemJobTb)o; + return Objects.equals(id, job.id); } - if (o == null || getClass() != o.getClass()) { - return false; - } - SystemJobTb job = (SystemJobTb) o; - return Objects.equals(id, job.id); - } - @Override - public int hashCode() { - return Objects.hash(id); - } + @Override + public int hashCode() { + return Objects.hash(id); + } } \ No newline at end of file diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java index ee0d7011..8be5f32e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java @@ -30,25 +30,16 @@ import lombok.Setter; @TableName("system_local_storage") public class SystemLocalStorageTb extends KitBaseUserTimeTb { - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @ApiModelProperty(value = "真实文件名") - private String realName; - @ApiModelProperty(value = "文件名") - private String name; - @ApiModelProperty(value = "后缀") - private String suffix; - @ApiModelProperty(value = "路径") - private String path; - @ApiModelProperty(value = "类型") - private String type; - @ApiModelProperty(value = "大小") - private String size; - @ApiModelProperty(value = "日期分组") - private String dateGroup; + @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) private Long id; + @ApiModelProperty(value = "真实文件名") private String realName; + @ApiModelProperty(value = "文件名") private String name; + @ApiModelProperty(value = "后缀") private String suffix; + @ApiModelProperty(value = "路径") private String path; + @ApiModelProperty(value = "类型") private String type; + @ApiModelProperty(value = "大小") private String size; + @ApiModelProperty(value = "日期分组") private String dateGroup; - public void copy(SystemLocalStorageTb source) { - BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); - } + public void copy(SystemLocalStorageTb source) { + BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); + } } \ No newline at end of file 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 1a4751fa..592acfaa 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 @@ -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.NotNull; import java.util.List; import java.util.Objects; import java.util.Set; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -34,73 +34,54 @@ import lombok.Setter; @TableName("system_menu") public class SystemMenuTb extends KitBaseUserTimeTb { - @NotNull(groups = {Update.class}) - @TableId(value = "menu_id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @TableField(exist = false) - @JSONField(serialize = false) - @ApiModelProperty(value = "菜单角色") - private Set roles; - @TableField(exist = false) - private List children; - @ApiModelProperty(value = "菜单标题") - private String title; - @TableField(value = "name") - @ApiModelProperty(value = "菜单组件名称") - private String componentName; - @ApiModelProperty(value = "排序") - private Integer menuSort = 999; - @ApiModelProperty(value = "组件路径") - private String component; - @ApiModelProperty(value = "路由地址") - private String path; - @ApiModelProperty(value = "菜单类型，目录、菜单、按钮") - private Integer type; - @ApiModelProperty(value = "权限标识") - private String permission; - @ApiModelProperty(value = "菜单图标") - private String icon; - @ApiModelProperty(value = "缓存") - private Boolean cache; - @ApiModelProperty(value = "是否隐藏") - private Boolean hidden; - @ApiModelProperty(value = "上级菜单") - private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) - private Integer subCount = 0; - @ApiModelProperty(value = "外链菜单") - private Boolean iFrame; + @NotNull(groups = {Update.class}) @TableId(value = "menu_id", type = IdType.AUTO) + @ApiModelProperty(value = "ID", hidden = true) private Long id; + @TableField(exist = false) @JSONField(serialize = false) @ApiModelProperty(value = "菜单角色") + private Set roles; + @TableField(exist = false) private List children; + @ApiModelProperty(value = "菜单标题") private String title; + @TableField(value = "name") @ApiModelProperty(value = "菜单组件名称") private String componentName; + @ApiModelProperty(value = "排序") private Integer menuSort = 999; + @ApiModelProperty(value = "组件路径") private String component; + @ApiModelProperty(value = "路由地址") private String path; + @ApiModelProperty(value = "菜单类型，目录、菜单、按钮") private Integer type; + @ApiModelProperty(value = "权限标识") private String permission; + @ApiModelProperty(value = "菜单图标") private String icon; + @ApiModelProperty(value = "缓存") private Boolean cache; + @ApiModelProperty(value = "是否隐藏") private Boolean hidden; + @ApiModelProperty(value = "上级菜单") private Long pid; + @ApiModelProperty(value = "子节点数目", hidden = true) private Integer subCount = 0; + @ApiModelProperty(value = "外链菜单") private Boolean iFrame; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SystemMenuTb menu = (SystemMenuTb)o; + return Objects.equals(id, menu.id); } - if (o == null || getClass() != o.getClass()) { - return false; + + @Override + public int hashCode() { + return Objects.hash(id); } - SystemMenuTb menu = (SystemMenuTb) o; - return Objects.equals(id, menu.id); - } - @Override - public int hashCode() { - return Objects.hash(id); - } + @ApiModelProperty(value = "是否有子节点") + public Boolean getHasChildren() { + return subCount > 0; + } - @ApiModelProperty(value = "是否有子节点") - public Boolean getHasChildren() { - return subCount > 0; - } + @ApiModelProperty(value = "是否为叶子") + public Boolean getLeaf() { + return subCount <= 0; + } - @ApiModelProperty(value = "是否为叶子") - public Boolean getLeaf() { - return subCount <= 0; - } - - @ApiModelProperty(value = "标签名称") - public String getLabel() { - return title; - } + @ApiModelProperty(value = "标签名称") + public String getLabel() { + return title; + } } 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 e32d899d..7a4ab703 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 @@ -43,60 +43,48 @@ import lombok.ToString; @ApiModel(value = "SystemOperationLog对象", description = "审计日志") public class SystemOperationLogTb extends KitObject { - /** - * id - */ - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 业务名称 - */ - @TableField("biz_name") - private String bizName; - /** - * 业务方法 - */ - @TableField("method") - private String method; - /** - * 业务参数 - */ - @TableField("params") - private String params; - /** - * 访问来源IP - */ - @TableField("request_ip") - private String requestIp; - /** - * 执行时间 - */ - @TableField("execute_time") - private Long executeTime; - /** - * 用户名 - */ - @TableField("username") - private String username; - /** - * 访问来源地址 - */ - @TableField("address") - private String address; - /** - * 浏览器信息 - */ - @TableField("browser_info") - private String browserInfo; - /** - * 异常详情 - */ - @TableField("exception_detail") - private String exceptionDetail; - /** - * 创建时间 - */ - @TableField(value = "create_time", fill = FieldFill.INSERT) - private Date createTime; + /** + * id + */ + @ApiModelProperty("id") @TableId(value = "id", type = IdType.AUTO) private Long id; + /** + * 业务名称 + */ + @TableField("biz_name") private String bizName; + /** + * 业务方法 + */ + @TableField("method") private String method; + /** + * 业务参数 + */ + @TableField("params") private String params; + /** + * 访问来源IP + */ + @TableField("request_ip") private String requestIp; + /** + * 执行时间 + */ + @TableField("execute_time") private Long executeTime; + /** + * 用户名 + */ + @TableField("username") private String username; + /** + * 访问来源地址 + */ + @TableField("address") private String address; + /** + * 浏览器信息 + */ + @TableField("browser_info") private String browserInfo; + /** + * 异常详情 + */ + @TableField("exception_detail") private String exceptionDetail; + /** + * 创建时间 + */ + @TableField(value = "create_time", fill = FieldFill.INSERT) private Date createTime; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOssStorageTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOssStorageTb.java index 999af688..627c4304 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOssStorageTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOssStorageTb.java @@ -39,43 +39,17 @@ import lombok.Setter; @ApiModel(value = "SystemOssStorage对象", description = "OSS存储") public class SystemOssStorageTb extends KitBaseUserTimeTb { - @ApiModelProperty("ID") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - @TableField("service_type") - @ApiModelProperty("类型，比如minio") - private String serviceType; - @TableField("endpoint") - @ApiModelProperty("服务地址") - private String endpoint; - @TableField("bucket_name") - @ApiModelProperty("存储桶名称") - private String bucketName; - @TableField("file_name") - @ApiModelProperty("完整文件名称") - private String fileName; - @TableField("file_size") - @ApiModelProperty("文件大小, 单位：字节") - private Long fileSize; - @TableField("file_mime") - @ApiModelProperty("文件类型") - private String fileMime; - @ApiModelProperty("短文件名") - @TableField("file_prefix") - private String filePrefix; - @ApiModelProperty("文件后缀") - @TableField("file_suffix") - private String fileSuffix; - @TableField("file_md5") - @ApiModelProperty("文件md5") - private String fileMd5; - @TableField("file_url") - @ApiModelProperty("文件链接") - private String fileUrl; - @TableField("file_code") - @ApiModelProperty("文件编码") - private String fileCode; - @TableField("object_name") - @ApiModelProperty("对象路径") - private String objectName; + @ApiModelProperty("ID") @TableId(value = "id", type = IdType.AUTO) private Long id; + @TableField("service_type") @ApiModelProperty("类型，比如minio") private String serviceType; + @TableField("endpoint") @ApiModelProperty("服务地址") private String endpoint; + @TableField("bucket_name") @ApiModelProperty("存储桶名称") private String bucketName; + @TableField("file_name") @ApiModelProperty("完整文件名称") private String fileName; + @TableField("file_size") @ApiModelProperty("文件大小, 单位：字节") private Long fileSize; + @TableField("file_mime") @ApiModelProperty("文件类型") private String fileMime; + @ApiModelProperty("短文件名") @TableField("file_prefix") private String filePrefix; + @ApiModelProperty("文件后缀") @TableField("file_suffix") private String fileSuffix; + @TableField("file_md5") @ApiModelProperty("文件md5") private String fileMd5; + @TableField("file_url") @ApiModelProperty("文件链接") private String fileUrl; + @TableField("file_code") @ApiModelProperty("文件编码") private String fileCode; + @TableField("object_name") @ApiModelProperty("对象路径") private String objectName; } 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 6e46522a..4fcc553d 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 @@ -32,39 +32,19 @@ import lombok.Setter; @TableName("system_quartz_job") public class SystemQuartzJobTb extends KitBaseUserTimeTb { - public static final String JOB_KEY = "JOB_KEY"; - @TableId(value = "id", type = IdType.AUTO) - @NotNull(groups = {Update.class}) - private Long id; - @TableField(exist = false) - @ApiModelProperty(value = "用于子任务唯一标识", hidden = true) - private String uuid; - @ApiModelProperty(value = "定时器名称") - private String jobName; - @NotBlank - @ApiModelProperty(value = "Bean名称") - private String beanName; - @NotBlank - @ApiModelProperty(value = "方法名称") - private String methodName; - @ApiModelProperty(value = "参数") - private String params; - @NotBlank - @ApiModelProperty(value = "cron表达式") - private String cronExpression; - @ApiModelProperty(value = "状态：暂停或启动") - private Boolean isPause = false; - @ApiModelProperty(value = "负责人") - private String personInCharge; - @ApiModelProperty(value = "报警邮箱") - private String email; - @ApiModelProperty(value = "子任务") - private String subTask; - @ApiModelProperty(value = "失败后暂停") - private Boolean pauseAfterFailure; - @NotBlank - @ApiModelProperty(value = "备注") - @TableField(updateStrategy = FieldStrategy.ALWAYS) - private String - description; + public static final String JOB_KEY = "JOB_KEY"; + @TableId(value = "id", type = IdType.AUTO) @NotNull(groups = {Update.class}) private Long id; + @TableField(exist = false) @ApiModelProperty(value = "用于子任务唯一标识", hidden = true) private String uuid; + @ApiModelProperty(value = "定时器名称") private String jobName; + @NotBlank @ApiModelProperty(value = "Bean名称") private String beanName; + @NotBlank @ApiModelProperty(value = "方法名称") private String methodName; + @ApiModelProperty(value = "参数") private String params; + @NotBlank @ApiModelProperty(value = "cron表达式") private String cronExpression; + @ApiModelProperty(value = "状态：暂停或启动") private Boolean isPause = false; + @ApiModelProperty(value = "负责人") private String personInCharge; + @ApiModelProperty(value = "报警邮箱") private String email; + @ApiModelProperty(value = "子任务") private String subTask; + @ApiModelProperty(value = "失败后暂停") private Boolean pauseAfterFailure; + @NotBlank @ApiModelProperty(value = "备注") @TableField(updateStrategy = FieldStrategy.ALWAYS) private String + description; } \ No newline at end of file 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 514c28e4..9a732199 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 @@ -31,26 +31,14 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemQuartzLogTb extends KitObject { - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @ApiModelProperty(value = "任务名称", hidden = true) - private String jobName; - @ApiModelProperty(value = "bean名称", hidden = true) - private String beanName; - @ApiModelProperty(value = "方法名称", hidden = true) - private String methodName; - @ApiModelProperty(value = "参数", hidden = true) - private String params; - @ApiModelProperty(value = "cron表达式", hidden = true) - private String cronExpression; - @ApiModelProperty(value = "状态", hidden = true) - private Boolean isSuccess; - @ApiModelProperty(value = "异常详情", hidden = true) - private String exceptionDetail; - @ApiModelProperty(value = "执行耗时", hidden = true) - private Long time; - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间", hidden = true) - private Date createTime; + @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) private Long id; + @ApiModelProperty(value = "任务名称", hidden = true) private String jobName; + @ApiModelProperty(value = "bean名称", hidden = true) private String beanName; + @ApiModelProperty(value = "方法名称", hidden = true) private String methodName; + @ApiModelProperty(value = "参数", hidden = true) private String params; + @ApiModelProperty(value = "cron表达式", hidden = true) private String cronExpression; + @ApiModelProperty(value = "状态", hidden = true) private Boolean isSuccess; + @ApiModelProperty(value = "异常详情", hidden = true) private String exceptionDetail; + @ApiModelProperty(value = "执行耗时", hidden = true) private Long time; + @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleDeptTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleDeptTb.java index 92b7be14..a8e550fb 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleDeptTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleDeptTb.java @@ -26,8 +26,6 @@ import lombok.Setter; @TableName("system_roles_depts") public class SystemRoleDeptTb extends KitObject { - @TableField(value = "role_id") - private Long roleId; - @TableField(value = "dept_id") - private Long deptId; + @TableField(value = "role_id") private Long roleId; + @TableField(value = "dept_id") private Long deptId; } \ No newline at end of file diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleMenuTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleMenuTb.java index ebfeb4b5..8fb484c6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleMenuTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleMenuTb.java @@ -13,8 +13,6 @@ import lombok.Setter; @TableName("system_roles_menus") public class SystemRoleMenuTb { - @TableField(value = "role_id") - private Long roleId; - @TableField(value = "menu_id") - private Long menuId; + @TableField(value = "role_id") private Long roleId; + @TableField(value = "menu_id") private Long menuId; } 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 bb213601..d1363d0c 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,9 +23,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.Objects; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import java.util.Objects; import lombok.Getter; import lombok.Setter; @@ -37,36 +37,28 @@ import lombok.Setter; @TableName("system_role") public class SystemRoleTb extends KitBaseUserTimeTb { - @NotNull(groups = {Update.class}) - @TableId(value = "role_id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @NotBlank - @ApiModelProperty(value = "名称", hidden = true) - private String name; - @ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义") - private String dataScope = - SystemDataScopeEnum.THIS_LEVEL.getValue(); - @ApiModelProperty(value = "级别，数值越小，级别越大") - private Integer level = 3; - @ApiModelProperty(value = "描述") - @TableField(updateStrategy = FieldStrategy.ALWAYS) - private String description; + @NotNull(groups = {Update.class}) @TableId(value = "role_id", type = IdType.AUTO) + @ApiModelProperty(value = "ID", hidden = true) private Long id; + @NotBlank @ApiModelProperty(value = "名称", hidden = true) private String name; + @ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义") private String dataScope = + SystemDataScopeEnum.THIS_LEVEL.getValue(); + @ApiModelProperty(value = "级别，数值越小，级别越大") private Integer level = 3; + @ApiModelProperty(value = "描述") @TableField(updateStrategy = FieldStrategy.ALWAYS) private String description; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SystemRoleTb role = (SystemRoleTb)o; + return Objects.equals(id, role.id); } - if (o == null || getClass() != o.getClass()) { - return false; - } - SystemRoleTb role = (SystemRoleTb) o; - return Objects.equals(id, role.id); - } - @Override - public int hashCode() { - return Objects.hash(id); - } + @Override + public int hashCode() { + return Objects.hash(id); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserJobTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserJobTb.java index 7c2c964f..1298437e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserJobTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserJobTb.java @@ -13,8 +13,6 @@ import lombok.Setter; @TableName("system_users_jobs") public class SystemUserJobTb { - @TableField(value = "user_id") - private Long userId; - @TableField(value = "job_id") - private Long jobId; + @TableField(value = "user_id") private Long userId; + @TableField(value = "job_id") private Long jobId; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserRoleTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserRoleTb.java index 6d7a137b..2d0e82fb 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserRoleTb.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserRoleTb.java @@ -26,8 +26,6 @@ import lombok.Setter; @TableName("system_users_roles") public class SystemUserRoleTb extends KitObject { - @TableField(value = "user_id") - private Long userId; - @TableField(value = "role_id") - private Long roleId; + @TableField(value = "user_id") private Long userId; + @TableField(value = "role_id") private Long roleId; } \ No newline at end of file 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 c96de1be..50865e8f 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,11 +21,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.Date; -import java.util.Objects; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import java.util.Date; +import java.util.Objects; import lombok.Getter; import lombok.Setter; @@ -34,59 +34,36 @@ import lombok.Setter; @TableName("system_user") public class SystemUserTb extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) - @TableId(value = "user_id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @TableField(value = "dept_id") - @ApiModelProperty(hidden = true) - private Long deptId; - @ApiModelProperty(value = "用户部门") - @TableField(exist = false) - private SystemDeptTb dept; - @NotBlank - @ApiModelProperty(value = "用户名称") - private String username; - @NotBlank - @ApiModelProperty(value = "用户昵称") - private String nickName; - @Email - @NotBlank - @ApiModelProperty(value = "邮箱") - private String email; - @NotBlank - @ApiModelProperty(value = "电话号码") - private String phone; - @ApiModelProperty(value = "用户性别") - private String gender; - @ApiModelProperty(value = "头像真实名称", hidden = true) - private String avatarName; - @ApiModelProperty(value = "头像存储的路径", hidden = true) - private String avatarPath; - @ApiModelProperty(value = "密码") - private String password; - @NotNull - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "是否为admin账号", hidden = true) - private Boolean isAdmin = false; - @ApiModelProperty(value = "最后修改密码的时间", hidden = true) - private Date pwdResetTime; + @NotNull(groups = Update.class) @TableId(value = "user_id", type = IdType.AUTO) + @ApiModelProperty(value = "ID", hidden = true) private Long id; + @TableField(value = "dept_id") @ApiModelProperty(hidden = true) private Long deptId; + @ApiModelProperty(value = "用户部门") @TableField(exist = false) private SystemDeptTb dept; + @NotBlank @ApiModelProperty(value = "用户名称") private String username; + @NotBlank @ApiModelProperty(value = "用户昵称") private String nickName; + @Email @NotBlank @ApiModelProperty(value = "邮箱") private String email; + @NotBlank @ApiModelProperty(value = "电话号码") private String phone; + @ApiModelProperty(value = "用户性别") private String gender; + @ApiModelProperty(value = "头像真实名称", hidden = true) private String avatarName; + @ApiModelProperty(value = "头像存储的路径", hidden = true) private String avatarPath; + @ApiModelProperty(value = "密码") private String password; + @NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "是否为admin账号", hidden = true) private Boolean isAdmin = false; + @ApiModelProperty(value = "最后修改密码的时间", hidden = true) private Date pwdResetTime; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SystemUserTb user = (SystemUserTb)o; + return Objects.equals(id, user.id) && Objects.equals(username, user.username); } - if (o == null || getClass() != o.getClass()) { - return false; - } - SystemUserTb user = (SystemUserTb) o; - return Objects.equals(id, user.id) && Objects.equals(username, user.username); - } - @Override - public int hashCode() { - return Objects.hash(id, username); - } + @Override + public int hashCode() { + return Objects.hash(id, username); + } } \ No newline at end of file diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java index a5304b3c..965c1a37 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java @@ -24,10 +24,7 @@ import lombok.Setter; @Setter public class SystemCheckEmailCaptchaArgs extends KitObject { - @NotBlank(message = "邮箱不能为空") - private String email; - @NotBlank(message = "验证码不能为空") - private String code; - @NotBlank(message = "验证码业务标识不能为空") - private String bizCode; + @NotBlank(message = "邮箱不能为空") private String email; + @NotBlank(message = "验证码不能为空") private String code; + @NotBlank(message = "验证码业务标识不能为空") private String bizCode; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java index c9f7b1ce..b45ed0cb 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java @@ -25,12 +25,10 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemCreateDeptArgs extends KitObject { - @NotBlank(message = "部门名称必填") - private String name; - @NotNull(message = "部门排序必填") - private Integer deptSort; - private Boolean enabled; - private String isTop; - private Long pid; - private Integer subCount = 0; + @NotBlank(message = "部门名称必填") private String name; + @NotNull(message = "部门排序必填") private Integer deptSort; + private Boolean enabled; + private String isTop; + private Long pid; + private Integer subCount = 0; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java index 5f0b51c1..24ea9c89 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java @@ -24,7 +24,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemCreateDictArgs extends KitObject { - @NotBlank(message = "字典名称必填") - private String name; - private String description; + @NotBlank(message = "字典名称必填") private String name; + private String description; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java index 42489afa..6cddac51 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java @@ -26,12 +26,8 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemCreateDictDetailArgs extends KitObject { - @NotNull(message = "参数dict必填") - private SystemDictTb dict; - @NotBlank(message = "字典标签必填") - private String label; - @NotBlank(message = "字典值必填") - private String value; - @NotNull(message = "字典排序必填") - private Integer dictSort; + @NotNull(message = "参数dict必填") private SystemDictTb dict; + @NotBlank(message = "字典标签必填") private String label; + @NotBlank(message = "字典值必填") private String value; + @NotNull(message = "字典排序必填") private Integer dictSort; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java index 91f1a908..4c3fa5f3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java @@ -25,9 +25,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemCreateJobArgs extends KitObject { - @NotBlank(message = "职位名称必填") - private String name; - @NotNull(message = "职位排序必填") - private Integer jobSort; - private Boolean enabled; + @NotBlank(message = "职位名称必填") private String name; + @NotNull(message = "职位排序必填") private Integer jobSort; + private Boolean enabled; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java index d32fa14d..f9c17287 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java @@ -17,9 +17,9 @@ package cn.odboy.system.dal.model; 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 java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,16 +27,13 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemCreateRoleArgs extends KitObject { - @NotBlank(message = "角色名称必填") - private String name; - @NotNull(message = "角色级别必填") - private Integer level; - @NotBlank(message = "数据范围必填") - private String dataScope; - private String description; - /** - * 关联的部门 - */ - private Long id; - private Set depts; + @NotBlank(message = "角色名称必填") private String name; + @NotNull(message = "角色级别必填") private Integer level; + @NotBlank(message = "数据范围必填") private String dataScope; + private String description; + /** + * 关联的部门 + */ + private Long id; + private Set depts; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java index 4a64efa3..eb00032e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java @@ -25,6 +25,5 @@ import lombok.Setter; @Setter public class SystemDictDetailVo extends SystemDictDetailTb { - @ApiModelProperty(value = "字典") - private SystemDictTb dict; + @ApiModelProperty(value = "字典") private SystemDictTb dict; } \ No newline at end of file diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java index a0ae90a6..36abd2ab 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java @@ -26,10 +26,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemMenuMetaVo extends KitObject { - @ApiModelProperty(value = "菜单标题") - private String title; - @ApiModelProperty(value = "菜单图标") - private String icon; - @ApiModelProperty(value = "缓存") - private Boolean noCache; + @ApiModelProperty(value = "菜单标题") private String title; + @ApiModelProperty(value = "菜单图标") private String icon; + @ApiModelProperty(value = "缓存") private Boolean noCache; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java index 75c33b9e..995ad170 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java @@ -28,20 +28,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemMenuVo extends KitObject { - @ApiModelProperty(value = "菜单名称") - private String name; - @ApiModelProperty(value = "路径") - private String path; - @ApiModelProperty(value = "隐藏状态") - private Boolean hidden; - @ApiModelProperty(value = "重定向") - private String redirect; - @ApiModelProperty(value = "组件") - private String component; - @ApiModelProperty(value = "总是显示") - private Boolean alwaysShow; - @ApiModelProperty(value = "元数据") - private SystemMenuMetaVo meta; - @ApiModelProperty(value = "子路由") - private List children; + @ApiModelProperty(value = "菜单名称") private String name; + @ApiModelProperty(value = "路径") private String path; + @ApiModelProperty(value = "隐藏状态") private Boolean hidden; + @ApiModelProperty(value = "重定向") private String redirect; + @ApiModelProperty(value = "组件") private String component; + @ApiModelProperty(value = "总是显示") private Boolean alwaysShow; + @ApiModelProperty(value = "元数据") private SystemMenuMetaVo meta; + @ApiModelProperty(value = "子路由") private List children; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java index c9b02b36..a19f00e6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java @@ -23,5 +23,5 @@ import lombok.Setter; @Setter public class SystemOssStorageVo extends SystemOssStorageTb { - private String fileSizeDesc; + private String fileSizeDesc; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java index b6914b56..136818ac 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java @@ -24,7 +24,7 @@ import lombok.Setter; @Setter public class SystemProductLineTreeVo extends KitObject { - private String value; - private String label; - private List children; + private String value; + private String label; + private List children; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java index dcc3713b..61e96a97 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java @@ -23,16 +23,16 @@ import lombok.Setter; @Setter public class SystemProductLineVo extends KitObject { - /** - * 部门ID（select的value） - */ - private Long value; - /** - * 产品线，如"研发部/华南分部/devops组" - */ - private String label; - /** - * ID路径，如"1-2-3" - */ - private String idPath; + /** + * 部门ID（select的value） + */ + private Long value; + /** + * 产品线，如"研发部/华南分部/devops组" + */ + private String label; + /** + * ID路径，如"1-2-3" + */ + private String idPath; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java index ebf9b33a..b4c5b760 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java @@ -23,16 +23,10 @@ import lombok.Data; @Data public class SystemQueryDeptArgs { - @ApiModelProperty(value = "部门id集合") - private List ids; - @ApiModelProperty(value = "部门名称") - private String name; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "上级部门") - private Long pid; - @ApiModelProperty(value = "PID为空查询") - private Boolean pidIsNull; - @ApiModelProperty(value = "创建时间") - private List createTime; + @ApiModelProperty(value = "部门id集合") private List ids; + @ApiModelProperty(value = "部门名称") private String name; + @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "上级部门") private Long pid; + @ApiModelProperty(value = "PID为空查询") private Boolean pidIsNull; + @ApiModelProperty(value = "创建时间") private List createTime; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java index 7dcedb88..c77b079e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java @@ -21,10 +21,7 @@ import lombok.Data; @Data public class SystemQueryDictArgs { - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java index 8514fe81..a4c54cc3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java @@ -24,8 +24,6 @@ import lombok.Setter; @Setter public class SystemQueryDictDetailArgs extends KitObject { - @ApiModelProperty(value = "标签") - private String label; - @ApiModelProperty(value = "字典名称") - private String dictName; + @ApiModelProperty(value = "标签") private String label; + @ApiModelProperty(value = "字典名称") private String dictName; } \ No newline at end of file diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java index 9a5c0f31..ef5df005 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java @@ -25,14 +25,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class SystemQueryJobArgs { - @ApiModelProperty(value = "岗位名称") - private String name; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; + @ApiModelProperty(value = "岗位名称") private String name; + @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "创建时间") private List createTime; + @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java index 3794be08..0c267430 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java @@ -23,12 +23,8 @@ import lombok.Data; @Data public class SystemQueryMenuArgs { - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "PID为空查询") - private Boolean pidIsNull; - @ApiModelProperty(value = "PID") - private Long pid; + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "创建时间") private List createTime; + @ApiModelProperty(value = "PID为空查询") private Boolean pidIsNull; + @ApiModelProperty(value = "PID") private Long pid; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java index 86a6d78b..02383157 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java @@ -23,14 +23,9 @@ import lombok.Data; @Data public class SystemQueryQuartzJobArgs { - @ApiModelProperty(value = "定时任务名称") - private String jobName; - @ApiModelProperty(value = "是否成功") - private Boolean isSuccess; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; + @ApiModelProperty(value = "定时任务名称") private String jobName; + @ApiModelProperty(value = "是否成功") private Boolean isSuccess; + @ApiModelProperty(value = "创建时间") private List createTime; + @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java index 49841012..4e253520 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java @@ -23,14 +23,9 @@ import lombok.Data; @Data public class SystemQueryRoleArgs { - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; - @ApiModelProperty(value = "偏移量", hidden = true) - private long offset; + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "创建时间") private List createTime; + @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; + @ApiModelProperty(value = "偏移量", hidden = true) private long offset; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java index 4dad3f32..327208e5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java @@ -23,12 +23,8 @@ import lombok.Data; @Data public class SystemQueryStorageArgs { - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "创建时间") private List createTime; + @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java index cce81cc7..d5689f08 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java @@ -28,20 +28,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemQueryUserArgs extends KitObject { - @ApiModelProperty(value = "ID") - private Long id; - @ApiModelProperty(value = "多个ID") - private Set deptIds = new HashSet<>(); - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "部门ID") - private Long deptId; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; + @ApiModelProperty(value = "ID") private Long id; + @ApiModelProperty(value = "多个ID") private Set deptIds = new HashSet<>(); + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "部门ID") private Long deptId; + @ApiModelProperty(value = "创建时间") private List createTime; + @ApiModelProperty(value = "页码", example = "1") private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java index ebb0d609..913d4347 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java @@ -29,6 +29,5 @@ import org.springframework.security.core.GrantedAuthority; @AllArgsConstructor public class SystemRoleCodeVo implements GrantedAuthority { - @ApiModelProperty(value = "角色名") - private String authority; + @ApiModelProperty(value = "角色名") private String authority; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java index 90e2d2ca..79a571cb 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java @@ -13,10 +13,7 @@ import lombok.Setter; @Setter public class SystemRoleVo extends SystemRoleTb { - @ApiModelProperty(value = "用户", hidden = true) - private Set users; - @ApiModelProperty(value = "菜单", hidden = true) - private Set menus; - @ApiModelProperty(value = "部门", hidden = true) - private Set depts; + @ApiModelProperty(value = "用户", hidden = true) private Set users; + @ApiModelProperty(value = "菜单", hidden = true) private Set menus; + @ApiModelProperty(value = "部门", hidden = true) private Set depts; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java index 57af4839..76b1e30f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java @@ -16,9 +16,9 @@ package cn.odboy.system.dal.model; import io.swagger.annotations.ApiModelProperty; -import java.util.List; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -31,13 +31,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class SystemSendEmailArgs { - @NotEmpty - @ApiModelProperty(value = "收件人") - private List tos; - @NotBlank - @ApiModelProperty(value = "主题") - private String subject; - @NotBlank - @ApiModelProperty(value = "内容") - private String content; + @NotEmpty @ApiModelProperty(value = "收件人") private List tos; + @NotBlank @ApiModelProperty(value = "主题") private String subject; + @NotBlank @ApiModelProperty(value = "内容") private String content; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java index 0fa39e00..efd3b1ae 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java @@ -29,29 +29,17 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemSimpleUserVo extends KitObject { - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @ApiModelProperty(value = "用户角色") - private Set roles; - @ApiModelProperty(value = "用户岗位") - private Set jobs; - private Long deptId; - @TableField(exist = false) - private SystemDeptTb dept; - @ApiModelProperty(value = "用户名称") - private String username; - @ApiModelProperty(value = "用户昵称") - private String nickName; - @ApiModelProperty(value = "邮箱") - private String email; - @ApiModelProperty(value = "电话号码") - private String phone; - @ApiModelProperty(value = "用户性别") - private String gender; - @ApiModelProperty(value = "头像真实名称", hidden = true) - private String avatarName; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "是否为admin账号", hidden = true) - private Boolean isAdmin = false; + @ApiModelProperty(value = "ID", hidden = true) private Long id; + @ApiModelProperty(value = "用户角色") private Set roles; + @ApiModelProperty(value = "用户岗位") private Set jobs; + private Long deptId; + @TableField(exist = false) private SystemDeptTb dept; + @ApiModelProperty(value = "用户名称") private String username; + @ApiModelProperty(value = "用户昵称") private String nickName; + @ApiModelProperty(value = "邮箱") private String email; + @ApiModelProperty(value = "电话号码") private String phone; + @ApiModelProperty(value = "用户性别") private String gender; + @ApiModelProperty(value = "头像真实名称", hidden = true) private String avatarName; + @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "是否为admin账号", hidden = true) private Boolean isAdmin = false; } \ No newline at end of file diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java index 93cbb2ea..bc3e306d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java @@ -25,22 +25,17 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemUpdateQuartzJobArgs extends KitObject { - @NotNull - private Long id; - private String uuid; - private String jobName; - @NotBlank - private String beanName; - @NotBlank - private String methodName; - private String params; - @NotBlank - private String cronExpression; - private Boolean isPause = false; - private String personInCharge; - private String email; - private String subTask; - private Boolean pauseAfterFailure; - @NotBlank - private String description; + @NotNull private Long id; + private String uuid; + private String jobName; + @NotBlank private String beanName; + @NotBlank private String methodName; + private String params; + @NotBlank private String cronExpression; + private Boolean isPause = false; + private String personInCharge; + private String email; + private String subTask; + private Boolean pauseAfterFailure; + @NotBlank private String description; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java index 5dabd94c..cb5b18c3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java @@ -24,8 +24,6 @@ import lombok.Data; @Data public class SystemUpdateUserPasswordArgs { - @ApiModelProperty(value = "旧密码") - private String oldPass; - @ApiModelProperty(value = "新密码") - private String newPass; + @ApiModelProperty(value = "旧密码") private String oldPass; + @ApiModelProperty(value = "新密码") private String newPass; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java index 7de0b8dc..1af309d7 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java @@ -26,11 +26,11 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class SystemUserInfoVo extends KitObject { - private SystemSimpleUserVo user; - private List dataScopes; - private List authorities; + private SystemSimpleUserVo user; + private List dataScopes; + private List authorities; - public Set getRoles() { - return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); - } + public Set getRoles() { + return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java index 2cddbaf5..4f8de448 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java @@ -29,50 +29,47 @@ import org.springframework.security.core.userdetails.UserDetails; @AllArgsConstructor public class SystemUserJwtVo implements UserDetails { - @ApiModelProperty(value = "用户") - private final SystemUserTb user; - @ApiModelProperty(value = "数据权限") - private final List dataScopes; - @ApiModelProperty(value = "角色") - private final List authorities; + @ApiModelProperty(value = "用户") private final SystemUserTb user; + @ApiModelProperty(value = "数据权限") private final List dataScopes; + @ApiModelProperty(value = "角色") private final List authorities; - public Set getRoles() { - return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); - } + public Set getRoles() { + return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); + } - @Override - @JSONField(serialize = false) - public String getPassword() { - return user.getPassword(); - } + @Override + @JSONField(serialize = false) + public String getPassword() { + return user.getPassword(); + } - @Override - @JSONField(serialize = false) - public String getUsername() { - return user.getUsername(); - } + @Override + @JSONField(serialize = false) + public String getUsername() { + return user.getUsername(); + } - @Override - @JSONField(serialize = false) - public boolean isAccountNonExpired() { - return true; - } + @Override + @JSONField(serialize = false) + public boolean isAccountNonExpired() { + return true; + } - @Override - @JSONField(serialize = false) - public boolean isAccountNonLocked() { - return true; - } + @Override + @JSONField(serialize = false) + public boolean isAccountNonLocked() { + return true; + } - @Override - @JSONField(serialize = false) - public boolean isCredentialsNonExpired() { - return true; - } + @Override + @JSONField(serialize = false) + public boolean isCredentialsNonExpired() { + return true; + } - @Override - @JSONField(serialize = false) - public boolean isEnabled() { - return user.getEnabled(); - } + @Override + @JSONField(serialize = false) + public boolean isEnabled() { + return user.getEnabled(); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java index e0ce1fb8..703970e9 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java @@ -24,14 +24,8 @@ import lombok.Setter; @Setter public class SystemUserLoginArgs { - @NotBlank - @ApiModelProperty(value = "用户名") - private String username; - @NotBlank - @ApiModelProperty(value = "密码") - private String password; - @ApiModelProperty(value = "验证码") - private String code; - @ApiModelProperty(value = "验证码的key") - private String uuid = ""; + @NotBlank @ApiModelProperty(value = "用户名") private String username; + @NotBlank @ApiModelProperty(value = "密码") private String password; + @ApiModelProperty(value = "验证码") private String code; + @ApiModelProperty(value = "验证码的key") private String uuid = ""; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java index 8944c354..d5045736 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java @@ -25,22 +25,13 @@ import lombok.Data; @Data public class SystemUserOnlineVo { - @ApiModelProperty(value = "Token编号") - private String uid; - @ApiModelProperty(value = "用户名") - private String userName; - @ApiModelProperty(value = "昵称") - private String nickName; - @ApiModelProperty(value = "岗位") - private String dept; - @ApiModelProperty(value = "浏览器") - private String browser; - @ApiModelProperty(value = "IP") - private String ip; - @ApiModelProperty(value = "地址") - private String address; - @ApiModelProperty(value = "token") - private String key; - @ApiModelProperty(value = "登录时间") - private Date loginTime; + @ApiModelProperty(value = "Token编号") private String uid; + @ApiModelProperty(value = "用户名") private String userName; + @ApiModelProperty(value = "昵称") private String nickName; + @ApiModelProperty(value = "岗位") private String dept; + @ApiModelProperty(value = "浏览器") private String browser; + @ApiModelProperty(value = "IP") private String ip; + @ApiModelProperty(value = "地址") private String address; + @ApiModelProperty(value = "token") private String key; + @ApiModelProperty(value = "登录时间") private Date loginTime; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java index b5463eea..59bba77a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java @@ -12,8 +12,6 @@ import lombok.Setter; @Setter public class SystemUserVo extends SystemUserTb { - @ApiModelProperty(value = "用户角色") - private Set roles; - @ApiModelProperty(value = "用户岗位") - private Set jobs; + @ApiModelProperty(value = "用户角色") private Set roles; + @ApiModelProperty(value = "用户岗位") private Set jobs; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDeptMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDeptMapper.java index 41a88119..7d537371 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDeptMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDeptMapper.java @@ -15,14 +15,9 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.SystemQueryDeptArgs; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; import org.apache.ibatis.annotations.Mapper; /** @@ -33,51 +28,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemDeptMapper extends BaseMapper { - default List selectDeptByPidIsNull() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.isNull(SystemDeptTb::getPid); - return selectList(wrapper); - } - - default long countDeptByPid(Long pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemDeptTb::getPid, pid); - return selectCount(wrapper); - } - - default List queryDeptByArgs(SystemQueryDeptArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (criteria != null) { - wrapper.in(CollUtil.isNotEmpty(criteria.getIds()), SystemDeptTb::getId, criteria.getIds()); - wrapper.like(StrUtil.isNotBlank(criteria.getName()), SystemDeptTb::getName, criteria.getName()); - wrapper.eq(criteria.getEnabled() != null, SystemDeptTb::getEnabled, criteria.getEnabled()); - wrapper.eq(criteria.getPid() != null, SystemDeptTb::getPid, criteria.getPid()); - wrapper.isNull(criteria.getPidIsNull() != null, SystemDeptTb::getPid); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemDeptTb::getCreateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } + default void updateDeptSubCountById(long count, Long deptId) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SystemDeptTb::getId, deptId); + wrapper.set(SystemDeptTb::getSubCount, count); + update(null, wrapper); } - wrapper.orderByAsc(SystemDeptTb::getDeptSort); - return selectList(wrapper); - } - - default List selectEnabledDepts() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemDeptTb::getEnabled, 1); - return selectList(wrapper); - } - - default List selectDeptByPid(long pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemDeptTb::getPid, pid); - return selectList(wrapper); - } - - default void updateDeptSubCountById(long count, Long deptId) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(SystemDeptTb::getId, deptId); - wrapper.set(SystemDeptTb::getSubCount, count); - update(null, wrapper); - } } 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 bf5d85a9..0396a944 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 @@ -15,13 +15,8 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.collection.CollUtil; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; /** @@ -32,15 +27,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemDictDetailMapper extends BaseMapper { - default List selectByDictId(Long dictId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemDictDetailTb::getDictId, dictId); - return selectList(wrapper); - } - - default IPage selectDictDetailByArgs(List dictIds, Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(CollUtil.isNotEmpty(dictIds), SystemDictDetailTb::getDictId, dictIds); - return selectPage(page, wrapper); - } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java index ee07545e..c5a86750 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictMapper.java @@ -15,12 +15,9 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.SystemQueryDictArgs; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import org.apache.ibatis.annotations.Mapper; @@ -32,28 +29,13 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemDictMapper extends BaseMapper { - default void injectQueryParams(SystemQueryDictArgs args, LambdaQueryWrapper wrapper) { - if (args != null) { - wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or() - .like(SystemDictTb::getDescription, args.getBlurry())); + default List listAll() { + return selectList(null); } - } - default List selectDictByArgs(SystemQueryDictArgs args) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - injectQueryParams(args, wrapper); - return selectList(wrapper); - } - - default List selectDictByArgs(SystemQueryDictArgs args, Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - injectQueryParams(args, wrapper); - return selectList(page, wrapper); - } - - default SystemDictTb getByName(String name) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemDictTb::getName, name); - return selectOne(wrapper); - } + default SystemDictTb getByName(String dictName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemDictTb::getName, dictName); + return selectOne(wrapper); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemJobMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemJobMapper.java index 9c1131af..63f88e6b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemJobMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemJobMapper.java @@ -15,15 +15,8 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemJobTb; -import cn.odboy.system.dal.model.SystemQueryJobArgs; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; /** @@ -34,33 +27,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemJobMapper extends BaseMapper { - default SystemJobTb getJobByName(String name) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemJobTb::getName, name); - return selectOne(wrapper); - } - - default void injectQueryParams(SystemQueryJobArgs criteria, LambdaQueryWrapper wrapper) { - if (criteria != null) { - wrapper.like(StrUtil.isNotBlank(criteria.getName()), SystemJobTb::getName, criteria.getName()); - wrapper.eq(criteria.getEnabled() != null, SystemJobTb::getEnabled, criteria.getEnabled()); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemJobTb::getCreateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } - } - wrapper.orderByDesc(SystemJobTb::getJobSort, SystemJobTb::getId); - } - - default IPage selectJobByArgs(SystemQueryJobArgs criteria, Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - this.injectQueryParams(criteria, wrapper); - return selectPage(page, wrapper); - } - - default List selectJobByArgs(SystemQueryJobArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - this.injectQueryParams(criteria, wrapper); - return selectList(wrapper); - } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemLocalStorageMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemLocalStorageMapper.java index bbcb5ed1..90088b7e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemLocalStorageMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemLocalStorageMapper.java @@ -15,15 +15,8 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; /** @@ -34,31 +27,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemLocalStorageMapper extends BaseMapper { - default void injectQueryParams(SystemQueryStorageArgs criteria, LambdaQueryWrapper wrapper) { - if (criteria != null) { - wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()), - c -> c.like(SystemLocalStorageTb::getName, criteria.getBlurry()).or() - .like(SystemLocalStorageTb::getSuffix, criteria.getBlurry()).or() - .like(SystemLocalStorageTb::getType, criteria.getBlurry()).or() - .like(SystemLocalStorageTb::getCreateBy, criteria.getBlurry())); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemLocalStorageTb::getUpdateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } - } - wrapper.orderByDesc(SystemLocalStorageTb::getId); - } - - default List selectLocalStorageByArgs(SystemQueryStorageArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - injectQueryParams(criteria, wrapper); - return selectList(wrapper); - } - - default IPage selectLocalStorageByArgs(SystemQueryStorageArgs criteria, - Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - injectQueryParams(criteria, wrapper); - return selectPage(page, wrapper); - } } 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 d685fd77..d044834a 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 @@ -15,14 +15,8 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemMenuTb; -import cn.odboy.system.dal.model.SystemQueryMenuArgs; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; import org.apache.ibatis.annotations.Mapper; /** @@ -33,62 +27,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemMenuMapper extends BaseMapper { - default void updateMenuSubCntByMenuId(Long count, Long menuId) { - if (count != null) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(SystemMenuTb::getId, menuId); - wrapper.set(SystemMenuTb::getSubCount, count); - update(wrapper); - } - } - - default SystemMenuTb getMenuByComponentName(String componentName) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemMenuTb::getComponentName, componentName); - return selectOne(wrapper); - } - - default SystemMenuTb getMenuByTitle(String title) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemMenuTb::getTitle, title); - return selectOne(wrapper); - } - - default Long countMenuByPid(Long pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemMenuTb::getPid, pid); - return selectCount(wrapper); - } - - default List selectMenuByArgs(SystemQueryMenuArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (criteria != null) { - wrapper.isNull(criteria.getPidIsNull() != null, SystemMenuTb::getPid); - wrapper.eq(criteria.getPid() != null, SystemMenuTb::getPid, criteria.getPid()); - wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()), - c -> c.like(SystemMenuTb::getTitle, criteria.getBlurry()).or() - .like(SystemMenuTb::getComponentName, criteria.getBlurry()).or() - .like(SystemMenuTb::getPermission, criteria.getBlurry())); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemMenuTb::getCreateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } - } - wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return selectList(wrapper); - } - - default List selectMenuByPid(Long pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemMenuTb::getPid, pid); - wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return selectList(wrapper); - } - - default List selectMenuByPidIsNull() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.isNull(SystemMenuTb::getPid); - wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return selectList(wrapper); - } } 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 b63f4118..c9bb0662 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 @@ -15,11 +15,7 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemRoleTb; -import cn.odboy.system.dal.model.SystemQueryRoleArgs; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -31,21 +27,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemRoleMapper extends BaseMapper { - default Long countRoleByArgs(SystemQueryRoleArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (criteria != null) { - wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()), - c -> c.like(SystemRoleTb::getName, criteria.getBlurry()).or() - .like(SystemRoleTb::getDescription, criteria.getBlurry())); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemRoleTb::getCreateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } - } - return selectCount(wrapper); - } - - default SystemRoleTb getRoleById(Long roleId) { - return selectById(roleId); - } } 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 4f2c7e51..00aaecd8 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 @@ -15,14 +15,9 @@ */ package cn.odboy.system.dal.mysql; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.SystemQueryUserArgs; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; @@ -34,69 +29,24 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemUserMapper extends BaseMapper { - default SystemUserTb getUserByUsername(String username) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemUserTb::getUsername, username); - wrapper.eq(SystemUserTb::getEnabled, 1); - return selectOne(wrapper); - } - - default Long countUserByJobIds(Set jobIds) { - if (CollUtil.isEmpty(jobIds)) { - return 0L; + default void updateUserPasswordByUsername(String username, String password) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SystemUserTb::getUsername, username); + wrapper.set(SystemUserTb::getPassword, password); + update(null, wrapper); } - // 需要通过用户岗位关联表查询，这里暂时返回0 - // 实际实现需要在Service层通过关联查询 - return 0L; - } - default Long countUserByRoleIds(Set roleIds) { - if (CollUtil.isEmpty(roleIds)) { - return 0L; + default void updateUserEmailByUsername(String username, String email) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SystemUserTb::getUsername, username); + wrapper.set(SystemUserTb::getEmail, email); + update(null, wrapper); } - // 需要通过用户角色关联表查询，这里暂时返回0 - // 实际实现需要在Service层通过关联查询 - return 0L; - } - default long countUserByDeptIds(Set deptIds) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemUserTb::getDeptId, deptIds); - return selectCount(wrapper); - } - - default SystemUserTb getUserByEmail(String email) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemUserTb::getEmail, email); - wrapper.eq(SystemUserTb::getEnabled, 1); - return selectOne(wrapper); - } - - default SystemUserTb getUserByPhone(String phone) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemUserTb::getPhone, phone); - wrapper.eq(SystemUserTb::getEnabled, 1); - return selectOne(wrapper); - } - - default void updateUserPasswordByUsername(String username, String password) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(SystemUserTb::getUsername, username); - wrapper.set(SystemUserTb::getPassword, password); - update(null, wrapper); - } - - default void updateUserEmailByUsername(String username, String email) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(SystemUserTb::getUsername, username); - wrapper.set(SystemUserTb::getEmail, email); - update(null, wrapper); - } - - default void updateUserPasswordByUserIds(String password, Set userIds) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.in(SystemUserTb::getId, userIds); - wrapper.set(SystemUserTb::getPassword, password); - update(null, wrapper); - } + default void updateUserPasswordByUserIds(String password, Set userIds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.in(SystemUserTb::getId, userIds); + wrapper.set(SystemUserTb::getPassword, password); + update(null, wrapper); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemCacheKey.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemCacheKey.java index 7a73436b..c4f8fc0d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemCacheKey.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemCacheKey.java @@ -20,50 +20,50 @@ package cn.odboy.system.dal.redis; */ public interface SystemCacheKey { - /** - * 用户 - */ - String USER_ID = "user::id:"; - /** - * 数据 - */ - String DATA_USER = "data::user:"; - /** - * 菜单 - */ - String MENU_ID = "menu::id:"; - String MENU_USER = "menu::user:"; - /** - * 角色授权 - */ - String ROLE_AUTH = "role::auth:"; - String ROLE_USER = "role::user:"; - /** - * 角色信息 - */ - String ROLE_ID = "role::id:"; - /** - * 部门 - */ - String DEPT_ID = "dept::id:"; - /** - * 岗位 - */ - String JOB_ID = "job::id:"; - /** - * 数据字典 - */ - String DICT_NAME = "dict::name:"; - /** - * 在线用户 - */ - String ONLINE_USER = "online::token:"; - /** - * 登录验证码 - */ - String CAPTCHA_LOGIN = "captcha::login:"; - /** - * 用户信息 - */ - String USER_INFO = "user::info:"; + /** + * 用户 + */ + String USER_ID = "user::id:"; + /** + * 数据 + */ + String DATA_USER = "data::user:"; + /** + * 菜单 + */ + String MENU_ID = "menu::id:"; + String MENU_USER = "menu::user:"; + /** + * 角色授权 + */ + String ROLE_AUTH = "role::auth:"; + String ROLE_USER = "role::user:"; + /** + * 角色信息 + */ + String ROLE_ID = "role::id:"; + /** + * 部门 + */ + String DEPT_ID = "dept::id:"; + /** + * 岗位 + */ + String JOB_ID = "job::id:"; + /** + * 数据字典 + */ + String DICT_NAME = "dict::name:"; + /** + * 在线用户 + */ + String ONLINE_USER = "online::token:"; + /** + * 登录验证码 + */ + String CAPTCHA_LOGIN = "captcha::login:"; + /** + * 用户信息 + */ + String USER_INFO = "user::info:"; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemRedisKey.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemRedisKey.java index e8eb9240..d2fd4ba0 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemRedisKey.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemRedisKey.java @@ -5,50 +5,50 @@ package cn.odboy.system.dal.redis; */ public interface SystemRedisKey { - /** - * 用户 - */ - String USER_ID = "user::id:"; - /** - * 数据 - */ - String DATA_USER = "data::user:"; - /** - * 菜单 - */ - String MENU_ID = "menu::id:"; - String MENU_USER = "menu::user:"; - /** - * 角色授权 - */ - String ROLE_AUTH = "role::auth:"; - String ROLE_USER = "role::user:"; - /** - * 角色信息 - */ - String ROLE_ID = "role::id:"; - /** - * 部门 - */ - String DEPT_ID = "dept::id:"; - /** - * 岗位 - */ - String JOB_ID = "job::id:"; - /** - * 数据字典 - */ - String DICT_NAME = "dict::name:"; - /** - * 在线用户 - */ - String ONLINE_USER = "online::token:"; - /** - * 登录验证码 - */ - String CAPTCHA_LOGIN = "captcha::login:"; - /** - * 用户信息 - */ - String USER_INFO = "user::info:"; + /** + * 用户 + */ + String USER_ID = "user::id:"; + /** + * 数据 + */ + String DATA_USER = "data::user:"; + /** + * 菜单 + */ + String MENU_ID = "menu::id:"; + String MENU_USER = "menu::user:"; + /** + * 角色授权 + */ + String ROLE_AUTH = "role::auth:"; + String ROLE_USER = "role::user:"; + /** + * 角色信息 + */ + String ROLE_ID = "role::id:"; + /** + * 部门 + */ + String DEPT_ID = "dept::id:"; + /** + * 岗位 + */ + String JOB_ID = "job::id:"; + /** + * 数据字典 + */ + String DICT_NAME = "dict::name:"; + /** + * 在线用户 + */ + String ONLINE_USER = "online::token:"; + /** + * 登录验证码 + */ + String CAPTCHA_LOGIN = "captcha::login:"; + /** + * 用户信息 + */ + String USER_INFO = "user::info:"; } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java index aea97b10..e751cdba 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java @@ -14,47 +14,46 @@ import org.springframework.stereotype.Component; @Component public class SystemUserInfoDAO { - @Autowired - private KitRedisHelper redisHelper; + @Autowired private KitRedisHelper redisHelper; - /** - * 添加缓存到Redis - * - * @param userName 用户名 - */ - @Async - public void saveUserLoginInfoByUserName(String userName, SystemUserJwtVo user) { - if (StrUtil.isNotEmpty(userName)) { - // 添加数据, 避免数据同时过期（2小时左右） - long time = 7200 + RandomUtil.randomInt(900, 1800); - redisHelper.set(SystemRedisKey.USER_INFO + userName, user, time); + /** + * 添加缓存到Redis + * + * @param userName 用户名 + */ + @Async + public void saveUserLoginInfoByUserName(String userName, SystemUserJwtVo user) { + if (StrUtil.isNotEmpty(userName)) { + // 添加数据, 避免数据同时过期（2小时左右） + long time = 7200 + RandomUtil.randomInt(900, 1800); + redisHelper.set(SystemRedisKey.USER_INFO + userName, user, time); + } } - } - /** - * 清理用户缓存信息 用户信息变更时 - * - * @param userName 用户名 - */ - @Async - public void deleteUserLoginInfoByUserName(String userName) { - if (StrUtil.isNotEmpty(userName)) { - // 清除数据 - redisHelper.del(SystemRedisKey.USER_INFO + userName); + /** + * 清理用户缓存信息 用户信息变更时 + * + * @param userName 用户名 + */ + @Async + public void deleteUserLoginInfoByUserName(String userName) { + if (StrUtil.isNotEmpty(userName)) { + // 清除数据 + redisHelper.del(SystemRedisKey.USER_INFO + userName); + } } - } - /** - * 返回用户缓存 - * - * @param username 用户名 - * @return UserJwtVo - */ - public SystemUserJwtVo getUserLoginInfoByUserName(String username) { - if (StrUtil.isNotEmpty(username)) { - // 获取数据 - return redisHelper.get(SystemRedisKey.USER_INFO + username, SystemUserJwtVo.class); + /** + * 返回用户缓存 + * + * @param username 用户名 + * @return UserJwtVo + */ + public SystemUserJwtVo getUserLoginInfoByUserName(String username) { + if (StrUtil.isNotEmpty(username)) { + // 获取数据 + return redisHelper.get(SystemRedisKey.USER_INFO + username, SystemUserJwtVo.class); + } + return null; } - return null; - } } 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 61c76b75..de834919 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 @@ -13,6 +13,8 @@ import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitIPUtil; import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -21,8 +23,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; 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; @@ -32,129 +32,129 @@ import org.springframework.stereotype.Component; @AllArgsConstructor public class SystemUserOnlineInfoDAO { - private final AppProperties properties; - private final TokenProvider tokenProvider; - private final KitRedisHelper redisHelper; + private final AppProperties properties; + private final TokenProvider tokenProvider; + private final KitRedisHelper redisHelper; - /** - * 保存在线用户信息 - * - * @param userJwtVo / - * @param token / - * @param request / - */ - public void saveUserJwtModelByToken(SystemUserJwtVo userJwtVo, String token, HttpServletRequest request) { - String dept = userJwtVo.getUser().getDept().getName(); - String ip = KitBrowserUtil.getIp(request); - String id = tokenProvider.getId(token); - String version = KitBrowserUtil.getVersion(request); - String address = KitIPUtil.getCityInfo(ip); - SystemUserOnlineVo userOnlineVo = null; - try { - userOnlineVo = new SystemUserOnlineVo(); - userOnlineVo.setUid(id); - userOnlineVo.setUserName(userJwtVo.getUsername()); - userOnlineVo.setNickName(userJwtVo.getUser().getNickName()); - userOnlineVo.setDept(dept); - userOnlineVo.setBrowser(version); - userOnlineVo.setIp(ip); - userOnlineVo.setAddress(address); - userOnlineVo.setKey(KitDesEncryptUtil.desEncrypt(token)); - userOnlineVo.setLoginTime(new Date()); - } catch (Exception e) { - log.error(e.getMessage(), e); + /** + * 保存在线用户信息 + * + * @param userJwtVo / + * @param token / + * @param request / + */ + public void saveUserJwtModelByToken(SystemUserJwtVo userJwtVo, String token, HttpServletRequest request) { + String dept = userJwtVo.getUser().getDept().getName(); + String ip = KitBrowserUtil.getIp(request); + String id = tokenProvider.getId(token); + String version = KitBrowserUtil.getVersion(request); + String address = KitIPUtil.getCityInfo(ip); + SystemUserOnlineVo userOnlineVo = null; + try { + userOnlineVo = new SystemUserOnlineVo(); + userOnlineVo.setUid(id); + userOnlineVo.setUserName(userJwtVo.getUsername()); + userOnlineVo.setNickName(userJwtVo.getUser().getNickName()); + userOnlineVo.setDept(dept); + userOnlineVo.setBrowser(version); + userOnlineVo.setIp(ip); + userOnlineVo.setAddress(address); + userOnlineVo.setKey(KitDesEncryptUtil.desEncrypt(token)); + userOnlineVo.setLoginTime(new Date()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + String loginKey = tokenProvider.loginKey(token); + redisHelper.set(loginKey, userOnlineVo, properties.getJwt().getTokenValidityInSeconds(), TimeUnit.MILLISECONDS); } - String loginKey = tokenProvider.loginKey(token); - redisHelper.set(loginKey, userOnlineVo, properties.getJwt().getTokenValidityInSeconds(), TimeUnit.MILLISECONDS); - } - /** - * 退出登录 - * - * @param token / - */ - public void logoutByToken(String token) { - String loginKey = tokenProvider.loginKey(token); - redisHelper.del(loginKey); - } - - /** - * 导出 - * - * @param all / - * @param response / - * @throws IOException / - */ - public void downloadUserOnlineModelExcel(List all, HttpServletResponse response) - throws IOException { - List> list = new ArrayList<>(); - for (SystemUserOnlineVo user : all) { - Map map = new LinkedHashMap<>(); - map.put("用户名", user.getUserName()); - map.put("部门", user.getDept()); - map.put("登录IP", user.getIp()); - map.put("登录地点", user.getAddress()); - map.put("浏览器", user.getBrowser()); - map.put("登录日期", user.getLoginTime()); - list.add(map); + /** + * 退出登录 + * + * @param token / + */ + public void logoutByToken(String token) { + String loginKey = tokenProvider.loginKey(token); + redisHelper.del(loginKey); } - KitFileUtil.downloadExcel(list, response); - } - /** - * 根据用户名强退用户 - * - * @param username / - */ - public void kickOutByUsername(String username) { - String loginKey = SystemRedisKey.ONLINE_USER + username + "*"; - redisHelper.scanDel(loginKey); - } - - /** - * 查询全部数据 - * - * @param onlineVo / - * @param pageable / - * @return / - */ - public KitPageResult queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, - IPage pageable) { - String username = null; - if (onlineVo != null) { - username = onlineVo.getUserName(); + /** + * 导出 + * + * @param all / + * @param response / + * @throws IOException / + */ + public void downloadUserOnlineModelExcel(List all, HttpServletResponse response) + throws IOException { + List> list = new ArrayList<>(); + for (SystemUserOnlineVo user : all) { + Map map = new LinkedHashMap<>(); + map.put("用户名", user.getUserName()); + map.put("部门", user.getDept()); + map.put("登录IP", user.getIp()); + map.put("登录地点", user.getAddress()); + map.put("浏览器", user.getBrowser()); + map.put("登录日期", user.getLoginTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); } - List onlineUserList = queryUserOnlineModelListByUsername(username); - List paging = - KitPageUtil.softPaging(pageable.getCurrent(), pageable.getSize(), onlineUserList); - return KitPageUtil.toPage(paging, onlineUserList.size()); - } - /** - * 查询全部数据，不分页 - * - * @param username / - * @return / - */ - public List queryUserOnlineModelListByUsername(String username) { - String loginKey = SystemRedisKey.ONLINE_USER + (StrUtil.isBlank(username) ? "" : "*" + username); - List keys = redisHelper.scan(loginKey + "*"); - Collections.reverse(keys); - List onlineUserList = new ArrayList<>(); - for (String key : keys) { - onlineUserList.add(redisHelper.get(key, SystemUserOnlineVo.class)); + /** + * 根据用户名强退用户 + * + * @param username / + */ + public void kickOutByUsername(String username) { + String loginKey = SystemRedisKey.ONLINE_USER + username + "*"; + redisHelper.scanDel(loginKey); } - onlineUserList.sort((o1, o2) -> o2.getLoginTime().compareTo(o1.getLoginTime())); - return onlineUserList; - } - /** - * 查询用户 - * - * @param key / - * @return / - */ - public SystemUserOnlineVo queryUserOnlineModelByKey(String key) { - return redisHelper.get(key, SystemUserOnlineVo.class); - } + /** + * 查询全部数据 + * + * @param onlineVo / + * @param pageable / + * @return / + */ + public KitPageResult queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, + IPage pageable) { + String username = null; + if (onlineVo != null) { + username = onlineVo.getUserName(); + } + List onlineUserList = queryUserOnlineModelListByUsername(username); + List paging = + KitPageUtil.softPaging(pageable.getCurrent(), pageable.getSize(), onlineUserList); + return KitPageUtil.toPage(paging, onlineUserList.size()); + } + + /** + * 查询全部数据，不分页 + * + * @param username / + * @return / + */ + public List queryUserOnlineModelListByUsername(String username) { + String loginKey = SystemRedisKey.ONLINE_USER + (StrUtil.isBlank(username) ? "" : "*" + username); + List keys = redisHelper.scan(loginKey + "*"); + Collections.reverse(keys); + List onlineUserList = new ArrayList<>(); + for (String key : keys) { + onlineUserList.add(redisHelper.get(key, SystemUserOnlineVo.class)); + } + onlineUserList.sort((o1, o2) -> o2.getLoginTime().compareTo(o1.getLoginTime())); + return onlineUserList; + } + + /** + * 查询用户 + * + * @param key / + * @return / + */ + public SystemUserOnlineVo queryUserOnlineModelByKey(String key) { + return redisHelper.get(key, SystemUserOnlineVo.class); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java index 2e99a56b..f5d235be 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java @@ -55,7 +55,7 @@ public class UserDetailsHandler implements UserDetailsService { // 获取用户的权限 List authorities = systemRoleService.buildUserRolePermissions(user); // 初始化JwtUserDto - userJwtVo = new SystemUserJwtVo(user, systemDataService.findDeptIdListByArgs(user), authorities); + userJwtVo = new SystemUserJwtVo(user, systemDataService.queryDeptIdByArgs(user), authorities); // 添加缓存数据 systemUserInfoDAO.saveUserLoginInfoByUserName(username, userJwtVo); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java index 94cc7b93..c2f13255 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java @@ -38,7 +38,7 @@ public class ActiveJobRegister implements ApplicationRunner { */ @Override public void run(ApplicationArguments applicationArguments) { - List quartzJobs = systemQuartzJobService.queryEnableQuartzJob(); + List quartzJobs = systemQuartzJobService.listEnableQuartzJob(); quartzJobs.forEach(quartzManage::addJob); log.info("Timing task injection complete"); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/job/TestTask.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/job/TestTask.java index 6c11473b..4134b2e7 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/job/TestTask.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/job/TestTask.java @@ -22,15 +22,15 @@ import org.springframework.stereotype.Service; @Service public class TestTask { - public void run() { - log.info("run 执行成功"); - } + public void run() { + log.info("run 执行成功"); + } - public void run1(String str) { - log.info("run1 执行成功, 参数为： {}", str); - } + public void run1(String str) { + log.info("run1 执行成功, 参数为： {}", str); + } - public void run2() { - log.info("run2 执行成功"); - } + public void run2() { + log.info("run2 执行成功"); + } } 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 453b757f..82aa3224 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 @@ -36,56 +36,53 @@ import org.springframework.stereotype.Service; @Service public class SystemDataService { - @Autowired - private SystemRoleService systemRoleService; - @Autowired - private SystemDeptService systemDeptService; - @Autowired - private SystemRoleDeptService systemRoleDeptService; + @Autowired private SystemRoleService systemRoleService; + @Autowired private SystemDeptService systemDeptService; + @Autowired private SystemRoleDeptService systemRoleDeptService; - /** - * 获取数据权限 - * - * @param user / - * @return / - */ - public List findDeptIdListByArgs(SystemUserTb user) { - List deptIds = new ArrayList<>(); - // 查询用户角色 - List roleList = systemRoleService.queryRoleByUsersId(user.getId()); - // 获取对应的部门ID - for (SystemRoleTb role : roleList) { - SystemDataScopeEnum dataScopeEnum = SystemDataScopeEnum.find(role.getDataScope()); - switch (Objects.requireNonNull(dataScopeEnum)) { - case THIS_LEVEL: - deptIds.add(user.getDept().getId()); - break; - case CUSTOMIZE: - deptIds.addAll(this.findCustomDataPermissionList(deptIds, role)); - break; - default: - return new ArrayList<>(); - } + /** + * 获取数据权限 + * + * @param user / + * @return / + */ + public List queryDeptIdByArgs(SystemUserTb user) { + List deptIds = new ArrayList<>(); + // 查询用户角色 + List roleList = systemRoleService.queryRoleByUsersId(user.getId()); + // 获取对应的部门ID + for (SystemRoleTb role : roleList) { + SystemDataScopeEnum dataScopeEnum = SystemDataScopeEnum.find(role.getDataScope()); + switch (Objects.requireNonNull(dataScopeEnum)) { + case THIS_LEVEL: + deptIds.add(user.getDept().getId()); + break; + case CUSTOMIZE: + deptIds.addAll(this.queryCustomDataPermissionByArgs(deptIds, role)); + break; + default: + return new ArrayList<>(); + } + } + return deptIds.stream().distinct().collect(Collectors.toList()); } - return deptIds.stream().distinct().collect(Collectors.toList()); - } - /** - * 获取自定义的数据权限 - * - * @param deptIds 部门ID - * @param role 角色 - * @return 数据权限ID - */ - private List findCustomDataPermissionList(List deptIds, SystemRoleTb role) { - List deptList = systemRoleDeptService.selectDeptByRoleId(role.getId()); - for (SystemDeptTb dept : deptList) { - deptIds.add(dept.getId()); - List deptChildren = systemDeptService.queryDeptByPid(dept.getId()); - if (CollUtil.isNotEmpty(deptChildren)) { - deptIds.addAll(systemDeptService.queryChildDeptIdListByDeptIds(deptChildren)); - } + /** + * 获取自定义的数据权限 + * + * @param deptIds 部门ID + * @param role 角色 + * @return 数据权限ID + */ + private List queryCustomDataPermissionByArgs(List deptIds, SystemRoleTb role) { + List deptList = systemRoleDeptService.listDeptByRoleId(role.getId()); + for (SystemDeptTb dept : deptList) { + deptIds.add(dept.getId()); + List deptChildren = systemDeptService.listDeptByPid(dept.getId()); + if (CollUtil.isNotEmpty(deptChildren)) { + deptIds.addAll(systemDeptService.queryChildDeptIdByDeptIds(deptChildren)); + } + } + return deptIds; } - return deptIds; - } } 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 81532f50..d0fd40b2 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 @@ -29,11 +29,11 @@ import cn.odboy.system.dal.model.SystemProductLineTreeVo; import cn.odboy.system.dal.model.SystemProductLineVo; import cn.odboy.system.dal.model.SystemQueryDeptArgs; import cn.odboy.system.dal.mysql.SystemDeptMapper; -import cn.odboy.system.dal.mysql.SystemRoleMapper; -import cn.odboy.system.dal.mysql.SystemUserMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitClassUtil; import cn.odboy.util.KitFileUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; @@ -47,7 +47,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; @@ -55,390 +54,429 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemDeptService { - @Autowired - private SystemDeptMapper systemDeptMapper; - @Autowired - private SystemUserMapper systemUserMapper; - @Autowired - private SystemRoleService systemRoleService; + @Autowired private SystemDeptMapper systemDeptMapper; + @Autowired private SystemUserService systemUserService; + @Autowired private SystemRoleService systemRoleService; - /** - * 创建 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void saveDept(SystemCreateDeptArgs args) { - systemDeptMapper.insert(BeanUtil.copyProperties(args, SystemDeptTb.class)); - this.updateDeptSubCnt(args.getPid()); - } - - /** - * 编辑 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void updateDept(SystemDeptTb args) { - // 旧的部门 - Long oldPid = this.getDeptById(args.getId()).getPid(); - Long newPid = args.getPid(); - if (args.getPid() != null && args.getId().equals(args.getPid())) { - throw new BadRequestException("上级不能为自己"); + /** + * 创建 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void saveDept(SystemCreateDeptArgs args) { + systemDeptMapper.insert(BeanUtil.copyProperties(args, SystemDeptTb.class)); + this.updateDeptSubCnt(args.getPid()); } - SystemDeptTb dept = systemDeptMapper.selectById(args.getId()); - args.setId(dept.getId()); - systemDeptMapper.insertOrUpdate(args); - this.updateDeptSubCnt(oldPid); - this.updateDeptSubCnt(newPid); - } - /** - * 删除 - * - * @param deptSet / - */ - @Transactional(rollbackFor = Exception.class) - public void removeDeptByIds(Set deptSet) { - for (SystemDeptTb dept : deptSet) { - systemDeptMapper.deleteById(dept.getId()); - this.updateDeptSubCnt(dept.getPid()); - } - } - - /** - * 导出数据 - * - * @param deptList 待导出的数据 - * @param response / - * @throws IOException / - */ - public void exportDeptExcel(List deptList, HttpServletResponse response) throws IOException { - List> list = new ArrayList<>(); - for (SystemDeptTb dept : deptList) { - Map map = new LinkedHashMap<>(); - map.put("部门名称", dept.getName()); - map.put("部门状态", dept.getEnabled() ? "启用" : "停用"); - map.put("创建日期", dept.getCreateTime()); - list.add(map); - } - KitFileUtil.downloadExcel(list, response); - } - - /** - * 更新父节点中子节点数目 - * - * @param deptId / - */ - @Transactional(rollbackFor = Exception.class) - public void updateDeptSubCnt(Long deptId) { - if (deptId != null) { - long count = systemDeptMapper.countDeptByPid(deptId); - systemDeptMapper.updateDeptSubCountById(count, deptId); - } - } - - /** - * 筛选出 list 中没有父部门（即 pid 不在其他部门 id 列表中的部门）的部门列表 - */ - private List deduplication(List list) { - List deptList = new ArrayList<>(); - // 使用 Set 存储所有部门的 id - Set idSet = list.stream().map(SystemDeptTb::getId).collect(Collectors.toSet()); - // 遍历部门列表, 筛选出没有父部门的部门 - for (SystemDeptTb dept : list) { - if (!idSet.contains(dept.getPid())) { - deptList.add(dept); - } - } - return deptList; - } - - /** - * 查询所有数据 - * - * @param criteria 条件 - * @param isQuery / - * @return / - * @throws Exception / - */ - public List queryAllDept(SystemQueryDeptArgs criteria, Boolean isQuery) throws Exception { - String dataScopeType = KitSecurityHelper.getDataScopeType(); - if (isQuery) { - if (dataScopeType.equals(SystemDataScopeEnum.ALL.getValue())) { - criteria.setPidIsNull(true); - } - List fields = KitClassUtil.getAllFields(criteria.getClass(), new ArrayList<>()); - List fieldNames = new ArrayList<>() {{ - add("pidIsNull"); - add("enabled"); - }}; - for (Field field : fields) { - // 设置对象的访问权限, 保证对private的属性的访问 - field.setAccessible(true); - Object val = field.get(criteria); - if (fieldNames.contains(field.getName())) { - continue; + /** + * 编辑 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateDept(SystemDeptTb args) { + // 旧的部门 + Long oldPid = this.getDeptById(args.getId()).getPid(); + Long newPid = args.getPid(); + if (args.getPid() != null && args.getId().equals(args.getPid())) { + throw new BadRequestException("上级不能为自己"); } - if (ObjectUtil.isNotNull(val)) { - criteria.setPidIsNull(null); - break; + SystemDeptTb dept = systemDeptMapper.selectById(args.getId()); + args.setId(dept.getId()); + systemDeptMapper.insertOrUpdate(args); + this.updateDeptSubCnt(oldPid); + this.updateDeptSubCnt(newPid); + } + + /** + * 删除 + * + * @param deptSet / + */ + @Transactional(rollbackFor = Exception.class) + public void deleteDeptByIds(Set deptSet) { + for (SystemDeptTb dept : deptSet) { + systemDeptMapper.deleteById(dept.getId()); + this.updateDeptSubCnt(dept.getPid()); } - } } - // 数据权限 - criteria.setIds(KitSecurityHelper.getCurrentUserDataScope()); - List list = systemDeptMapper.queryDeptByArgs(criteria); - // 如果为空, 就代表为自定义权限或者本级权限, 就需要去重, 不理解可以注释掉，看查询结果 - if (StrUtil.isBlank(dataScopeType)) { - return this.deduplication(list); - } - return list; - } - /** - * 根据ID查询 - * - * @param id / - * @return / - */ - public SystemDeptTb getDeptById(Long id) { - return systemDeptMapper.selectById(id); - } - - /** - * 根据PID查询 - * - * @param pid / - * @return / - */ - public List queryDeptByPid(long pid) { - return systemDeptMapper.selectDeptByPid(pid); - } - - /** - * 获取部门下所有关联的部门 - * - * @param deptTbList / - * @param depts / - * @return / - */ - public Set queryRelationDeptSet(List deptTbList, Set depts) { - for (SystemDeptTb dept : deptTbList) { - depts.add(dept); - List deptList = systemDeptMapper.selectDeptByPid(dept.getId()); - if (CollUtil.isNotEmpty(deptList)) { - queryRelationDeptSet(deptList, depts); - } - } - return depts; - } - - /** - * 获取 - * - * @param deptList 、 - * @return 、 - */ - public List queryChildDeptIdListByDeptIds(List deptList) { - List list = new ArrayList<>(); - for (SystemDeptTb systemDeptTb : deptList) { - if (systemDeptTb != null && systemDeptTb.getEnabled()) { - List deptList1 = systemDeptMapper.selectDeptByPid(systemDeptTb.getId()); - if (CollUtil.isNotEmpty(deptList1)) { - list.addAll(queryChildDeptIdListByDeptIds(deptList1)); + /** + * 导出数据 + * + * @param deptList 待导出的数据 + * @param response / + * @throws IOException / + */ + public void exportDeptExcel(List deptList, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (SystemDeptTb dept : deptList) { + Map map = new LinkedHashMap<>(); + map.put("部门名称", dept.getName()); + map.put("部门状态", dept.getEnabled() ? "启用" : "停用"); + map.put("创建日期", dept.getCreateTime()); + list.add(map); } - list.add(systemDeptTb.getId()); - } + KitFileUtil.downloadExcel(list, response); } - return list; - } - /** - * 根据ID获取同级与上级数据 - * - * @param dept / - * @param deptList / - * @return / - */ - public List querySuperiorDeptListByPid(SystemDeptTb dept, List deptList) { - if (dept.getPid() == null) { - deptList.addAll(systemDeptMapper.selectDeptByPidIsNull()); - return deptList; - } - deptList.addAll(systemDeptMapper.selectDeptByPid(dept.getPid())); - return querySuperiorDeptListByPid(this.getDeptById(dept.getPid()), deptList); - } - - /** - * 构建树形数据 - * - * @param deptList / - * @return / - */ - public KitPageResult buildDeptTree(List deptList) { - Set trees = new LinkedHashSet<>(); - Set deptSet = new LinkedHashSet<>(); - List deptNames = deptList.stream().map(SystemDeptTb::getName).collect(Collectors.toList()); - boolean isChild; - for (SystemDeptTb dept : deptList) { - isChild = false; - if (dept.getPid() == null) { - trees.add(dept); - } - for (SystemDeptTb it : deptList) { - if (it.getPid() != null && dept.getId().equals(it.getPid())) { - isChild = true; - if (dept.getChildren() == null) { - dept.setChildren(new ArrayList<>()); - } - dept.getChildren().add(it); + /** + * 更新父节点中子节点数目 + * + * @param deptId / + */ + @Transactional(rollbackFor = Exception.class) + public void updateDeptSubCnt(Long deptId) { + if (deptId != null) { + long count = this.countDeptByPid(deptId); + systemDeptMapper.updateDeptSubCountById(count, deptId); } - } - if (isChild) { - deptSet.add(dept); - } else if (dept.getPid() != null && !deptNames.contains(this.getDeptById(dept.getPid()).getName())) { - deptSet.add(dept); - } } - if (CollectionUtil.isEmpty(trees)) { - trees = deptSet; - } - KitPageResult baseResult = new KitPageResult<>(); - baseResult.setContent(CollectionUtil.isEmpty(trees) ? new ArrayList<>(deptSet) : new ArrayList<>(trees)); - baseResult.setTotalElements(deptSet.size()); - return baseResult; - } - /** - * 验证是否被角色或用户关联 - * - * @param deptSet / - */ - public void verifyBindRelationByIds(Set deptSet) { - Set deptIds = deptSet.stream().map(SystemDeptTb::getId).collect(Collectors.toSet()); - if (systemUserMapper.countUserByDeptIds(deptIds) > 0) { - throw new BadRequestException("所选部门存在用户关联，请解除后再试！"); + private long countDeptByPid(Long pid) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemDeptTb::getPid, pid); + return systemDeptMapper.selectCount(wrapper); } - if (systemRoleService.countRoleByDeptIds(deptIds) > 0) { - throw new BadRequestException("所选部门存在角色关联，请解除后再试！"); + + /** + * 筛选出 list 中没有父部门（即 pid 不在其他部门 id 列表中的部门）的部门列表 + */ + private List deduplication(List list) { + List deptList = new ArrayList<>(); + // 使用 Set 存储所有部门的 id + Set idSet = list.stream().map(SystemDeptTb::getId).collect(Collectors.toSet()); + // 遍历部门列表, 筛选出没有父部门的部门 + for (SystemDeptTb dept : list) { + if (!idSet.contains(dept.getPid())) { + deptList.add(dept); + } + } + return deptList; } - } - /** - * 遍历所有部门和子部门 - * - * @param ids / - */ - public Set traverseDeptByIdWithPids(Set ids) { - Set depts = new HashSet<>(); - for (Long id : ids) { - // 根部门 - depts.add(this.getDeptById(id)); - // 子部门 - List deptList = queryDeptByPid(id); - if (CollectionUtil.isNotEmpty(deptList)) { - depts = queryRelationDeptSet(deptList, depts); - } + private List queryDeptByArgs(SystemQueryDeptArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (args != null) { + wrapper.in(CollUtil.isNotEmpty(args.getIds()), SystemDeptTb::getId, args.getIds()); + wrapper.like(StrUtil.isNotBlank(args.getName()), SystemDeptTb::getName, args.getName()); + wrapper.eq(args.getEnabled() != null, SystemDeptTb::getEnabled, args.getEnabled()); + wrapper.eq(args.getPid() != null, SystemDeptTb::getPid, args.getPid()); + wrapper.isNull(args.getPidIsNull() != null, SystemDeptTb::getPid); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemDeptTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + } + } + wrapper.orderByAsc(SystemDeptTb::getDeptSort); + return systemDeptMapper.selectList(wrapper); } - return depts; - } - public List queryDeptSelectDataSource() { - List depts = systemDeptMapper.selectEnabledDepts(); - return buildDeptSelectOptions(depts); - } - - private List buildDeptSelectOptions(List depts) { - // 获取所有部门并按父子关系组织 - Map deptMap = - depts.stream().collect(Collectors.toMap(SystemDeptTb::getId, Function.identity())); - List options = new ArrayList<>(); - for (SystemDeptTb dept : depts) { - // 构建部门ID路径 - List pathIds = new ArrayList<>(); - buildDeptIdPath(dept, deptMap, pathIds); - // 反转路径，从顶级部门到当前部门 - Collections.reverse(pathIds); - SystemProductLineVo dto = new SystemProductLineVo(); - dto.setValue(dept.getId()); - dto.setIdPath(pathIds.stream().map(String::valueOf).collect(Collectors.joining("-"))); - // 保留名称路径用于显示 - dto.setLabel(buildNamePath(dept, deptMap)); - options.add(dto); + /** + * 查询所有数据 + * + * @param args 条件 + * @param isQuery / + * @return / + * @throws Exception / + */ + public List queryAllDeptByArgs(SystemQueryDeptArgs args, Boolean isQuery) throws Exception { + String dataScopeType = KitSecurityHelper.getDataScopeType(); + if (isQuery) { + if (dataScopeType.equals(SystemDataScopeEnum.ALL.getValue())) { + args.setPidIsNull(true); + } + List fields = KitClassUtil.getAllFields(args.getClass(), new ArrayList<>()); + List fieldNames = new ArrayList<>() {{ + add("pidIsNull"); + add("enabled"); + }}; + for (Field field : fields) { + // 设置对象的访问权限, 保证对private的属性的访问 + field.setAccessible(true); + Object val = field.get(args); + if (fieldNames.contains(field.getName())) { + continue; + } + if (ObjectUtil.isNotNull(val)) { + args.setPidIsNull(null); + break; + } + } + } + // 数据权限 + args.setIds(KitSecurityHelper.getCurrentUserDataScope()); + List list = this.queryDeptByArgs(args); + // 如果为空, 就代表为自定义权限或者本级权限, 就需要去重, 不理解可以注释掉，看查询结果 + if (StrUtil.isBlank(dataScopeType)) { + return this.deduplication(list); + } + return list; } - // 按部门名称路径排序 - options.sort(Comparator.comparing(SystemProductLineVo::getLabel)); - return options; - } - private void buildDeptIdPath(SystemDeptTb dept, Map deptMap, List pathIds) { - pathIds.add(dept.getId()); - if (dept.getPid() != null && dept.getPid() != 0 && deptMap.containsKey(dept.getPid())) { - buildDeptIdPath(deptMap.get(dept.getPid()), deptMap, pathIds); + /** + * 根据ID查询 + * + * @param id / + * @return / + */ + public SystemDeptTb getDeptById(Long id) { + return systemDeptMapper.selectById(id); } - } - private String buildNamePath(SystemDeptTb dept, Map deptMap) { - List pathNames = new ArrayList<>(); - buildDeptNamePath(dept, deptMap, pathNames); - Collections.reverse(pathNames); - return String.join(" / ", pathNames); - } - - private void buildDeptNamePath(SystemDeptTb dept, Map deptMap, List pathNames) { - pathNames.add(dept.getName()); - if (dept.getPid() != null && dept.getPid() != 0 && deptMap.containsKey(dept.getPid())) { - buildDeptNamePath(deptMap.get(dept.getPid()), deptMap, pathNames); + /** + * 获取部门下所有关联的部门 + * + * @param deptTbList / + * @param depts / + * @return / + */ + private Set queryRelationDeptByArgs(List deptTbList, Set depts) { + for (SystemDeptTb dept : deptTbList) { + depts.add(dept); + List deptList = this.listDeptByPid(dept.getId()); + if (CollUtil.isNotEmpty(deptList)) { + queryRelationDeptByArgs(deptList, depts); + } + } + return depts; } - } - public List queryDeptSelectProDataSource() { - List depts = systemDeptMapper.selectEnabledDepts(); - // 获取所有部门并按父子关系组织 - Map deptMap = - depts.stream().collect(Collectors.toMap(SystemDeptTb::getId, Function.identity())); - List options = new ArrayList<>(); - // 构建树形结构 - for (SystemDeptTb dept : depts) { - // 只处理顶级部门（pid为null或0的部门） - if (dept.getPid() == null || dept.getPid() == 0) { - SystemProductLineTreeVo vo = buildDeptTreePro(dept, deptMap); - options.add(vo); - } + public List queryChildDeptIdByDeptIds(List deptList) { + List list = new ArrayList<>(); + for (SystemDeptTb systemDeptTb : deptList) { + if (systemDeptTb != null && systemDeptTb.getEnabled()) { + List deptList1 = this.listDeptByPid(systemDeptTb.getId()); + if (CollUtil.isNotEmpty(deptList1)) { + list.addAll(queryChildDeptIdByDeptIds(deptList1)); + } + list.add(systemDeptTb.getId()); + } + } + return list; } - // 按排序字段排序 - options.sort(Comparator.comparingInt(o -> { - Long id = Long.valueOf(o.getValue()); - return deptMap.get(id) != null ? deptMap.get(id).getDeptSort() : 0; - })); - return options; - } - /** - * 递归构建部门树 - * - * @param dept 当前部门 - * @param deptMap 部门映射 - * @return SystemProductLineTreeVo 树节点 - */ - private SystemProductLineTreeVo buildDeptTreePro(SystemDeptTb dept, Map deptMap) { - SystemProductLineTreeVo vo = new SystemProductLineTreeVo(); - vo.setValue(String.valueOf(dept.getId())); - vo.setLabel(dept.getName()); - // 查找子部门 - List children = new ArrayList<>(); - for (SystemDeptTb childDept : deptMap.values()) { - if (dept.getId().equals(childDept.getPid())) { - children.add(buildDeptTreePro(childDept, deptMap)); - } + /** + * 根据ID获取同级与上级数据 + * + * @param dept / + * @param deptList / + * @return / + */ + private List querySuperiorDeptByPid(SystemDeptTb dept, List deptList) { + if (dept.getPid() == null) { + deptList.addAll(this.listRootDept()); + return deptList; + } + deptList.addAll(this.listDeptByPid(dept.getPid())); + return querySuperiorDeptByPid(this.getDeptById(dept.getPid()), deptList); + } + + private List listRootDept() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.isNull(SystemDeptTb::getPid); + return systemDeptMapper.selectList(wrapper); + } + + /** + * 构建树形数据 + * + * @return / + */ + public KitPageResult searchDeptTree(List ids, Boolean exclude) { + Set deptSet1 = new LinkedHashSet<>(); + for (Long id : ids) { + // 同级数据 + SystemDeptTb dept = this.getDeptById(id); + // 上级数据 + List depts = this.querySuperiorDeptByPid(dept, new ArrayList<>()); + if (exclude) { + for (SystemDeptTb data : depts) { + if (data.getId().equals(dept.getPid())) { + data.setSubCount(data.getSubCount() - 1); + } + } + // 编辑部门时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 + depts = depts.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toList()); + } + deptSet1.addAll(depts); + } + ArrayList deptList = new ArrayList<>(deptSet1); + // 构建部门树 + Set trees = new LinkedHashSet<>(); + Set deptSet = new LinkedHashSet<>(); + List deptNames = deptList.stream().map(SystemDeptTb::getName).collect(Collectors.toList()); + boolean isChild; + for (SystemDeptTb dept : deptList) { + isChild = false; + if (dept.getPid() == null) { + trees.add(dept); + } + for (SystemDeptTb it : deptList) { + if (it.getPid() != null && dept.getId().equals(it.getPid())) { + isChild = true; + if (dept.getChildren() == null) { + dept.setChildren(new ArrayList<>()); + } + dept.getChildren().add(it); + } + } + if (isChild) { + deptSet.add(dept); + } else if (dept.getPid() != null && !deptNames.contains(this.getDeptById(dept.getPid()).getName())) { + deptSet.add(dept); + } + } + if (CollectionUtil.isEmpty(trees)) { + trees = deptSet; + } + KitPageResult baseResult = new KitPageResult<>(); + baseResult.setContent(CollectionUtil.isEmpty(trees) ? new ArrayList<>(deptSet) : new ArrayList<>(trees)); + baseResult.setTotalElements(deptSet.size()); + return baseResult; + } + + /** + * 验证是否被角色或用户关联 + * + * @param deptSet / + */ + public void verifyBindRelationByIds(Set deptSet) { + Set deptIds = deptSet.stream().map(SystemDeptTb::getId).collect(Collectors.toSet()); + if (systemUserService.countUserByDeptIds(deptIds) > 0) { + throw new BadRequestException("所选部门存在用户关联，请解除后再试！"); + } + if (systemRoleService.countRoleByDeptIds(deptIds) > 0) { + throw new BadRequestException("所选部门存在角色关联，请解除后再试！"); + } + } + + private List listEnabledDepts() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemDeptTb::getEnabled, 1); + return systemDeptMapper.selectList(wrapper); + } + + /** + * 遍历所有部门和子部门 + * + * @param ids / + */ + public Set traverseDeptByIdWithPids(Set ids) { + Set depts = new HashSet<>(); + for (Long id : ids) { + // 根部门 + depts.add(this.getDeptById(id)); + // 子部门 + List deptList = listDeptByPid(id); + if (CollectionUtil.isNotEmpty(deptList)) { + depts = queryRelationDeptByArgs(deptList, depts); + } + } + return depts; + } + + public List queryDeptSelectDataSource() { + List depts = this.listEnabledDepts(); + return buildDeptSelectOptions(depts); + } + + private List buildDeptSelectOptions(List depts) { + // 获取所有部门并按父子关系组织 + Map deptMap = + depts.stream().collect(Collectors.toMap(SystemDeptTb::getId, Function.identity())); + List options = new ArrayList<>(); + for (SystemDeptTb dept : depts) { + // 构建部门ID路径 + List pathIds = new ArrayList<>(); + buildDeptIdPath(dept, deptMap, pathIds); + // 反转路径，从顶级部门到当前部门 + Collections.reverse(pathIds); + SystemProductLineVo dto = new SystemProductLineVo(); + dto.setValue(dept.getId()); + dto.setIdPath(pathIds.stream().map(String::valueOf).collect(Collectors.joining("-"))); + // 保留名称路径用于显示 + dto.setLabel(buildNamePath(dept, deptMap)); + options.add(dto); + } + // 按部门名称路径排序 + options.sort(Comparator.comparing(SystemProductLineVo::getLabel)); + return options; + } + + private void buildDeptIdPath(SystemDeptTb dept, Map deptMap, List pathIds) { + pathIds.add(dept.getId()); + if (dept.getPid() != null && dept.getPid() != 0 && deptMap.containsKey(dept.getPid())) { + buildDeptIdPath(deptMap.get(dept.getPid()), deptMap, pathIds); + } + } + + private String buildNamePath(SystemDeptTb dept, Map deptMap) { + List pathNames = new ArrayList<>(); + buildDeptNamePath(dept, deptMap, pathNames); + Collections.reverse(pathNames); + return String.join(" / ", pathNames); + } + + private void buildDeptNamePath(SystemDeptTb dept, Map deptMap, List pathNames) { + pathNames.add(dept.getName()); + if (dept.getPid() != null && dept.getPid() != 0 && deptMap.containsKey(dept.getPid())) { + buildDeptNamePath(deptMap.get(dept.getPid()), deptMap, pathNames); + } + } + + public List queryDeptSelectProDataSource() { + List depts = this.listEnabledDepts(); + // 获取所有部门并按父子关系组织 + Map deptMap = + depts.stream().collect(Collectors.toMap(SystemDeptTb::getId, Function.identity())); + List options = new ArrayList<>(); + // 构建树形结构 + for (SystemDeptTb dept : depts) { + // 只处理顶级部门（pid为null或0的部门） + if (dept.getPid() == null || dept.getPid() == 0) { + SystemProductLineTreeVo vo = buildDeptTreePro(dept, deptMap); + options.add(vo); + } + } + // 按排序字段排序 + options.sort(Comparator.comparingInt(o -> { + Long id = Long.valueOf(o.getValue()); + return deptMap.get(id) != null ? deptMap.get(id).getDeptSort() : 0; + })); + return options; + } + + /** + * 递归构建部门树 + * + * @param dept 当前部门 + * @param deptMap 部门映射 + * @return SystemProductLineTreeVo 树节点 + */ + private SystemProductLineTreeVo buildDeptTreePro(SystemDeptTb dept, Map deptMap) { + SystemProductLineTreeVo vo = new SystemProductLineTreeVo(); + vo.setValue(String.valueOf(dept.getId())); + vo.setLabel(dept.getName()); + // 查找子部门 + List children = new ArrayList<>(); + for (SystemDeptTb childDept : deptMap.values()) { + if (dept.getId().equals(childDept.getPid())) { + children.add(buildDeptTreePro(childDept, deptMap)); + } + } + // 子部门按排序字段排序 + children.sort(Comparator.comparingInt(o -> { + Long id = Long.valueOf(o.getValue()); + return deptMap.get(id) != null ? deptMap.get(id).getDeptSort() : 0; + })); + vo.setChildren(children); + return vo; + } + + public List listDeptByPid(long pid) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemDeptTb::getPid, pid); + return systemDeptMapper.selectList(wrapper); } - // 子部门按排序字段排序 - children.sort(Comparator.comparingInt(o -> { - Long id = Long.valueOf(o.getValue()); - return deptMap.get(id) != null ? deptMap.get(id).getDeptSort() : 0; - })); - vo.setChildren(children); - return vo; - } } 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 da0a281e..74b67074 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 @@ -41,113 +41,121 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemDictDetailService { + @Autowired private SystemDictDetailMapper systemDictDetailMapper; + @Autowired private SystemDictMapper systemDictMapper; - @Autowired - private SystemDictDetailMapper systemDictDetailMapper; - @Autowired - private SystemDictMapper systemDictMapper; - - /** - * 创建 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void saveDictDetail(SystemCreateDictDetailArgs args) { - SystemDictDetailTb dictDetail = BeanUtil.copyProperties(args, SystemDictDetailTb.class); - dictDetail.setDictId(args.getDict().getId()); - systemDictDetailMapper.insert(dictDetail); - } - - /** - * 编辑 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyDictDetailById(SystemDictDetailTb args) { - SystemDictDetailTb dictDetail = systemDictDetailMapper.selectById(args.getId()); - args.setId(dictDetail.getId()); - systemDictDetailMapper.insertOrUpdate(args); - } - - /** - * 删除 - * - * @param id / - */ - @Transactional(rollbackFor = Exception.class) - public void removeDictDetailById(Long id) { - systemDictDetailMapper.deleteById(id); - } - - @Transactional(rollbackFor = Exception.class) - public void deleteDictDetailByDictIds(Set ids) { - if (CollUtil.isNotEmpty(ids)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemDictDetailTb::getDictId, ids); - systemDictDetailMapper.delete(wrapper); + /** + * 创建 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void saveDictDetail(SystemCreateDictDetailArgs args) { + SystemDictDetailTb dictDetail = BeanUtil.copyProperties(args, SystemDictDetailTb.class); + dictDetail.setDictId(args.getDict().getId()); + systemDictDetailMapper.insert(dictDetail); } - } - /** - * 分页查询 - * - * @param args 条件 - * @param page 分页参数 - * @return / - */ - public KitPageResult queryDictDetailByArgs(SystemQueryDictDetailArgs args, - Page page) { - IPage iPage = new Page<>(); - List dictIds = new ArrayList<>(); - List dictTbs = new ArrayList<>(); + /** + * 编辑 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateDictDetailById(SystemDictDetailTb args) { + SystemDictDetailTb dictDetail = systemDictDetailMapper.selectById(args.getId()); + args.setId(dictDetail.getId()); + systemDictDetailMapper.insertOrUpdate(args); + } - if (args == null) { - dictTbs.addAll(systemDictMapper.selectList(null)); - dictIds = dictTbs.stream().map(SystemDictTb::getId).collect(Collectors.toList()); - } else { - String dictName = args.getDictName(); - if (StrUtil.isBlank(dictName)) { + /** + * 删除 + * + * @param id / + */ + @Transactional(rollbackFor = Exception.class) + public void deleteDictDetailById(Long id) { + systemDictDetailMapper.deleteById(id); + } + + @Transactional(rollbackFor = Exception.class) + public void deleteDictDetailByDictIds(Set ids) { + if (CollUtil.isNotEmpty(ids)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemDictDetailTb::getDictId, ids); + systemDictDetailMapper.delete(wrapper); + } + } + + private List listDictDetailByDictId(Long dictId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemDictDetailTb::getDictId, dictId); + return systemDictDetailMapper.selectList(wrapper); + } + + private IPage searchDictDetailByArgs(List dictIds, Page page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(CollUtil.isNotEmpty(dictIds), SystemDictDetailTb::getDictId, dictIds); + return systemDictDetailMapper.selectPage(page, wrapper); + } + + /** + * 分页查询 + * + * @param args 条件 + * @param page 分页参数 + * @return / + */ + public KitPageResult searchDictDetail(SystemQueryDictDetailArgs args, + Page page) { + IPage iPage = new Page<>(); + List dictIds = new ArrayList<>(); + List dictTbs = new ArrayList<>(); + + if (args == null) { + dictTbs.addAll(systemDictMapper.listAll()); + dictIds = dictTbs.stream().map(SystemDictTb::getId).collect(Collectors.toList()); + } else { + String dictName = args.getDictName(); + if (StrUtil.isBlank(dictName)) { + return KitPageUtil.toPage(iPage); + } + SystemDictTb dictTb = systemDictMapper.getByName(dictName); + if (dictTb == null) { + return KitPageUtil.toPage(iPage); + } else { + dictIds.add(dictTb.getId()); + dictTbs.add(dictTb); + } + } + + Map id2ItemMap = dictTbs.stream().collect(Collectors.toMap(SystemDictTb::getId, i -> i)); + iPage = this.searchDictDetailByArgs(dictIds, page) + .convert(i -> BeanUtil.copyProperties(i, SystemDictDetailVo.class)); + for (SystemDictDetailVo record : iPage.getRecords()) { + record.setDict(id2ItemMap.get(record.getDictId())); + } return KitPageUtil.toPage(iPage); - } - SystemDictTb dictTb = systemDictMapper.getByName(dictName); - if (dictTb == null) { - return KitPageUtil.toPage(iPage); - } else { - dictIds.add(dictTb.getId()); - dictTbs.add(dictTb); - } } - Map id2ItemMap = dictTbs.stream().collect(Collectors.toMap(SystemDictTb::getId, i -> i)); - iPage = systemDictDetailMapper.selectDictDetailByArgs(dictIds, page) - .convert(i -> BeanUtil.copyProperties(i, SystemDictDetailVo.class)); - for (SystemDictDetailVo record : iPage.getRecords()) { - record.setDict(id2ItemMap.get(record.getDictId())); + /** + * 根据字典名称获取字典详情 + * + * @param name 字典名称 + * @return / + */ + public List listDictDetailByName(String name) { + if (StrUtil.isBlank(name)) { + return new ArrayList<>(); + } + SystemDictTb systemDictTb = systemDictMapper.getByName(name); + if (systemDictTb == null) { + return new ArrayList<>(); + } + return this.listDictDetailByDictId(systemDictTb.getId()).stream().map(m -> { + SystemDictDetailVo detailVo = BeanUtil.copyProperties(m, SystemDictDetailVo.class); + detailVo.setDict(systemDictTb); + return detailVo; + }).collect(Collectors.toList()); } - return KitPageUtil.toPage(iPage); - } - - /** - * 根据字典名称获取字典详情 - * - * @param name 字典名称 - * @return / - */ - public List queryDictDetailByName(String name) { - if (StrUtil.isBlank(name)) { - return new ArrayList<>(); - } - SystemDictTb systemDictTb = systemDictMapper.getByName(name); - if (systemDictTb == null) { - return new ArrayList<>(); - } - return systemDictDetailMapper.selectByDictId(systemDictTb.getId()).stream().map(m -> { - SystemDictDetailVo detailVo = BeanUtil.copyProperties(m, SystemDictDetailVo.class); - detailVo.setDict(systemDictTb); - return detailVo; - }).collect(Collectors.toList()); - } - } 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 b56aaf04..4ef6f8c0 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 @@ -17,6 +17,7 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.dataobject.SystemDictTb; @@ -26,117 +27,119 @@ import cn.odboy.system.dal.model.SystemQueryDictArgs; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; 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; @Service public class SystemDictService { - @Autowired - private SystemDictMapper systemDictMapper; - @Autowired - private SystemDictDetailService systemDictDetailService; - /** - * 创建 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void saveDict(SystemCreateDictArgs args) { - systemDictMapper.insert(BeanUtil.copyProperties(args, SystemDictTb.class)); - } + @Autowired private SystemDictMapper systemDictMapper; + @Autowired private SystemDictDetailService systemDictDetailService; - /** - * 编辑 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyDictById(SystemDictTb args) { - SystemDictTb dict = systemDictMapper.selectById(args.getId()); - dict.setName(args.getName()); - dict.setDescription(args.getDescription()); - systemDictMapper.insertOrUpdate(dict); - } - - /** - * 删除 - * - * @param ids / - */ - @Transactional(rollbackFor = Exception.class) - public void removeDictByIds(Set ids) { - // 删除字典 - systemDictMapper.deleteByIds(ids); - // 删除字典详情 - systemDictDetailService.deleteDictDetailByDictIds(ids); - } - - /** - * 导出数据 - * - * @param dicts 待导出的数据 - * @param response / - * @throws IOException / - */ - public void exportDictExcel(List dicts, HttpServletResponse response) throws IOException { - List> list = new ArrayList<>(); - for (SystemDictTb dict : dicts) { - List dictDetails = systemDictDetailService.queryDictDetailByName(dict.getName()); - if (CollectionUtil.isNotEmpty(dictDetails)) { - for (SystemDictDetailTb dictDetail : dictDetails) { - Map map = new LinkedHashMap<>(); - map.put("字典名称", dict.getName()); - map.put("字典描述", dict.getDescription()); - map.put("字典标签", dictDetail.getLabel()); - map.put("字典值", dictDetail.getValue()); - map.put("创建日期", dictDetail.getCreateTime()); - list.add(map); - } - } else { - Map map = new LinkedHashMap<>(); - map.put("字典名称", dict.getName()); - map.put("字典描述", dict.getDescription()); - map.put("字典标签", null); - map.put("字典值", null); - map.put("创建日期", dict.getCreateTime()); - list.add(map); - } + /** + * 创建 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void saveDict(SystemCreateDictArgs args) { + systemDictMapper.insert(BeanUtil.copyProperties(args, SystemDictTb.class)); } - KitFileUtil.downloadExcel(list, response); - } - /** - * 分页查询 - * - * @param args 条件 - * @param page 分页参数 - * @return / - */ - public KitPageResult queryDictByArgs(SystemQueryDictArgs args, Page page) { - return KitPageUtil.toPage(systemDictMapper.selectDictByArgs(args, page)); - } + /** + * 编辑 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateDictById(SystemDictTb args) { + SystemDictTb dict = systemDictMapper.selectById(args.getId()); + dict.setName(args.getName()); + dict.setDescription(args.getDescription()); + systemDictMapper.insertOrUpdate(dict); + } - /** - * 查询全部数据 - * - * @param args / - * @return / - */ - public List queryDictByArgs(SystemQueryDictArgs args) { - return systemDictMapper.selectDictByArgs(args); - } + /** + * 删除 + * + * @param ids / + */ + @Transactional(rollbackFor = Exception.class) + public void deleteDictByIds(Set ids) { + // 删除字典 + systemDictMapper.deleteByIds(ids); + // 删除字典详情 + systemDictDetailService.deleteDictDetailByDictIds(ids); + } - public SystemDictTb getById(int id) { - return systemDictMapper.selectById(id); - } + /** + * 导出数据 + * + * @param dicts 待导出的数据 + * @param response / + * @throws IOException / + */ + public void exportDictExcel(List dicts, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (SystemDictTb dict : dicts) { + List dictDetails = systemDictDetailService.listDictDetailByName(dict.getName()); + if (CollectionUtil.isNotEmpty(dictDetails)) { + for (SystemDictDetailTb dictDetail : dictDetails) { + Map map = new LinkedHashMap<>(); + map.put("字典名称", dict.getName()); + map.put("字典描述", dict.getDescription()); + map.put("字典标签", dictDetail.getLabel()); + map.put("字典值", dictDetail.getValue()); + map.put("创建日期", dictDetail.getCreateTime()); + list.add(map); + } + } else { + Map map = new LinkedHashMap<>(); + map.put("字典名称", dict.getName()); + map.put("字典描述", dict.getDescription()); + map.put("字典标签", null); + map.put("字典值", null); + map.put("创建日期", dict.getCreateTime()); + list.add(map); + } + } + KitFileUtil.downloadExcel(list, response); + } + + /** + * 分页查询 + * + * @param args 条件 + * @param page 分页参数 + * @return / + */ + public KitPageResult searchDict(SystemQueryDictArgs args, Page page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + injectQueryParams(args, wrapper); + Page selectPage = systemDictMapper.selectPage(page, wrapper); + return KitPageUtil.toPage(selectPage); + } + + private void injectQueryParams(SystemQueryDictArgs args, LambdaQueryWrapper wrapper) { + if (args != null) { + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or() + .like(SystemDictTb::getDescription, args.getBlurry())); + } + } + + public List queryDictByArgs(SystemQueryDictArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + injectQueryParams(args, wrapper); + return systemDictMapper.selectList(wrapper); + } } 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 afbf6abd..94cb4afa 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 @@ -39,118 +39,114 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemEmailService { - @Autowired - private SystemEmailConfigMapper systemEmailConfigMapper; - @Autowired - private KitRedisHelper redisHelper; - @Autowired - private AppProperties properties; - @Value("${spring.application.title}") - private String applicationTitle; + @Autowired private SystemEmailConfigMapper systemEmailConfigMapper; + @Autowired private KitRedisHelper redisHelper; + @Autowired private AppProperties properties; + @Value("${spring.application.title}") private String applicationTitle; - /** - * 更新邮件配置 - * - * @param emailConfig 邮箱配置 - */ - @Transactional(rollbackFor = Exception.class) - public void modifyEmailConfig(SystemEmailConfigTb emailConfig) throws Exception { - SystemEmailConfigTb systemEmailConfigTb = getLastEmailConfig(); - if (!emailConfig.getPassword().equals(systemEmailConfigTb.getPassword())) { - // 对称加密 - systemEmailConfigTb.setPassword(KitDesEncryptUtil.desEncrypt(emailConfig.getPassword())); + /** + * 更新邮件配置 + * + * @param emailConfig 邮箱配置 + */ + @Transactional(rollbackFor = Exception.class) + public void updateEmailConfigById(SystemEmailConfigTb emailConfig) throws Exception { + SystemEmailConfigTb systemEmailConfigTb = getLastEmailConfig(); + if (!emailConfig.getPassword().equals(systemEmailConfigTb.getPassword())) { + // 对称加密 + systemEmailConfigTb.setPassword(KitDesEncryptUtil.desEncrypt(emailConfig.getPassword())); + } + systemEmailConfigTb.setId(1L); + systemEmailConfigMapper.insertOrUpdate(systemEmailConfigTb); } - systemEmailConfigTb.setId(1L); - systemEmailConfigMapper.insertOrUpdate(systemEmailConfigTb); - } - /** - * 发送邮件 - * - * @param sendEmailRequest 邮件发送的内容 - */ - public void sendEmail(SystemSendEmailArgs sendEmailRequest) { - SystemEmailConfigTb systemEmailConfigTb = getLastEmailConfig(); - if (systemEmailConfigTb.getId() == null) { - throw new BadRequestException("请先配置, 再操作"); + /** + * 发送邮件 + * + * @param sendEmailRequest 邮件发送的内容 + */ + public void sendEmail(SystemSendEmailArgs sendEmailRequest) { + SystemEmailConfigTb systemEmailConfigTb = getLastEmailConfig(); + if (systemEmailConfigTb.getId() == null) { + throw new BadRequestException("请先配置, 再操作"); + } + // 封装 + MailAccount account = new MailAccount(); + // 设置用户 + String user = systemEmailConfigTb.getFromUser().split("@")[0]; + account.setUser(user); + account.setHost(systemEmailConfigTb.getHost()); + account.setPort(Integer.parseInt(systemEmailConfigTb.getPort())); + account.setAuth(true); + try { + // 对称解密 + account.setPass(KitDesEncryptUtil.desDecrypt(systemEmailConfigTb.getPassword())); + } catch (Exception e) { + throw new BadRequestException(e.getMessage()); + } + account.setFrom(systemEmailConfigTb.getUser() + "<" + systemEmailConfigTb.getFromUser() + ">"); + // ssl方式发送 + account.setSslEnable(true); + // 使用STARTTLS安全连接 + account.setStarttlsEnable(true); + // 解决jdk8之后默认禁用部分tls协议, 导致邮件发送失败的问题 + account.setSslProtocols("TLSv1 TLSv1.1 TLSv1.2"); + String content = sendEmailRequest.getContent(); + // 发送 + try { + int size = sendEmailRequest.getTos().size(); + Mail.create(account).setTos(sendEmailRequest.getTos().toArray(new String[size])) + .setTitle(sendEmailRequest.getSubject()).setContent(content).setHtml(true) + // 关闭session + .setUseGlobalSession(false).send(); + } catch (Exception e) { + log.error("邮件发送失败", e); + throw new BadRequestException("邮件发送失败"); + } } - // 封装 - MailAccount account = new MailAccount(); - // 设置用户 - String user = systemEmailConfigTb.getFromUser().split("@")[0]; - account.setUser(user); - account.setHost(systemEmailConfigTb.getHost()); - account.setPort(Integer.parseInt(systemEmailConfigTb.getPort())); - account.setAuth(true); - try { - // 对称解密 - account.setPass(KitDesEncryptUtil.desDecrypt(systemEmailConfigTb.getPassword())); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); - } - account.setFrom(systemEmailConfigTb.getUser() + "<" + systemEmailConfigTb.getFromUser() + ">"); - // ssl方式发送 - account.setSslEnable(true); - // 使用STARTTLS安全连接 - account.setStarttlsEnable(true); - // 解决jdk8之后默认禁用部分tls协议, 导致邮件发送失败的问题 - account.setSslProtocols("TLSv1 TLSv1.1 TLSv1.2"); - String content = sendEmailRequest.getContent(); - // 发送 - try { - int size = sendEmailRequest.getTos().size(); - Mail.create(account).setTos(sendEmailRequest.getTos().toArray(new String[size])) - .setTitle(sendEmailRequest.getSubject()).setContent(content).setHtml(true) - // 关闭session - .setUseGlobalSession(false).send(); - } catch (Exception e) { - log.error("邮件发送失败", e); - throw new BadRequestException("邮件发送失败"); - } - } - /** - * 校验邮箱验证码 - */ - public void checkEmailCaptcha(SystemCaptchaBizEnum biEnum, String email, String code) { - String redisKey = biEnum.getRedisKey() + email; - String value = redisHelper.get(redisKey, String.class); - if (value == null || !value.equals(code)) { - throw new BadRequestException("无效验证码"); - } else { - redisHelper.del(redisKey); + /** + * 校验邮箱验证码 + */ + public void checkEmailCaptcha(SystemCaptchaBizEnum biEnum, String email, String code) { + String redisKey = biEnum.getRedisKey() + email; + String value = redisHelper.get(redisKey, String.class); + if (value == null || !value.equals(code)) { + throw new BadRequestException("无效验证码"); + } else { + redisHelper.del(redisKey); + } } - } - /** - * 发送给邮箱验证码 - */ - public void sendCaptcha(SystemCaptchaBizEnum biEnum, String email) { - if (biEnum == null) { - throw new BadRequestException("biEnum必填"); + /** + * 发送给邮箱验证码 + */ + public void sendCaptcha(SystemCaptchaBizEnum biEnum, String email) { + if (biEnum == null) { + throw new BadRequestException("biEnum必填"); + } + String content; + String redisKey = biEnum.getRedisKey() + email; + String oldCode = redisHelper.get(redisKey, String.class); + if (oldCode == null) { + String code = RandomUtil.randomNumbers(6); + // 存入缓存 + if (!redisHelper.set(redisKey, code, properties.getCaptcha().getExpireTime())) { + throw new BadRequestException("服务异常, 请联系网站负责人"); + } + // 存在就再次发送原来的验证码 + content = KitResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", code)); + } else { + content = + KitResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", oldCode)); + } + SystemSendEmailArgs sendEmailRequest = + new SystemSendEmailArgs(Collections.singletonList(email), applicationTitle, content); + sendEmail(sendEmailRequest); } - String content; - String redisKey = biEnum.getRedisKey() + email; - String oldCode = redisHelper.get(redisKey, String.class); - if (oldCode == null) { - String code = RandomUtil.randomNumbers(6); - // 存入缓存 - if (!redisHelper.set(redisKey, code, properties.getCaptcha().getExpireTime())) { - throw new BadRequestException("服务异常, 请联系网站负责人"); - } - // 存在就再次发送原来的验证码 - content = KitResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", code)); - } else { - content = - KitResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", oldCode)); - } - SystemSendEmailArgs sendEmailRequest = - new SystemSendEmailArgs(Collections.singletonList(email), applicationTitle, content); - sendEmail(sendEmailRequest); - } - public SystemEmailConfigTb getLastEmailConfig() { - SystemEmailConfigTb systemEmailConfigTb = systemEmailConfigMapper.selectById(1L); - return systemEmailConfigTb == null ? new SystemEmailConfigTb() : systemEmailConfigTb; - } + public SystemEmailConfigTb getLastEmailConfig() { + SystemEmailConfigTb systemEmailConfigTb = systemEmailConfigMapper.selectById(1L); + return systemEmailConfigTb == null ? new SystemEmailConfigTb() : systemEmailConfigTb; + } } 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 6ca705ad..669b7cd3 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 @@ -16,23 +16,25 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.model.SystemCreateJobArgs; import cn.odboy.system.dal.model.SystemQueryJobArgs; import cn.odboy.system.dal.mysql.SystemJobMapper; -import cn.odboy.system.dal.mysql.SystemUserMapper; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; 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; @@ -40,99 +42,114 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemJobService { - @Autowired - private SystemJobMapper systemJobMapper; - @Autowired - private SystemUserMapper systemUserMapper; + @Autowired private SystemJobMapper systemJobMapper; + @Autowired private SystemUserService systemUserService; - /** - * 创建 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void saveJob(SystemCreateJobArgs args) { - SystemJobTb job = systemJobMapper.getJobByName(args.getName()); - if (job != null) { - throw new BadRequestException("职位名称已存在"); + /** + * 创建 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void saveJob(SystemCreateJobArgs args) { + SystemJobTb job = this.getJobByName(args.getName()); + if (job != null) { + throw new BadRequestException("职位名称已存在"); + } + systemJobMapper.insert(BeanUtil.copyProperties(args, SystemJobTb.class)); } - systemJobMapper.insert(BeanUtil.copyProperties(args, SystemJobTb.class)); - } - /** - * 编辑 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyJobById(SystemJobTb args) { - SystemJobTb job = systemJobMapper.selectById(args.getId()); - SystemJobTb old = systemJobMapper.getJobByName(args.getName()); - if (old != null && !old.getId().equals(args.getId())) { - throw new BadRequestException("职位名称已存在"); + /** + * 编辑 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateJobById(SystemJobTb args) { + SystemJobTb job = systemJobMapper.selectById(args.getId()); + SystemJobTb old = this.getJobByName(args.getName()); + if (old != null && !old.getId().equals(args.getId())) { + throw new BadRequestException("职位名称已存在"); + } + args.setId(job.getId()); + systemJobMapper.insertOrUpdate(args); } - args.setId(job.getId()); - systemJobMapper.insertOrUpdate(args); - } - /** - * 删除 - * - * @param ids / - */ - @Transactional(rollbackFor = Exception.class) - public void removeJobByIds(Set ids) { - systemJobMapper.deleteByIds(ids); - } - - /** - * 导出数据 - * - * @param jobs 待导出的数据 - * @param response / - * @throws IOException - */ - public void exportJobExcel(List jobs, HttpServletResponse response) throws IOException { - List> list = new ArrayList<>(); - for (SystemJobTb job : jobs) { - Map map = new LinkedHashMap<>(); - map.put("岗位名称", job.getName()); - map.put("岗位状态", job.getEnabled() ? "启用" : "停用"); - map.put("创建日期", job.getCreateTime()); - list.add(map); + /** + * 删除 + * + * @param ids / + */ + @Transactional(rollbackFor = Exception.class) + public void deleteJobByIds(Set ids) { + systemJobMapper.deleteByIds(ids); } - KitFileUtil.downloadExcel(list, response); - } - /** - * 分页查询 - * - * @param args 条件 - * @param page 分页参数 - * @return - */ - public KitPageResult queryJobByArgs(SystemQueryJobArgs args, Page page) { - return KitPageUtil.toPage(systemJobMapper.selectJobByArgs(args, page)); - } + /** + * 导出数据 + * + * @param jobs 待导出的数据 + * @param response / + */ + public void exportJobExcel(List jobs, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (SystemJobTb job : jobs) { + Map map = new LinkedHashMap<>(); + map.put("岗位名称", job.getName()); + map.put("岗位状态", job.getEnabled() ? "启用" : "停用"); + map.put("创建日期", job.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); + } - /** - * 查询全部数据 - * - * @param args / - * @return / - */ - public List queryJobByArgs(SystemQueryJobArgs args) { - return systemJobMapper.selectJobByArgs(args); - } + /** + * 分页查询 + * + * @param args 条件 + * @param page 分页参数 + */ + public KitPageResult searchJobByArgs(SystemQueryJobArgs args, Page page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQueryParams(args, wrapper); + Page selectPage = systemJobMapper.selectPage(page, wrapper); + return KitPageUtil.toPage(selectPage); + } - /** - * 验证是否被用户关联 - * - * @param ids / - */ - public void verifyBindRelationByIds(Set ids) { - if (systemUserMapper.countUserByJobIds(ids) > 0) { - throw new BadRequestException("所选的岗位中存在用户关联, 请解除关联再试！"); + /** + * 查询全部数据 + */ + public List queryJobByArgs(SystemQueryJobArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQueryParams(args, wrapper); + return systemJobMapper.selectList(wrapper); + } + + /** + * 验证是否被用户关联 + * + * @param ids / + */ + public void verifyBindRelationByIds(Set ids) { + if (systemUserService.countUserByJobIds(ids) > 0) { + throw new BadRequestException("所选的岗位中存在用户关联, 请解除关联再试！"); + } + } + + public SystemJobTb getJobByName(String name) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemJobTb::getName, name); + return systemJobMapper.selectOne(wrapper); + } + + public void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper wrapper) { + if (args != null) { + wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName()); + wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled()); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + } + } + wrapper.orderByDesc(SystemJobTb::getJobSort, SystemJobTb::getId); } - } } 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 a4a99df9..bfb43f62 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 @@ -15,6 +15,7 @@ */ package cn.odboy.system.service; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IORuntimeException; @@ -28,7 +29,9 @@ import cn.odboy.system.dal.model.SystemQueryStorageArgs; import cn.odboy.system.dal.mysql.SystemLocalStorageMapper; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -36,7 +39,6 @@ import java.util.Date; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,123 +47,134 @@ import org.springframework.web.multipart.MultipartFile; @Service public class SystemLocalStorageService { - @Autowired - private SystemLocalStorageMapper systemLocalStorageMapper; - @Autowired - private KitFileLocalUploadHelper fileUploadPathHelper; - @Autowired - private AppProperties properties; + @Autowired private SystemLocalStorageMapper systemLocalStorageMapper; + @Autowired private KitFileLocalUploadHelper fileUploadPathHelper; + @Autowired private AppProperties properties; - /** - * 上传 - * - * @param name 文件名称 - * @param multipartFile 文件 - * @return / - */ - @Transactional(rollbackFor = Exception.class) - public SystemLocalStorageTb uploadFile(String name, MultipartFile multipartFile) { - long size = multipartFile.getSize(); - KitFileUtil.checkSize(properties.getOss().getMaxSize(), size); - String suffix = KitFileUtil.getSuffix(multipartFile.getOriginalFilename()); - String type = KitFileUtil.getFileType(suffix); - String uploadDateStr = DateUtil.format(new Date(), DatePattern.PURE_DATE_FORMAT); - File file = KitFileUtil.upload(multipartFile, fileUploadPathHelper.getPath() + uploadDateStr + File.separator); - if (file == null) { - throw new BadRequestException("上传失败"); + /** + * 上传 + * + * @param name 文件名称 + * @param multipartFile 文件 + * @return / + */ + @Transactional(rollbackFor = Exception.class) + public SystemLocalStorageTb uploadFile(String name, MultipartFile multipartFile) { + long size = multipartFile.getSize(); + KitFileUtil.checkSize(properties.getOss().getMaxSize(), size); + String suffix = KitFileUtil.getSuffix(multipartFile.getOriginalFilename()); + String type = KitFileUtil.getFileType(suffix); + String uploadDateStr = DateUtil.format(new Date(), DatePattern.PURE_DATE_FORMAT); + File file = KitFileUtil.upload(multipartFile, fileUploadPathHelper.getPath() + uploadDateStr + File.separator); + if (file == null) { + throw new BadRequestException("上传失败"); + } + try { + String formatSize = KitFileUtil.getSize(size); + String prefixName = + StrUtil.isBlank(name) ? KitFileUtil.getPrefix(multipartFile.getOriginalFilename()) : name; + SystemLocalStorageTb localStorage = new SystemLocalStorageTb(); + localStorage.setRealName(file.getName()); + localStorage.setName(prefixName); + localStorage.setSuffix(suffix); + localStorage.setPath(file.getPath()); + localStorage.setType(type); + localStorage.setSize(formatSize); + localStorage.setDateGroup(uploadDateStr); + systemLocalStorageMapper.insert(localStorage); + return localStorage; + } catch (Exception e) { + KitFileUtil.del(file); + throw e; + } } - try { - String formatSize = KitFileUtil.getSize(size); - String prefixName = - StrUtil.isBlank(name) ? KitFileUtil.getPrefix(multipartFile.getOriginalFilename()) : name; - SystemLocalStorageTb localStorage = new SystemLocalStorageTb(); - localStorage.setRealName(file.getName()); - localStorage.setName(prefixName); - localStorage.setSuffix(suffix); - localStorage.setPath(file.getPath()); - localStorage.setType(type); - localStorage.setSize(formatSize); - localStorage.setDateGroup(uploadDateStr); - systemLocalStorageMapper.insert(localStorage); - return localStorage; - } catch (Exception e) { - KitFileUtil.del(file); - throw e; + + /** + * 编辑 + * + * @param args 文件信息 + */ + @Transactional(rollbackFor = Exception.class) + public void updateLocalStorageById(SystemLocalStorageTb args) { + SystemLocalStorageTb localStorage = systemLocalStorageMapper.selectById(args.getId()); + localStorage.copy(args); + systemLocalStorageMapper.insertOrUpdate(localStorage); } - } - /** - * 编辑 - * - * @param args 文件信息 - */ - @Transactional(rollbackFor = Exception.class) - public void modifyLocalStorageById(SystemLocalStorageTb args) { - SystemLocalStorageTb localStorage = systemLocalStorageMapper.selectById(args.getId()); - localStorage.copy(args); - systemLocalStorageMapper.insertOrUpdate(localStorage); - } - - /** - * 多选删除 - * - * @param ids / - */ - @Transactional(rollbackFor = Exception.class) - public void removeFileByIds(Long[] ids) { - for (Long id : ids) { - SystemLocalStorageTb storage = systemLocalStorageMapper.selectById(id); - try { - KitFileUtil.del(storage.getPath()); - systemLocalStorageMapper.deleteById(storage); - } catch (IORuntimeException e) { - throw new BadRequestException("删除文件 " + storage.getName() + " 失败"); - } + /** + * 多选删除 + * + * @param ids / + */ + @Transactional(rollbackFor = Exception.class) + public void deleteFileByIds(Long[] ids) { + for (Long id : ids) { + SystemLocalStorageTb storage = systemLocalStorageMapper.selectById(id); + try { + KitFileUtil.del(storage.getPath()); + systemLocalStorageMapper.deleteById(storage); + } catch (IORuntimeException e) { + throw new BadRequestException("删除文件 " + storage.getName() + " 失败"); + } + } } - } - /** - * 导出数据 - * - * @param localStorages 待导出的数据 - * @param response / - * @throws IOException / - */ - public void exportLocalStorageExcel(List localStorages, HttpServletResponse response) - throws IOException { - List> list = new ArrayList<>(); - for (SystemLocalStorageTb localStorage : localStorages) { - Map map = new LinkedHashMap<>(); - map.put("文件名", localStorage.getRealName()); - map.put("备注名", localStorage.getName()); - map.put("文件类型", localStorage.getType()); - map.put("文件大小", localStorage.getSize()); - map.put("创建者", localStorage.getCreateBy()); - map.put("创建日期", localStorage.getCreateTime()); - list.add(map); + /** + * 导出数据 + * + * @param localStorages 待导出的数据 + * @param response / + * @throws IOException / + */ + public void exportLocalStorageExcel(List localStorages, HttpServletResponse response) + throws IOException { + List> list = new ArrayList<>(); + for (SystemLocalStorageTb localStorage : localStorages) { + Map map = new LinkedHashMap<>(); + map.put("文件名", localStorage.getRealName()); + map.put("备注名", localStorage.getName()); + map.put("文件类型", localStorage.getType()); + map.put("文件大小", localStorage.getSize()); + map.put("创建者", localStorage.getCreateBy()); + map.put("创建日期", localStorage.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); } - KitFileUtil.downloadExcel(list, response); - } - /** - * 分页查询 - * - * @param criteria 条件 - * @param page 分页参数 - * @return / - */ - public KitPageResult queryLocalStorage(SystemQueryStorageArgs criteria, - Page page) { - return KitPageUtil.toPage(systemLocalStorageMapper.selectLocalStorageByArgs(criteria, page)); - } + /** + * 分页查询 + * + * @param args 条件 + * @param page 分页参数 + * @return / + */ + public KitPageResult searchLocalStorage(SystemQueryStorageArgs args, + Page page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQueryParams(args, wrapper); + Page selectPage = systemLocalStorageMapper.selectPage(page, wrapper); + return KitPageUtil.toPage(selectPage); + } - /** - * 查询全部数据 - * - * @param criteria 条件 - * @return / - */ - public List queryLocalStorage(SystemQueryStorageArgs criteria) { - return systemLocalStorageMapper.selectLocalStorageByArgs(criteria); - } + private void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper wrapper) { + if (args != null) { + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), + c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or() + .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or() + .like(SystemLocalStorageTb::getType, args.getBlurry()).or() + .like(SystemLocalStorageTb::getCreateBy, args.getBlurry())); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0), + args.getCreateTime().get(1)); + } + } + wrapper.orderByDesc(SystemLocalStorageTb::getId); + } + + public List queryLocalStorageByArgs(SystemQueryStorageArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQueryParams(args, wrapper); + return systemLocalStorageMapper.selectList(wrapper); + } } 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 0c9fdbf8..f29f7fbf 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 @@ -34,6 +34,8 @@ import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; import cn.odboy.util.KitClassUtil; import cn.odboy.util.KitFileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; @@ -45,7 +47,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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -53,355 +54,398 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemMenuService { - private static final String YES_STR = "是"; - private static final String NO_STR = "否"; - @Autowired - private SystemMenuMapper systemMenuMapper; - @Autowired - private SystemRoleMenuMapper systemRoleMenuMapper; - @Autowired - private SystemRoleService systemRoleService; - @Autowired - private SystemRoleMenuService systemRoleMenuService; + private static final String YES_STR = "是"; + private static final String NO_STR = "否"; + @Autowired private SystemMenuMapper systemMenuMapper; + @Autowired private SystemRoleMenuMapper systemRoleMenuMapper; + @Autowired private SystemRoleService systemRoleService; + @Autowired private SystemRoleMenuService systemRoleMenuService; - /** - * 创建 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void saveMenu(SystemMenuTb args) { - if (systemMenuMapper.getMenuByTitle(args.getTitle()) != null) { - throw new BadRequestException("菜单标题已存在"); - } - if (StrUtil.isNotBlank(args.getComponentName())) { - if (systemMenuMapper.getMenuByComponentName(args.getComponentName()) != null) { - throw new BadRequestException("菜单组件名称已存在"); - } - } - if (Long.valueOf(0L).equals(args.getPid())) { - args.setPid(null); - } - if (args.getIFrame()) { - if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || - args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { - throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); - } - } - systemMenuMapper.insert(args); - // 计算子节点数目 - args.setSubCount(0); - // 更新父节点菜单数目 - this.updateMenuSubCnt(args.getPid()); - } - - /** - * 编辑 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyMenuById(SystemMenuTb args) { - if (args.getId().equals(args.getPid())) { - throw new BadRequestException("上级不能为自己"); - } - SystemMenuTb menu = systemMenuMapper.selectById(args.getId()); - if (args.getIFrame()) { - if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || - args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { - throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); - } - } - SystemMenuTb menu1 = systemMenuMapper.getMenuByTitle(args.getTitle()); - if (menu1 != null && !menu1.getId().equals(menu.getId())) { - throw new BadRequestException("菜单标题已存在"); - } - if (args.getPid().equals(0L)) { - args.setPid(null); - } - // 记录的父节点ID - Long oldPid = menu.getPid(); - Long newPid = args.getPid(); - if (StrUtil.isNotBlank(args.getComponentName())) { - menu1 = systemMenuMapper.getMenuByComponentName(args.getComponentName()); - if (menu1 != null && !menu1.getId().equals(menu.getId())) { - throw new BadRequestException("菜单组件名称已存在"); - } - } - menu.setTitle(args.getTitle()); - menu.setComponent(args.getComponent()); - menu.setPath(args.getPath()); - menu.setIcon(args.getIcon()); - menu.setIFrame(args.getIFrame()); - menu.setPid(args.getPid()); - menu.setMenuSort(args.getMenuSort()); - menu.setCache(args.getCache()); - menu.setHidden(args.getHidden()); - menu.setComponentName(args.getComponentName()); - menu.setPermission(args.getPermission()); - menu.setType(args.getType()); - // auto fill - menu.setUpdateBy(null); - menu.setUpdateTime(null); - systemMenuMapper.insertOrUpdate(menu); - // 计算父级菜单节点数目 - this.updateMenuSubCnt(oldPid); - this.updateMenuSubCnt(newPid); - } - - /** - * 删除 - */ - @Transactional(rollbackFor = Exception.class) - public void removeMenuByIds(Set ids) { - Set menuSet = new HashSet<>(); - for (Long id : ids) { - List menuList = this.queryMenuByPid(id); - menuSet.add(systemMenuMapper.selectById(id)); - menuSet = this.queryChildMenu(menuList, menuSet); - } - List menuIds = - menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); - if (CollUtil.isNotEmpty(menuIds)) { - KitSpringBeanHolder.getBean(SystemMenuService.class).removeRoleMenuByMenuIds(menuIds); - systemMenuMapper.deleteByIds(menuIds); - } - for (SystemMenuTb menu : menuSet) { - this.updateMenuSubCnt(menu.getPid()); - } - } - - @Transactional(rollbackFor = Exception.class) - public void removeRoleMenuByMenuIds(List menuIds) { - if (CollUtil.isNotEmpty(menuIds)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemRoleMenuTb::getMenuId, menuIds); - systemRoleMenuMapper.delete(wrapper); - } - } - - /** - * 导出 - * - * @param menus 待导出的数据 - * @param response / - * @throws IOException / - */ - public void exportMenuExcel(List menus, HttpServletResponse response) throws IOException { - List> list = new ArrayList<>(); - for (SystemMenuTb menu : menus) { - Map map = new LinkedHashMap<>(); - map.put("菜单标题", menu.getTitle()); - map.put("菜单类型", menu.getType() == null ? "目录" : menu.getType() == 1 ? "菜单" : "按钮"); - map.put("权限标识", menu.getPermission()); - map.put("外链菜单", menu.getIFrame() ? YES_STR : NO_STR); - map.put("菜单可见", menu.getHidden() ? NO_STR : YES_STR); - map.put("是否缓存", menu.getCache() ? YES_STR : NO_STR); - map.put("创建日期", menu.getCreateTime()); - list.add(map); - } - KitFileUtil.downloadExcel(list, response); - } - - @Transactional(rollbackFor = Exception.class) - public void updateMenuSubCnt(Long menuId) { - if (menuId != null) { - long count = systemMenuMapper.countMenuByPid(menuId); - systemMenuMapper.updateMenuSubCntByMenuId(count, menuId); - } - } - - /** - * 查询全部数据 - * - * @param criteria 条件 - * @param isQuery / - * @return / - * @throws Exception / - */ - public List queryAllMenu(SystemQueryMenuArgs criteria, Boolean isQuery) throws Exception { - if (Boolean.TRUE.equals(isQuery)) { - criteria.setPidIsNull(true); - List fields = KitClassUtil.getAllFields(criteria.getClass(), new ArrayList<>()); - for (Field field : fields) { - //设置对象的访问权限, 保证对private的属性的访问 - field.setAccessible(true); - Object val = field.get(criteria); - if ("pidIsNull".equals(field.getName())) { - continue; + /** + * 创建 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void saveMenu(SystemMenuTb args) { + if (this.getMenuByTitle(args.getTitle()) != null) { + throw new BadRequestException("菜单标题已存在"); } - // 如果有查询条件, 则不指定pidIsNull - if (ObjectUtil.isNotNull(val)) { - criteria.setPidIsNull(null); - break; + if (StrUtil.isNotBlank(args.getComponentName())) { + if (this.getMenuByComponentName(args.getComponentName()) != null) { + throw new BadRequestException("菜单组件名称已存在"); + } } - } - } - return systemMenuMapper.selectMenuByArgs(criteria); - } - - /** - * 根据当前用户获取菜单 - * - * @param currentUserId / - * @return / - */ - public List queryMenuListByUserId(Long currentUserId) { - List roles = systemRoleService.queryRoleByUsersId(currentUserId); - Set roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet()); - return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIdsAndType(roleIds, 2)); - } - - /** - * 获取所有子节点, 包含自身ID - * - * @param menuList / - * @param menuSet / - * @return / - */ - public Set queryChildMenu(List menuList, Set menuSet) { - for (SystemMenuTb menu : menuList) { - menuSet.add(menu); - List menus = systemMenuMapper.selectMenuByPid(menu.getId()); - if (CollUtil.isNotEmpty(menus)) { - queryChildMenu(menus, menuSet); - } - } - return menuSet; - } - - /** - * 懒加载菜单数据 - * - * @param pid / - * @return / - */ - public List queryMenuByPid(Long pid) { - List menus; - if (pid != null && !pid.equals(0L)) { - menus = systemMenuMapper.selectMenuByPid(pid); - } else { - menus = systemMenuMapper.selectMenuByPidIsNull(); - } - return menus; - } - - /** - * 根据ID获取同级与上级数据 - * - * @param menu / - * @param menus / - * @return / - */ - public List querySuperiorMenuList(SystemMenuTb menu, List menus) { - if (menu.getPid() == null) { - menus.addAll(systemMenuMapper.selectMenuByPidIsNull()); - return menus; - } - menus.addAll(systemMenuMapper.selectMenuByPid(menu.getPid())); - return querySuperiorMenuList(systemMenuMapper.selectById(menu.getPid()), menus); - } - - /** - * 构建菜单树 - * - * @param menus 原始数据 - * @return / - */ - public List buildMenuTree(List menus) { - List trees = new ArrayList<>(); - Set ids = new HashSet<>(); - for (SystemMenuTb menu : menus) { - if (menu.getPid() == null) { - trees.add(menu); - } - for (SystemMenuTb it : menus) { - if (menu.getId().equals(it.getPid())) { - if (menu.getChildren() == null) { - menu.setChildren(new ArrayList<>()); - } - menu.getChildren().add(it); - ids.add(it.getId()); + if (Long.valueOf(0L).equals(args.getPid())) { + args.setPid(null); } - } + if (args.getIFrame()) { + if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || + args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { + throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); + } + } + systemMenuMapper.insert(args); + // 计算子节点数目 + args.setSubCount(0); + // 更新父节点菜单数目 + this.updateMenuSubCnt(args.getPid()); } - if (CollUtil.isNotEmpty(trees)) { - trees = menus.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); - } - return trees; - } - /** - * 构建菜单树 - * - * @param menus / - * @return / - */ - public List buildMenuVo(List menus) { - List list = new LinkedList<>(); - menus.forEach(menu -> { - if (menu != null) { - List menuList = menu.getChildren(); - SystemMenuVo menuVo = new SystemMenuVo(); - menuVo.setName( - ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle()); - // 一级目录需要加斜杠, 不然会报警告 - menuVo.setPath(menu.getPid() == null ? "/" + menu.getPath() : menu.getPath()); - menuVo.setHidden(menu.getHidden()); - // 如果不是外链 + /** + * 编辑 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateMenuById(SystemMenuTb args) { + if (args.getId().equals(args.getPid())) { + throw new BadRequestException("上级不能为自己"); + } + SystemMenuTb menu = systemMenuMapper.selectById(args.getId()); + if (args.getIFrame()) { + if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || + args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { + throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); + } + } + SystemMenuTb menu1 = this.getMenuByTitle(args.getTitle()); + if (menu1 != null && !menu1.getId().equals(menu.getId())) { + throw new BadRequestException("菜单标题已存在"); + } + if (args.getPid().equals(0L)) { + args.setPid(null); + } + // 记录的父节点ID + 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())) { + throw new BadRequestException("菜单组件名称已存在"); + } + } + menu.setTitle(args.getTitle()); + menu.setComponent(args.getComponent()); + menu.setPath(args.getPath()); + menu.setIcon(args.getIcon()); + menu.setIFrame(args.getIFrame()); + menu.setPid(args.getPid()); + menu.setMenuSort(args.getMenuSort()); + menu.setCache(args.getCache()); + menu.setHidden(args.getHidden()); + menu.setComponentName(args.getComponentName()); + menu.setPermission(args.getPermission()); + menu.setType(args.getType()); + // auto fill + menu.setUpdateBy(null); + menu.setUpdateTime(null); + systemMenuMapper.insertOrUpdate(menu); + // 计算父级菜单节点数目 + this.updateMenuSubCnt(oldPid); + this.updateMenuSubCnt(newPid); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void deleteMenuByIds(Set ids) { + Set menuSet = new HashSet<>(); + for (Long id : ids) { + List menuList = this.listMenuByPid(id); + menuSet.add(systemMenuMapper.selectById(id)); + menuSet = this.queryChildMenuByArgs(menuList, menuSet); + } + List menuIds = + menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + if (CollUtil.isNotEmpty(menuIds)) { + KitSpringBeanHolder.getBean(SystemMenuService.class).deleteRoleMenuByMenuIds(menuIds); + systemMenuMapper.deleteByIds(menuIds); + } + for (SystemMenuTb menu : menuSet) { + this.updateMenuSubCnt(menu.getPid()); + } + } + + @Transactional(rollbackFor = Exception.class) + public void deleteRoleMenuByMenuIds(List menuIds) { + if (CollUtil.isNotEmpty(menuIds)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemRoleMenuTb::getMenuId, menuIds); + systemRoleMenuMapper.delete(wrapper); + } + } + + /** + * 导出 + * + * @param menus 待导出的数据 + * @param response / + * @throws IOException / + */ + public void exportMenuExcel(List menus, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (SystemMenuTb menu : menus) { + Map map = new LinkedHashMap<>(); + map.put("菜单标题", menu.getTitle()); + map.put("菜单类型", menu.getType() == null ? "目录" : menu.getType() == 1 ? "菜单" : "按钮"); + map.put("权限标识", menu.getPermission()); + map.put("外链菜单", menu.getIFrame() ? YES_STR : NO_STR); + map.put("菜单可见", menu.getHidden() ? NO_STR : YES_STR); + map.put("是否缓存", menu.getCache() ? YES_STR : NO_STR); + map.put("创建日期", menu.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); + } + + @Transactional(rollbackFor = Exception.class) + public void updateMenuSubCnt(Long menuId) { + if (menuId != null) { + long count = this.countMenuByPid(menuId); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SystemMenuTb::getId, menuId); + wrapper.set(SystemMenuTb::getSubCount, count); + systemMenuMapper.update(wrapper); + } + } + + /** + * 查询全部数据 + * + * @param args 条件 + * @param isQuery / + * @return / + * @throws Exception / + */ + public List queryAllMenu(SystemQueryMenuArgs args, Boolean isQuery) throws Exception { + if (Boolean.TRUE.equals(isQuery)) { + args.setPidIsNull(true); + List fields = KitClassUtil.getAllFields(args.getClass(), new ArrayList<>()); + for (Field field : fields) { + //设置对象的访问权限, 保证对private的属性的访问 + field.setAccessible(true); + Object val = field.get(args); + if ("pidIsNull".equals(field.getName())) { + continue; + } + // 如果有查询条件, 则不指定pidIsNull + if (ObjectUtil.isNotNull(val)) { + args.setPidIsNull(null); + break; + } + } + } + return this.queryMenuByArgs(args); + } + + /** + * 根据当前用户获取菜单 + * + * @param currentUserId / + * @return / + */ + public List listMenuByUserId(Long currentUserId) { + List roles = systemRoleService.queryRoleByUsersId(currentUserId); + Set roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet()); + return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds)); + } + + /** + * 获取所有子节点, 包含自身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; + } + + /** + * 懒加载菜单数据 + * + * @param pid / + * @return / + */ + 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 systemMenuMapper.selectList(wrapper); + } else { + menus = this.listRootMenu(); + } + return menus; + } + + /** + * 根据ID获取同级与上级数据 + * + * @param menu / + * @param menus / + * @return / + */ + 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(systemMenuMapper.selectById(menu.getPid()), menus); + } + + /** + * 构建菜单树 + * + * @param menus 原始数据 + * @return / + */ + public List buildMenuTree(List menus) { + List trees = new ArrayList<>(); + Set ids = new HashSet<>(); + for (SystemMenuTb menu : menus) { + if (menu.getPid() == null) { + trees.add(menu); + } + for (SystemMenuTb it : menus) { + if (menu.getId().equals(it.getPid())) { + if (menu.getChildren() == null) { + menu.setChildren(new ArrayList<>()); + } + menu.getChildren().add(it); + ids.add(it.getId()); + } + } + } + if (CollUtil.isNotEmpty(trees)) { + trees = menus.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); + } + return trees; + } + + /** + * 构建菜单树 + * + * @param menus / + * @return / + */ + public List buildMenuVo(List menus) { + List list = new LinkedList<>(); + menus.forEach(menu -> { + if (menu != null) { + List menuList = menu.getChildren(); + SystemMenuVo menuVo = new SystemMenuVo(); + menuVo.setName( + ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle()); + // 一级目录需要加斜杠, 不然会报警告 + menuVo.setPath(menu.getPid() == null ? "/" + menu.getPath() : menu.getPath()); + menuVo.setHidden(menu.getHidden()); + // 如果不是外链 + if (!menu.getIFrame()) { + if (menu.getPid() == null) { + menuVo.setComponent(StrUtil.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent()); + // 如果不是一级菜单，并且菜单类型为目录，则代表是多级菜单 + } else if (menu.getType() == 0) { + menuVo.setComponent(StrUtil.isEmpty(menu.getComponent()) ? "ParentView" : menu.getComponent()); + } else if (StrUtil.isNotBlank(menu.getComponent())) { + menuVo.setComponent(menu.getComponent()); + } + } + menuVo.setMeta(new SystemMenuMetaVo(menu.getTitle(), menu.getIcon(), !menu.getCache())); + if (CollectionUtil.isNotEmpty(menuList)) { + menuVo.setAlwaysShow(true); + menuVo.setRedirect("noredirect"); + menuVo.setChildren(buildMenuVo(menuList)); + // 处理是一级菜单并且没有子菜单的情况 + } else if (menu.getPid() == null) { + SystemMenuVo menuVo1 = getMenuVo(menu, menuVo); + menuVo.setName(null); + menuVo.setMeta(null); + menuVo.setComponent("Layout"); + List list1 = new ArrayList<>(); + list1.add(menuVo1); + menuVo.setChildren(list1); + } + list.add(menuVo); + } + }); + return list; + } + + /** + * 获取 MenuResponse + * + * @param menu / + * @param menuVo / + * @return / + */ + private SystemMenuVo getMenuVo(SystemMenuTb menu, SystemMenuVo menuVo) { + SystemMenuVo menuVo1 = new SystemMenuVo(); + menuVo1.setMeta(menuVo.getMeta()); + // 非外链 if (!menu.getIFrame()) { - if (menu.getPid() == null) { - menuVo.setComponent(StrUtil.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent()); - // 如果不是一级菜单，并且菜单类型为目录，则代表是多级菜单 - } else if (menu.getType() == 0) { - menuVo.setComponent(StrUtil.isEmpty(menu.getComponent()) ? "ParentView" : menu.getComponent()); - } else if (StrUtil.isNotBlank(menu.getComponent())) { - menuVo.setComponent(menu.getComponent()); - } + menuVo1.setPath("index"); + menuVo1.setName(menuVo.getName()); + menuVo1.setComponent(menuVo.getComponent()); + } else { + menuVo1.setPath(menu.getPath()); } - menuVo.setMeta(new SystemMenuMetaVo(menu.getTitle(), menu.getIcon(), !menu.getCache())); - if (CollectionUtil.isNotEmpty(menuList)) { - menuVo.setAlwaysShow(true); - menuVo.setRedirect("noredirect"); - menuVo.setChildren(buildMenuVo(menuList)); - // 处理是一级菜单并且没有子菜单的情况 - } else if (menu.getPid() == null) { - SystemMenuVo menuVo1 = getMenuVo(menu, menuVo); - menuVo.setName(null); - menuVo.setMeta(null); - menuVo.setComponent("Layout"); - List list1 = new ArrayList<>(); - list1.add(menuVo1); - menuVo.setChildren(list1); - } - list.add(menuVo); - } - }); - return list; - } - - /** - * 获取 MenuResponse - * - * @param menu / - * @param menuVo / - * @return / - */ - private SystemMenuVo getMenuVo(SystemMenuTb menu, SystemMenuVo menuVo) { - SystemMenuVo menuVo1 = new SystemMenuVo(); - menuVo1.setMeta(menuVo.getMeta()); - // 非外链 - if (!menu.getIFrame()) { - menuVo1.setPath("index"); - menuVo1.setName(menuVo.getName()); - menuVo1.setComponent(menuVo.getComponent()); - } else { - menuVo1.setPath(menu.getPath()); + return menuVo1; } - return menuVo1; - } - public List queryMenuByIds(List ids) { - return systemMenuMapper.selectByIds(ids); - } + public List listMenuByIds(List ids) { + return systemMenuMapper.selectByIds(ids); + } + + 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); + } + + private Long countMenuByPid(Long pid) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemMenuTb::getPid, pid); + return systemMenuMapper.selectCount(wrapper); + } + + private List queryMenuByArgs(SystemQueryMenuArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (args != null) { + wrapper.isNull(args.getPidIsNull() != null, SystemMenuTb::getPid); + wrapper.eq(args.getPid() != null, SystemMenuTb::getPid, args.getPid()); + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemMenuTb::getTitle, args.getBlurry()).or() + .like(SystemMenuTb::getComponentName, args.getBlurry()).or() + .like(SystemMenuTb::getPermission, args.getBlurry())); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemMenuTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + } + } + wrapper.orderByAsc(SystemMenuTb::getMenuSort); + return systemMenuMapper.selectList(wrapper); + } + + private List listRootMenu() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.isNull(SystemMenuTb::getPid); + wrapper.orderByAsc(SystemMenuTb::getMenuSort); + return systemMenuMapper.selectList(wrapper); + } } 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 a7d92fd7..b07f4168 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 @@ -44,172 +44,172 @@ import oshi.util.Util; @Service public class SystemMonitorService { - private final DecimalFormat df = new DecimalFormat("0.00"); + private final DecimalFormat df = new DecimalFormat("0.00"); - /** - * 查询服务器监控信息 - * - * @return Map - */ - public Map queryServerMonitorInfo() { - Map resultMap = new LinkedHashMap<>(8); - try { - SystemInfo si = new SystemInfo(); - OperatingSystem os = si.getOperatingSystem(); - HardwareAbstractionLayer hal = si.getHardware(); - // 系统信息 - resultMap.put("sys", getSystemInfo(os)); - // cpu 信息 - resultMap.put("cpu", getCpuInfo(hal.getProcessor())); - // 内存信息 - resultMap.put("memory", getMemoryInfo(hal.getMemory())); - // 交换区信息 - resultMap.put("swap", getSwapInfo(hal.getMemory())); - // 磁盘 - resultMap.put("disk", getDiskInfo(os)); - resultMap.put("time", DateUtil.format(new Date(), "HH:mm:ss")); - } catch (Exception e) { - log.error(e.getMessage(), e); + /** + * 查询服务器监控信息 + * + * @return Map + */ + public Map getServerMonitorInfo() { + Map resultMap = new LinkedHashMap<>(8); + try { + SystemInfo si = new SystemInfo(); + OperatingSystem os = si.getOperatingSystem(); + HardwareAbstractionLayer hal = si.getHardware(); + // 系统信息 + resultMap.put("sys", getSystemInfo(os)); + // cpu 信息 + resultMap.put("cpu", getCpuInfo(hal.getProcessor())); + // 内存信息 + resultMap.put("memory", getMemoryInfo(hal.getMemory())); + // 交换区信息 + resultMap.put("swap", getSwapInfo(hal.getMemory())); + // 磁盘 + resultMap.put("disk", getDiskInfo(os)); + resultMap.put("time", DateUtil.format(new Date(), "HH:mm:ss")); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return resultMap; } - return resultMap; - } - /** - * 获取磁盘信息 - * - * @return / - */ - private Map getDiskInfo(OperatingSystem os) { - Map diskInfo = new LinkedHashMap<>(); - FileSystem fileSystem = os.getFileSystem(); - List fsArray = fileSystem.getFileStores(); - String osName = System.getProperty("os.name"); - long available = 0, total = 0; - for (OSFileStore fs : fsArray) { - // windows 需要将所有磁盘分区累加, linux 和 mac 直接累加会出现磁盘重复的问题, 待修复 - if (osName.toLowerCase().startsWith(SystemConst.WIN)) { - available += fs.getUsableSpace(); - total += fs.getTotalSpace(); - } else { - available = fs.getUsableSpace(); - total = fs.getTotalSpace(); - break; - } + /** + * 获取磁盘信息 + * + * @return / + */ + private Map getDiskInfo(OperatingSystem os) { + Map diskInfo = new LinkedHashMap<>(); + FileSystem fileSystem = os.getFileSystem(); + List fsArray = fileSystem.getFileStores(); + String osName = System.getProperty("os.name"); + long available = 0, total = 0; + for (OSFileStore fs : fsArray) { + // windows 需要将所有磁盘分区累加, linux 和 mac 直接累加会出现磁盘重复的问题, 待修复 + if (osName.toLowerCase().startsWith(SystemConst.WIN)) { + available += fs.getUsableSpace(); + total += fs.getTotalSpace(); + } else { + available = fs.getUsableSpace(); + total = fs.getTotalSpace(); + break; + } + } + long used = total - available; + diskInfo.put("total", total > 0 ? KitFileUtil.getSize(total) : "?"); + diskInfo.put("available", KitFileUtil.getSize(available)); + diskInfo.put("used", KitFileUtil.getSize(used)); + if (total != 0) { + diskInfo.put("usageRate", df.format(used / (double)total * 100)); + } else { + diskInfo.put("usageRate", 0); + } + return diskInfo; } - long used = total - available; - diskInfo.put("total", total > 0 ? KitFileUtil.getSize(total) : "?"); - diskInfo.put("available", KitFileUtil.getSize(available)); - diskInfo.put("used", KitFileUtil.getSize(used)); - if (total != 0) { - diskInfo.put("usageRate", df.format(used / (double) total * 100)); - } else { - diskInfo.put("usageRate", 0); + + /** + * 获取交换区信息 + * + * @param memory / + * @return / + */ + private Map getSwapInfo(GlobalMemory memory) { + Map swapInfo = new LinkedHashMap<>(); + VirtualMemory virtualMemory = memory.getVirtualMemory(); + long total = virtualMemory.getSwapTotal(); + long used = virtualMemory.getSwapUsed(); + swapInfo.put("total", FormatUtil.formatBytes(total)); + swapInfo.put("used", FormatUtil.formatBytes(used)); + swapInfo.put("available", FormatUtil.formatBytes(total - used)); + if (used == 0) { + swapInfo.put("usageRate", 0); + } else { + swapInfo.put("usageRate", df.format(used / (double)total * 100)); + } + return swapInfo; } - return diskInfo; - } - /** - * 获取交换区信息 - * - * @param memory / - * @return / - */ - private Map getSwapInfo(GlobalMemory memory) { - Map swapInfo = new LinkedHashMap<>(); - VirtualMemory virtualMemory = memory.getVirtualMemory(); - long total = virtualMemory.getSwapTotal(); - long used = virtualMemory.getSwapUsed(); - swapInfo.put("total", FormatUtil.formatBytes(total)); - swapInfo.put("used", FormatUtil.formatBytes(used)); - swapInfo.put("available", FormatUtil.formatBytes(total - used)); - if (used == 0) { - swapInfo.put("usageRate", 0); - } else { - swapInfo.put("usageRate", df.format(used / (double) total * 100)); + /** + * 获取内存信息 + * + * @param memory / + * @return / + */ + private Map getMemoryInfo(GlobalMemory memory) { + Map memoryInfo = new LinkedHashMap<>(); + memoryInfo.put("total", FormatUtil.formatBytes(memory.getTotal())); + memoryInfo.put("available", FormatUtil.formatBytes(memory.getAvailable())); + memoryInfo.put("used", FormatUtil.formatBytes(memory.getTotal() - memory.getAvailable())); + memoryInfo.put("usageRate", + df.format((memory.getTotal() - memory.getAvailable()) / (double)memory.getTotal() * 100)); + return memoryInfo; } - return swapInfo; - } - /** - * 获取内存信息 - * - * @param memory / - * @return / - */ - private Map getMemoryInfo(GlobalMemory memory) { - Map memoryInfo = new LinkedHashMap<>(); - memoryInfo.put("total", FormatUtil.formatBytes(memory.getTotal())); - memoryInfo.put("available", FormatUtil.formatBytes(memory.getAvailable())); - memoryInfo.put("used", FormatUtil.formatBytes(memory.getTotal() - memory.getAvailable())); - memoryInfo.put("usageRate", - df.format((memory.getTotal() - memory.getAvailable()) / (double) memory.getTotal() * 100)); - return memoryInfo; - } - - /** - * 获取Cpu相关信息 - * - * @param processor / - * @return / - */ - private Map getCpuInfo(CentralProcessor processor) { - Map cpuInfo = new LinkedHashMap<>(); - cpuInfo.put("name", processor.getProcessorIdentifier().getName()); - cpuInfo.put("package", processor.getPhysicalPackageCount() + "个物理CPU"); - cpuInfo.put("core", processor.getPhysicalProcessorCount() + "个物理核心"); - cpuInfo.put("coreNumber", processor.getPhysicalProcessorCount()); - cpuInfo.put("logic", processor.getLogicalProcessorCount() + "个逻辑CPU"); - // CPU信息 - long[] prevTicks = processor.getSystemCpuLoadTicks(); - // 默认等待300毫秒... - long time = 300; - Util.sleep(time); - long[] ticks = processor.getSystemCpuLoadTicks(); - long minCpuLoadTick = 1000; - while (Arrays.toString(prevTicks).equals(Arrays.toString(ticks)) && time < minCpuLoadTick) { - time += 25; - Util.sleep(25); - ticks = processor.getSystemCpuLoadTicks(); + /** + * 获取Cpu相关信息 + * + * @param processor / + * @return / + */ + private Map getCpuInfo(CentralProcessor processor) { + Map cpuInfo = new LinkedHashMap<>(); + cpuInfo.put("name", processor.getProcessorIdentifier().getName()); + cpuInfo.put("package", processor.getPhysicalPackageCount() + "个物理CPU"); + cpuInfo.put("core", processor.getPhysicalProcessorCount() + "个物理核心"); + cpuInfo.put("coreNumber", processor.getPhysicalProcessorCount()); + cpuInfo.put("logic", processor.getLogicalProcessorCount() + "个逻辑CPU"); + // CPU信息 + long[] prevTicks = processor.getSystemCpuLoadTicks(); + // 默认等待300毫秒... + long time = 300; + Util.sleep(time); + long[] ticks = processor.getSystemCpuLoadTicks(); + long minCpuLoadTick = 1000; + while (Arrays.toString(prevTicks).equals(Arrays.toString(ticks)) && time < minCpuLoadTick) { + time += 25; + Util.sleep(25); + ticks = processor.getSystemCpuLoadTicks(); + } + long user = + ticks[CentralProcessor.TickType.USER.getIndex()] - prevTicks[CentralProcessor.TickType.USER.getIndex()]; + long nice = + ticks[CentralProcessor.TickType.NICE.getIndex()] - prevTicks[CentralProcessor.TickType.NICE.getIndex()]; + long sys = + ticks[CentralProcessor.TickType.SYSTEM.getIndex()] - prevTicks[CentralProcessor.TickType.SYSTEM.getIndex()]; + long idle = + ticks[CentralProcessor.TickType.IDLE.getIndex()] - prevTicks[CentralProcessor.TickType.IDLE.getIndex()]; + long ioWait = + ticks[CentralProcessor.TickType.IOWAIT.getIndex()] - prevTicks[CentralProcessor.TickType.IOWAIT.getIndex()]; + long irq = + ticks[CentralProcessor.TickType.IRQ.getIndex()] - prevTicks[CentralProcessor.TickType.IRQ.getIndex()]; + long softIrq = ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()] - + prevTicks[CentralProcessor.TickType.SOFTIRQ.getIndex()]; + long steal = + ticks[CentralProcessor.TickType.STEAL.getIndex()] - prevTicks[CentralProcessor.TickType.STEAL.getIndex()]; + long totalCpu = user + nice + sys + idle + ioWait + irq + softIrq + steal; + cpuInfo.put("used", df.format(100d * user / totalCpu + 100d * sys / totalCpu)); + cpuInfo.put("idle", df.format(100d * idle / totalCpu)); + return cpuInfo; } - long user = - ticks[CentralProcessor.TickType.USER.getIndex()] - prevTicks[CentralProcessor.TickType.USER.getIndex()]; - long nice = - ticks[CentralProcessor.TickType.NICE.getIndex()] - prevTicks[CentralProcessor.TickType.NICE.getIndex()]; - long sys = - ticks[CentralProcessor.TickType.SYSTEM.getIndex()] - prevTicks[CentralProcessor.TickType.SYSTEM.getIndex()]; - long idle = - ticks[CentralProcessor.TickType.IDLE.getIndex()] - prevTicks[CentralProcessor.TickType.IDLE.getIndex()]; - long ioWait = - ticks[CentralProcessor.TickType.IOWAIT.getIndex()] - prevTicks[CentralProcessor.TickType.IOWAIT.getIndex()]; - long irq = - ticks[CentralProcessor.TickType.IRQ.getIndex()] - prevTicks[CentralProcessor.TickType.IRQ.getIndex()]; - long softIrq = ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()] - - prevTicks[CentralProcessor.TickType.SOFTIRQ.getIndex()]; - long steal = - ticks[CentralProcessor.TickType.STEAL.getIndex()] - prevTicks[CentralProcessor.TickType.STEAL.getIndex()]; - long totalCpu = user + nice + sys + idle + ioWait + irq + softIrq + steal; - cpuInfo.put("used", df.format(100d * user / totalCpu + 100d * sys / totalCpu)); - cpuInfo.put("idle", df.format(100d * idle / totalCpu)); - return cpuInfo; - } - /** - * 获取系统相关信息,系统、运行天数、系统IP - * - * @param os / - * @return / - */ - private Map getSystemInfo(OperatingSystem os) { - Map systemInfo = new LinkedHashMap<>(); - // jvm 运行时间 - long time = ManagementFactory.getRuntimeMXBean().getStartTime(); - Date date = new Date(time); - // 计算项目运行时间 - String formatBetween = DateUtil.formatBetween(date, new Date(), Level.HOUR); - // 系统信息 - systemInfo.put("os", os.toString()); - systemInfo.put("day", formatBetween); - systemInfo.put("ip", KitIPUtil.getLocalIp()); - return systemInfo; - } + /** + * 获取系统相关信息,系统、运行天数、系统IP + * + * @param os / + * @return / + */ + private Map getSystemInfo(OperatingSystem os) { + Map systemInfo = new LinkedHashMap<>(); + // jvm 运行时间 + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + Date date = new Date(time); + // 计算项目运行时间 + String formatBetween = DateUtil.formatBetween(date, new Date(), Level.HOUR); + // 系统信息 + systemInfo.put("os", os.toString()); + systemInfo.put("day", formatBetween); + systemInfo.put("ip", KitIPUtil.getLocalIp()); + return systemInfo; + } } 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 4cca8d5c..55f8ef02 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,14 +21,14 @@ import cn.odboy.system.dal.model.SystemOssStorageVo; import cn.odboy.system.dal.model.SystemQueryStorageArgs; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; /** *

- * OSS存储 服务类 + * OSS存储接口 *

* * @author codegen @@ -36,13 +36,13 @@ import org.springframework.web.multipart.MultipartFile; */ public interface SystemOssStorageService extends IService { - KitPageResult queryOssStorage(SystemQueryStorageArgs criteria, Page page); + KitPageResult searchOssStorage(SystemQueryStorageArgs args, Page page); - List queryOssStorage(SystemQueryStorageArgs criteria); + List queryOssStorage(SystemQueryStorageArgs args); - void exportOssStorageExcel(List list, HttpServletResponse response) throws IOException; + void exportOssStorageExcel(List list, HttpServletResponse response) throws IOException; - String uploadFile(MultipartFile file); + String uploadFile(MultipartFile file); - void removeFileByIds(Long[] ids); + void deleteFileByIds(Long[] ids); } 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 df53f672..a6d022a7 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 @@ -33,6 +33,7 @@ import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -40,7 +41,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; 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; @@ -49,265 +49,259 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemQuartzJobService { - @Autowired - private SystemQuartzJobMapper systemQuartzJobMapper; - @Autowired - private SystemQuartzLogMapper systemQuartzLogMapper; - @Autowired - private QuartzManage quartzManage; - @Autowired - private KitRedisHelper redisHelper; + @Autowired private SystemQuartzJobMapper systemQuartzJobMapper; + @Autowired private SystemQuartzLogMapper systemQuartzLogMapper; + @Autowired private QuartzManage quartzManage; + @Autowired private KitRedisHelper redisHelper; - /** - * 创建 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void createJob(SystemQuartzJobTb args) { - if (!CronExpression.isValidExpression(args.getCronExpression())) { - throw new BadRequestException("cron表达式格式错误"); + /** + * 创建 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void createJob(SystemQuartzJobTb args) { + if (!CronExpression.isValidExpression(args.getCronExpression())) { + throw new BadRequestException("cron表达式格式错误"); + } + systemQuartzJobMapper.insert(args); + quartzManage.addJob(args); } - systemQuartzJobMapper.insert(args); - quartzManage.addJob(args); - } - /** - * 修改任务并重新调度 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyQuartzJobResumeCron(SystemUpdateQuartzJobArgs args) { - if (!CronExpression.isValidExpression(args.getCronExpression())) { - throw new BadRequestException("cron表达式格式错误"); + /** + * 修改任务并重新调度 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateQuartzJobResumeCron(SystemUpdateQuartzJobArgs args) { + if (!CronExpression.isValidExpression(args.getCronExpression())) { + throw new BadRequestException("cron表达式格式错误"); + } + if (StrUtil.isNotBlank(args.getSubTask())) { + List tasks = Arrays.asList(args.getSubTask().split("[,，]")); + if (tasks.contains(args.getId().toString())) { + throw new BadRequestException("子任务中不能添加当前任务ID"); + } + } + SystemQuartzJobTb quartzJob = BeanUtil.copyProperties(args, SystemQuartzJobTb.class); + systemQuartzJobMapper.insertOrUpdate(quartzJob); + quartzManage.updateJobCron(quartzJob); } - if (StrUtil.isNotBlank(args.getSubTask())) { - List tasks = Arrays.asList(args.getSubTask().split("[,，]")); - if (tasks.contains(args.getId().toString())) { - throw new BadRequestException("子任务中不能添加当前任务ID"); - } + + /** + * 更改定时任务状态 + * + * @param quartzJob / + */ + @Transactional(rollbackFor = Exception.class) + public void switchQuartzJobStatus(SystemQuartzJobTb quartzJob) { + // 置换暂停状态 + if (quartzJob.getIsPause()) { + quartzManage.resumeJob(quartzJob); + quartzJob.setIsPause(false); + } else { + quartzManage.pauseJob(quartzJob); + quartzJob.setIsPause(true); + } + systemQuartzJobMapper.insertOrUpdate(quartzJob); } - SystemQuartzJobTb quartzJob = BeanUtil.copyProperties(args, SystemQuartzJobTb.class); - systemQuartzJobMapper.insertOrUpdate(quartzJob); - quartzManage.updateJobCron(quartzJob); - } - /** - * 更改定时任务状态 - * - * @param quartzJob / - */ - @Transactional(rollbackFor = Exception.class) - public void switchQuartzJobStatus(SystemQuartzJobTb quartzJob) { - // 置换暂停状态 - if (quartzJob.getIsPause()) { - quartzManage.resumeJob(quartzJob); - quartzJob.setIsPause(false); - } else { - quartzManage.pauseJob(quartzJob); - quartzJob.setIsPause(true); + /** + * 立即执行定时任务 + * + * @param quartzJob / + */ + public void startQuartzJob(SystemQuartzJobTb quartzJob) { + quartzManage.runJobNow(quartzJob); } - systemQuartzJobMapper.insertOrUpdate(quartzJob); - } - /** - * 立即执行定时任务 - * - * @param quartzJob / - */ - public void startQuartzJob(SystemQuartzJobTb quartzJob) { - quartzManage.runJobNow(quartzJob); - } - - /** - * 删除任务 - * - * @param ids / - */ - @Transactional(rollbackFor = Exception.class) - public void removeJobByIds(Set ids) { - for (Long id : ids) { - SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(id); - quartzManage.deleteJob(quartzJob); - systemQuartzJobMapper.deleteById(quartzJob); + /** + * 删除任务 + * + * @param ids / + */ + @Transactional(rollbackFor = Exception.class) + public void deleteJobByIds(Set ids) { + for (Long id : ids) { + SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(id); + quartzManage.deleteJob(quartzJob); + systemQuartzJobMapper.deleteById(quartzJob); + } } - } - /** - * 执行子任务 - * - * @param tasks / - * @throws InterruptedException / - */ - @Transactional(rollbackFor = Exception.class) - public void startSubQuartJob(String[] tasks) throws InterruptedException { - for (String id : tasks) { - if (StrUtil.isBlank(id)) { - // 如果是手动清除子任务id, 会出现id为空字符串的问题 - continue; - } - SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(Long.parseLong(id)); - if (quartzJob == null) { - // 防止子任务不存在 - continue; - } - // 执行任务 - String uuid = IdUtil.simpleUUID(); - quartzJob.setUuid(uuid); - // 执行任务 - startQuartzJob(quartzJob); - // 获取执行状态, 如果执行失败则停止后面的子任务执行 - Boolean result = redisHelper.get(uuid, Boolean.class); - while (result == null) { - // 休眠5秒, 再次获取子任务执行情况 - Thread.sleep(5000); - result = redisHelper.get(uuid, Boolean.class); - } - if (!result) { - redisHelper.del(uuid); - break; - } + /** + * 执行子任务 + * + * @param tasks / + * @throws InterruptedException / + */ + @Transactional(rollbackFor = Exception.class) + public void startSubQuartJob(String[] tasks) throws InterruptedException { + for (String id : tasks) { + if (StrUtil.isBlank(id)) { + // 如果是手动清除子任务id, 会出现id为空字符串的问题 + continue; + } + SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(Long.parseLong(id)); + if (quartzJob == null) { + // 防止子任务不存在 + continue; + } + // 执行任务 + String uuid = IdUtil.simpleUUID(); + quartzJob.setUuid(uuid); + // 执行任务 + startQuartzJob(quartzJob); + // 获取执行状态, 如果执行失败则停止后面的子任务执行 + Boolean result = redisHelper.get(uuid, Boolean.class); + while (result == null) { + // 休眠5秒, 再次获取子任务执行情况 + Thread.sleep(5000); + result = redisHelper.get(uuid, Boolean.class); + } + if (!result) { + redisHelper.del(uuid); + break; + } + } } - } - /** - * 导出定时任务 - * - * @param quartzJobs 待导出的数据 - * @param response / - * @throws IOException / - */ - public void exportQuartzJobExcel(List quartzJobs, HttpServletResponse response) - throws IOException { - List> list = new ArrayList<>(); - for (SystemQuartzJobTb quartzJob : quartzJobs) { - Map map = new LinkedHashMap<>(); - map.put("任务名称", quartzJob.getJobName()); - map.put("Bean名称", quartzJob.getBeanName()); - map.put("执行方法", quartzJob.getMethodName()); - map.put("参数", quartzJob.getParams()); - map.put("表达式", quartzJob.getCronExpression()); - map.put("状态", quartzJob.getIsPause() ? "暂停中" : "运行中"); - map.put("描述", quartzJob.getDescription()); - map.put("创建日期", quartzJob.getCreateTime()); - list.add(map); + /** + * 导出定时任务 + * + * @param quartzJobs 待导出的数据 + * @param response / + * @throws IOException / + */ + public void exportQuartzJobExcel(List quartzJobs, HttpServletResponse response) + throws IOException { + List> list = new ArrayList<>(); + for (SystemQuartzJobTb quartzJob : quartzJobs) { + Map map = new LinkedHashMap<>(); + map.put("任务名称", quartzJob.getJobName()); + map.put("Bean名称", quartzJob.getBeanName()); + map.put("执行方法", quartzJob.getMethodName()); + map.put("参数", quartzJob.getParams()); + map.put("表达式", quartzJob.getCronExpression()); + map.put("状态", quartzJob.getIsPause() ? "暂停中" : "运行中"); + map.put("描述", quartzJob.getDescription()); + map.put("创建日期", quartzJob.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); } - KitFileUtil.downloadExcel(list, response); - } - /** - * 导出定时任务日志 - * - * @param queryAllLog 待导出的数据 - * @param response / - * @throws IOException / - */ - public void exportQuartzLogExcel(List queryAllLog, HttpServletResponse response) - throws IOException { - List> list = new ArrayList<>(); - for (SystemQuartzLogTb quartzLog : queryAllLog) { - Map map = new LinkedHashMap<>(); - map.put("任务名称", quartzLog.getJobName()); - map.put("Bean名称", quartzLog.getBeanName()); - map.put("执行方法", quartzLog.getMethodName()); - map.put("参数", quartzLog.getParams()); - map.put("表达式", quartzLog.getCronExpression()); - map.put("异常详情", quartzLog.getExceptionDetail()); - map.put("耗时/毫秒", quartzLog.getTime()); - map.put("状态", quartzLog.getIsSuccess() ? "成功" : "失败"); - map.put("创建日期", quartzLog.getCreateTime()); - list.add(map); + /** + * 导出定时任务日志 + * + * @param queryAllLog 待导出的数据 + * @param response / + * @throws IOException / + */ + public void exportQuartzLogExcel(List queryAllLog, HttpServletResponse response) + throws IOException { + List> list = new ArrayList<>(); + for (SystemQuartzLogTb quartzLog : queryAllLog) { + Map map = new LinkedHashMap<>(); + map.put("任务名称", quartzLog.getJobName()); + map.put("Bean名称", quartzLog.getBeanName()); + map.put("执行方法", quartzLog.getMethodName()); + map.put("参数", quartzLog.getParams()); + map.put("表达式", quartzLog.getCronExpression()); + map.put("异常详情", quartzLog.getExceptionDetail()); + map.put("耗时/毫秒", quartzLog.getTime()); + map.put("状态", quartzLog.getIsSuccess() ? "成功" : "失败"); + map.put("创建日期", quartzLog.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); } - KitFileUtil.downloadExcel(list, response); - } - /** - * 分页查询 - * - * @param criteria 条件 - * @param page 分页参数 - * @return / - */ - public KitPageResult queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria, - Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - this.injectQuartzJobQueryParams(criteria, wrapper); - return KitPageUtil.toPage(systemQuartzJobMapper.selectPage(page, wrapper)); - } - - private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs criteria, - LambdaQueryWrapper wrapper) { - if (criteria != null) { - wrapper.like(StrUtil.isNotBlank(criteria.getJobName()), SystemQuartzJobTb::getJobName, - criteria.getJobName()); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemQuartzJobTb::getUpdateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } + /** + * 分页查询 + * + * @param args 条件 + * @param page 分页参数 + * @return / + */ + public KitPageResult searchQuartzJobByArgs(SystemQueryQuartzJobArgs args, + Page page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQuartzJobQueryParams(args, wrapper); + return KitPageUtil.toPage(systemQuartzJobMapper.selectPage(page, wrapper)); } - wrapper.orderByDesc(SystemQuartzJobTb::getId); - } - private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs criteria, - LambdaQueryWrapper wrapper) { - if (criteria != null) { - wrapper.like(StrUtil.isNotBlank(criteria.getJobName()), SystemQuartzLogTb::getJobName, - criteria.getJobName()); - wrapper.eq(criteria.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, criteria.getIsSuccess()); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemQuartzLogTb::getCreateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } + private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args, + LambdaQueryWrapper wrapper) { + if (args != null) { + wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzJobTb::getJobName, args.getJobName()); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemQuartzJobTb::getUpdateTime, args.getCreateTime().get(0), + args.getCreateTime().get(1)); + } + } + wrapper.orderByDesc(SystemQuartzJobTb::getId); } - wrapper.orderByDesc(SystemQuartzLogTb::getId); - } - /** - * 分页查询日志 - * - * @param criteria 条件 - * @param page 分页参数 - * @return / - */ - public KitPageResult queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria, - Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - this.injectQuartzLogQueryParams(criteria, wrapper); - return KitPageUtil.toPage(systemQuartzLogMapper.selectPage(page, wrapper)); - } + private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args, + LambdaQueryWrapper wrapper) { + if (args != null) { + wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName, args.getJobName()); + wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess()); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0), + args.getCreateTime().get(1)); + } + } + wrapper.orderByDesc(SystemQuartzLogTb::getId); + } - /** - * 查询全部 - * - * @param criteria 条件 - * @return / - */ - public List queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - this.injectQuartzJobQueryParams(criteria, wrapper); - return systemQuartzJobMapper.selectList(wrapper); - } + /** + * 分页查询日志 + * + * @param args 条件 + * @param page 分页参数 + * @return / + */ + public KitPageResult searchQuartzLogByArgs(SystemQueryQuartzJobArgs args, + Page page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQuartzLogQueryParams(args, wrapper); + return KitPageUtil.toPage(systemQuartzLogMapper.selectPage(page, wrapper)); + } - /** - * 查询全部 - * - * @param criteria 条件 - * @return / - */ - public List queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - this.injectQuartzLogQueryParams(criteria, wrapper); - return systemQuartzLogMapper.selectList(wrapper); - } + /** + * 查询全部 + * + * @param args 条件 + * @return / + */ + public List queryQuartzJobByArgs(SystemQueryQuartzJobArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQuartzJobQueryParams(args, wrapper); + return systemQuartzJobMapper.selectList(wrapper); + } - public SystemQuartzJobTb getQuartzJobById(Long id) { - return systemQuartzJobMapper.selectById(id); - } + /** + * 查询全部 + * + * @param args 条件 + * @return / + */ + public List queryQuartzLogByArgs(SystemQueryQuartzJobArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + this.injectQuartzLogQueryParams(args, wrapper); + return systemQuartzLogMapper.selectList(wrapper); + } - public List queryEnableQuartzJob() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemQuartzJobTb::getIsPause, 0); - return systemQuartzJobMapper.selectList(wrapper); - } + public SystemQuartzJobTb getQuartzJobById(Long id) { + return systemQuartzJobMapper.selectById(id); + } + + public List listEnableQuartzJob() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemQuartzJobTb::getIsPause, 0); + return systemQuartzJobMapper.selectList(wrapper); + } } 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 53bf44c4..fdfdc851 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 @@ -32,48 +32,46 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemRoleDeptService { - @Autowired - private SystemRoleDeptMapper systemRoleDeptMapper; - @Autowired - private SystemDeptMapper systemDeptMapper; + @Autowired private SystemRoleDeptMapper systemRoleDeptMapper; + @Autowired private SystemDeptMapper systemDeptMapper; - @Transactional(rollbackFor = Exception.class) - public void batchDeleteRoleDept(Set roleIds) { - if (CollUtil.isNotEmpty(roleIds)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemRoleDeptTb::getRoleId, roleIds); - systemRoleDeptMapper.delete(wrapper); + @Transactional(rollbackFor = Exception.class) + public void batchDeleteRoleDept(Set roleIds) { + if (CollUtil.isNotEmpty(roleIds)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemRoleDeptTb::getRoleId, roleIds); + systemRoleDeptMapper.delete(wrapper); + } } - } - @Transactional(rollbackFor = Exception.class) - public void batchInsertRoleDept(Set depts, Long id) { - if (CollUtil.isNotEmpty(depts)) { - List records = new ArrayList<>(); - for (SystemDeptTb dept : depts) { - SystemRoleDeptTb record = new SystemRoleDeptTb(); - record.setRoleId(id); - record.setDeptId(dept.getId()); - records.add(record); - } - systemRoleDeptMapper.insert(records); + @Transactional(rollbackFor = Exception.class) + public void batchInsertRoleDept(Set depts, Long id) { + if (CollUtil.isNotEmpty(depts)) { + List records = new ArrayList<>(); + for (SystemDeptTb dept : depts) { + SystemRoleDeptTb record = new SystemRoleDeptTb(); + record.setRoleId(id); + record.setDeptId(dept.getId()); + records.add(record); + } + systemRoleDeptMapper.insert(records); + } } - } - /** - * 根据角色id查询 - * - * @param roleId / - * @return / - */ - public List selectDeptByRoleId(Long roleId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemRoleDeptTb::getRoleId, roleId); - List systemRoleDeptTbs = systemRoleDeptMapper.selectList(wrapper); - if (systemRoleDeptTbs.isEmpty()) { - return new ArrayList<>(); + /** + * 根据角色id查询 + * + * @param roleId / + * @return / + */ + public List listDeptByRoleId(Long roleId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemRoleDeptTb::getRoleId, roleId); + List systemRoleDeptTbs = systemRoleDeptMapper.selectList(wrapper); + if (systemRoleDeptTbs.isEmpty()) { + return new ArrayList<>(); + } + List deptIds = systemRoleDeptTbs.stream().map(SystemRoleDeptTb::getDeptId).collect(Collectors.toList()); + return systemDeptMapper.selectByIds(deptIds); } - List deptIds = systemRoleDeptTbs.stream().map(SystemRoleDeptTb::getDeptId).collect(Collectors.toList()); - return systemDeptMapper.selectByIds(deptIds); - } } 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 a0026224..a34ceaf4 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 @@ -33,58 +33,55 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemRoleMenuService { - @Autowired - private SystemRoleMenuMapper systemRoleMenuMapper; - @Autowired - private SystemMenuMapper systemMenuMapper; + @Autowired private SystemRoleMenuMapper systemRoleMenuMapper; + @Autowired private SystemMenuMapper systemMenuMapper; - @Transactional(rollbackFor = Exception.class) - public void deleteRoleMenuByRoleId(Long roleId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemRoleMenuTb::getRoleId, roleId); - systemRoleMenuMapper.delete(wrapper); - } - - @Transactional(rollbackFor = Exception.class) - public void batchInsertRoleMenu(Set menus, Long roleId) { - if (CollUtil.isNotEmpty(menus)) { - List records = new ArrayList<>(); - for (SystemMenuTb menu : menus) { - SystemRoleMenuTb record = new SystemRoleMenuTb(); - record.setMenuId(menu.getId()); - record.setRoleId(roleId); - records.add(record); - } - systemRoleMenuMapper.insert(records); - } - } - - @Transactional(rollbackFor = Exception.class) - public void batchDeleteRoleMenu(Set roleIds) { - if (CollUtil.isNotEmpty(roleIds)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemRoleMenuTb::getRoleId, roleIds); - systemRoleMenuMapper.delete(wrapper); - } - } - - public LinkedHashSet queryMenuByRoleIdsAndType(Set roleIds, int menuType) { - if (CollUtil.isEmpty(roleIds)) { - 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 LinkedHashSet<>(); + @Transactional(rollbackFor = Exception.class) + public void deleteRoleMenuByRoleId(Long roleId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemRoleMenuTb::getRoleId, roleId); + systemRoleMenuMapper.delete(wrapper); } - LambdaQueryWrapper menuWrapper = new LambdaQueryWrapper<>(); - menuWrapper.in(SystemMenuTb::getId, menuIds); - // 排除"按钮" - menuWrapper.ne(SystemMenuTb::getType, 2); - menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); - return new LinkedHashSet<>(systemMenuMapper.selectList(menuWrapper)); - } + @Transactional(rollbackFor = Exception.class) + public void batchInsertRoleMenu(Set menus, Long roleId) { + if (CollUtil.isNotEmpty(menus)) { + List records = new ArrayList<>(); + for (SystemMenuTb menu : menus) { + SystemRoleMenuTb record = new SystemRoleMenuTb(); + record.setMenuId(menu.getId()); + record.setRoleId(roleId); + records.add(record); + } + systemRoleMenuMapper.insert(records); + } + } + + @Transactional(rollbackFor = Exception.class) + public void batchDeleteRoleMenu(Set roleIds) { + if (CollUtil.isNotEmpty(roleIds)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemRoleMenuTb::getRoleId, roleIds); + systemRoleMenuMapper.delete(wrapper); + } + } + + public LinkedHashSet queryMenuByRoleIds(Set roleIds) { + if (CollUtil.isEmpty(roleIds)) { + 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 LinkedHashSet<>(); + } + LambdaQueryWrapper menuWrapper = new LambdaQueryWrapper<>(); + menuWrapper.in(SystemMenuTb::getId, menuIds); + // 排除"按钮" + menuWrapper.ne(SystemMenuTb::getType, 2); + menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); + return new LinkedHashSet<>(systemMenuMapper.selectList(menuWrapper)); + } } 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 1ab1ba51..d943c0b3 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 @@ -21,26 +21,24 @@ import cn.hutool.core.collection.CollectionUtil; 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.dataobject.SystemUserTb; -import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; -import cn.odboy.system.dal.dataobject.SystemRoleDeptTb; -import cn.odboy.system.dal.dataobject.SystemUserRoleTb; import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.dataobject.SystemRoleDeptTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.dataobject.SystemUserRoleTb; +import cn.odboy.system.dal.dataobject.SystemUserTb; import cn.odboy.system.dal.model.SystemCreateRoleArgs; import cn.odboy.system.dal.model.SystemQueryRoleArgs; import cn.odboy.system.dal.model.SystemRoleCodeVo; import cn.odboy.system.dal.model.SystemRoleVo; -import cn.odboy.system.dal.mysql.SystemRoleMapper; -import cn.odboy.system.dal.mysql.SystemUserMapper; -import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; import cn.odboy.system.dal.mysql.SystemRoleDeptMapper; +import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.dal.mysql.SystemUserRoleMapper; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -51,340 +49,291 @@ import java.util.List; 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 SystemRoleService { + @Autowired private SystemRoleMapper systemRoleMapper; + @Autowired private SystemRoleMenuService systemRoleMenuService; + @Autowired private SystemRoleDeptService systemRoleDeptService; + @Autowired private SystemRoleDeptMapper systemRoleDeptMapper; + @Autowired private SystemUserRoleMapper systemUserRoleMapper; + @Autowired private SystemUserService systemUserService; - @Autowired - private SystemRoleMapper systemRoleMapper; - @Autowired - private SystemRoleMenuService systemRoleMenuService; - @Autowired - private SystemUserMapper systemUserMapper; - @Autowired - private SystemRoleDeptService systemRoleDeptService; - @Autowired - private SystemRoleMenuMapper systemRoleMenuMapper; - @Autowired - private SystemRoleDeptMapper systemRoleDeptMapper; - @Autowired - private SystemUserRoleMapper systemUserRoleMapper; - - /** - * 创建 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void saveRole(SystemCreateRoleArgs args) { - if (this.getRoleByName(args.getName()) != null) { - throw new BadRequestException("角色名称已存在"); + /** + * 创建 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void saveRole(SystemCreateRoleArgs args) { + if (this.getRoleByName(args.getName()) != null) { + throw new BadRequestException("角色名称已存在"); + } + systemRoleMapper.insert(BeanUtil.copyProperties(args, SystemRoleTb.class)); + // 判断是否有部门数据, 若有, 则需创建关联 + if (CollectionUtil.isNotEmpty(args.getDepts())) { + systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId()); + } } - systemRoleMapper.insert(BeanUtil.copyProperties(args, SystemRoleTb.class)); - // 判断是否有部门数据, 若有, 则需创建关联 - if (CollectionUtil.isNotEmpty(args.getDepts())) { - systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId()); + + private SystemRoleTb getRoleByName(String name) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemRoleTb::getName, name); + return systemRoleMapper.selectOne(wrapper); } - } - private SystemRoleTb getRoleByName(String name) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SystemRoleTb::getName, name); - return systemRoleMapper.selectOne(wrapper); - } - - /** - * 修改 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyRoleById(SystemRoleVo args) { - SystemRoleVo role = BeanUtil.copyProperties(systemRoleMapper.selectById(args.getId()), SystemRoleVo.class); - SystemRoleTb role1 = this.getRoleByName(args.getName()); - if (role1 != null && !role1.getId().equals(role.getId())) { - throw new BadRequestException("角色名称已存在"); + /** + * 修改 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateRoleById(SystemRoleVo args) { + SystemRoleVo role = BeanUtil.copyProperties(systemRoleMapper.selectById(args.getId()), SystemRoleVo.class); + SystemRoleTb role1 = this.getRoleByName(args.getName()); + if (role1 != null && !role1.getId().equals(role.getId())) { + throw new BadRequestException("角色名称已存在"); + } + role.setName(args.getName()); + role.setDescription(args.getDescription()); + role.setDataScope(args.getDataScope()); + role.setDepts(args.getDepts()); + role.setLevel(args.getLevel()); + // 更新 + systemRoleMapper.insertOrUpdate(role); + // 删除关联部门数据 + systemRoleDeptService.batchDeleteRoleDept(Collections.singleton(args.getId())); + // 判断是否有部门数据, 若有, 则需更新关联 + if (CollectionUtil.isNotEmpty(args.getDepts())) { + systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId()); + } } - role.setName(args.getName()); - role.setDescription(args.getDescription()); - role.setDataScope(args.getDataScope()); - role.setDepts(args.getDepts()); - role.setLevel(args.getLevel()); - // 更新 - systemRoleMapper.insertOrUpdate(role); - // 删除关联部门数据 - systemRoleDeptService.batchDeleteRoleDept(Collections.singleton(args.getId())); - // 判断是否有部门数据, 若有, 则需更新关联 - if (CollectionUtil.isNotEmpty(args.getDepts())) { - systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId()); + + /** + * 修改绑定的菜单 + * + * @param role / + */ + public void updateBindMenuById(SystemRoleVo role) { + // 更新菜单 + systemRoleMenuService.deleteRoleMenuByRoleId(role.getId()); + // 判断是否为空 + if (CollUtil.isNotEmpty(role.getMenus())) { + systemRoleMenuService.batchInsertRoleMenu(role.getMenus(), role.getId()); + } } - } - /** - * 修改绑定的菜单 - * - * @param role / - */ - public void modifyBindMenuById(SystemRoleVo role) { - // 更新菜单 - systemRoleMenuService.deleteRoleMenuByRoleId(role.getId()); - // 判断是否为空 - if (CollUtil.isNotEmpty(role.getMenus())) { - systemRoleMenuService.batchInsertRoleMenu(role.getMenus(), role.getId()); + /** + * 删除 + * + * @param ids / + */ + @Transactional(rollbackFor = Exception.class) + public void deleteRoleByIds(Set ids) { + systemRoleMapper.deleteByIds(ids); + // 删除角色部门关联数据、角色菜单关联数据 + systemRoleDeptService.batchDeleteRoleDept(ids); + systemRoleMenuService.batchDeleteRoleMenu(ids); } - } - /** - * 删除 - * - * @param ids / - */ - @Transactional(rollbackFor = Exception.class) - public void removeRoleByIds(Set ids) { - systemRoleMapper.deleteByIds(ids); - // 删除角色部门关联数据、角色菜单关联数据 - systemRoleDeptService.batchDeleteRoleDept(ids); - systemRoleMenuService.batchDeleteRoleMenu(ids); - } - - /** - * 导出数据 - * - * @param roles 待导出的数据 - * @param response / - * @throws IOException - */ - public void exportRoleExcel(List roles, HttpServletResponse response) throws IOException { - List> list = new ArrayList<>(); - for (SystemRoleVo role : roles) { - Map map = new LinkedHashMap<>(); - map.put("角色名称", role.getName()); - map.put("角色级别", role.getLevel()); - map.put("描述", role.getDescription()); - map.put("创建日期", role.getCreateTime()); - list.add(map); + /** + * 导出数据 + * + * @param roles 待导出的数据 + * @param response / + * @throws IOException + */ + public void exportRoleExcel(List roles, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (SystemRoleVo role : roles) { + Map map = new LinkedHashMap<>(); + map.put("角色名称", role.getName()); + map.put("角色级别", role.getLevel()); + map.put("描述", role.getDescription()); + map.put("创建日期", role.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); } - KitFileUtil.downloadExcel(list, response); - } - /** - * 查询全部角色 - * - * @return - */ - public List queryAllRole() { - return this.selectAllRole(); - } - - private List selectAllRole() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.orderByAsc(SystemRoleTb::getLevel); - return systemRoleMapper.selectList(wrapper); - } - - /** - * 根据条件查询全部角色 - * - * @param criteria 条件 - * @return - */ - public List queryRoleByArgs(SystemQueryRoleArgs criteria) { - // 查询角色基本信息 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (criteria != null) { - wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()), - c -> c.like(SystemRoleTb::getName, criteria.getBlurry()).or() - .like(SystemRoleTb::getDescription, criteria.getBlurry())); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemRoleTb::getCreateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } + /** + * 查询全部角色 + */ + public List listAllRole() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.orderByAsc(SystemRoleTb::getLevel); + return systemRoleMapper.selectList(wrapper); } - wrapper.orderByAsc(SystemRoleTb::getLevel); - - // 分页处理 - if (criteria != null && criteria.getOffset() > 0 && criteria.getSize() != null) { - Page rolePage = new Page<>(criteria.getOffset() / criteria.getSize() + 1, criteria.getSize()); - Page page = systemRoleMapper.selectPage(rolePage, wrapper); - List roles = page.getRecords(); - return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); - } else { - List roles = systemRoleMapper.selectList(wrapper); - return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); - } - } - /** - * 分页查询角色 - * - * @param criteria 条件 - * @param page 分页参数 - * @return - */ - public KitPageResult queryRoleByArgs(SystemQueryRoleArgs criteria, Page page) { - criteria.setOffset(page.offset()); - List roles = this.queryRoleByArgs(criteria); - Long total = systemRoleMapper.countRoleByArgs(criteria); - return KitPageUtil.toPage(roles, total); - } - - /** - * 根据用户ID查询 - * - * @param userId 用户ID - * @return / - */ - public List queryRoleByUsersId(Long userId) { - // 查询用户角色关联 - LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); - userRoleWrapper.eq(SystemUserRoleTb::getUserId, userId); - List userRoles = systemUserRoleMapper.selectList(userRoleWrapper); - - if (CollUtil.isEmpty(userRoles)) { - return new ArrayList<>(); + /** + * 根据条件查询全部角色 + * + * @param args 条件 + * @return + */ + public List queryRoleByArgs(SystemQueryRoleArgs args) { + // 查询角色基本信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + 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); + if (args != null && args.getSize() != null) { + Page rolePage = new Page<>(args.getPage(), args.getSize()); + Page page = systemRoleMapper.selectPage(rolePage, wrapper); + List roles = page.getRecords(); + return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); + } else { + List roles = systemRoleMapper.selectList(wrapper); + return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); + } } - - Set roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet()); - List roles = systemRoleMapper.selectByIds(roleIds); - - return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); - } - /** - * 根据角色查询角色级别 - * - * @param roles / - * @return / - */ - public Integer getDeptLevelByRoles(Set roles) { - if (CollUtil.isEmpty(roles)) { - return Integer.MAX_VALUE; + /** + * 分页查询角色 + * + * @param args 条件 + * @param page 分页参数 + * @return + */ + public KitPageResult searchRoleByArgs(SystemQueryRoleArgs args, Page page) { + args.setOffset(page.offset()); + List roles = this.queryRoleByArgs(args); + Long total = this.countRoleByArgs(args); + return KitPageUtil.toPage(roles, total); } - Set roleSet = new HashSet<>(); - for (SystemRoleTb role : roles) { - roleSet.add(getRoleById(role.getId())); - } - return Collections.min(roleSet.stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); - } - /** - * 获取用户权限信息 - * - * @param user 用户信息 - * @return 权限信息 - */ - public List buildUserRolePermissions(SystemUserTb user) { - Set permissions = new HashSet<>(); - // 如果是管理员直接返回 - if (user.getIsAdmin()) { - permissions.add("admin"); - return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); + /** + * 根据用户ID查询 + * + * @param userId 用户ID + * @return / + */ + public List queryRoleByUsersId(Long userId) { + // 查询用户角色关联 + LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); + userRoleWrapper.eq(SystemUserRoleTb::getUserId, userId); + List userRoles = systemUserRoleMapper.selectList(userRoleWrapper); + if (CollUtil.isEmpty(userRoles)) { + return new ArrayList<>(); + } + Set roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet()); + List roles = systemRoleMapper.selectByIds(roleIds); + return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); } - List roles = this.queryRoleByUsersId(user.getId()); - permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuTb::getPermission) - .filter(StrUtil::isNotBlank).collect(Collectors.toSet()); - return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); - } - /** - * 验证是否被用户关联 - * - * @param ids / - */ - public void verifyBindRelationByIds(Set ids) { - if (systemUserMapper.countUserByRoleIds(ids) > 0) { - throw new BadRequestException("所选角色存在用户关联, 请解除关联再试！"); + /** + * 根据角色查询角色级别 + * + * @param roles / + * @return / + */ + public Integer getDeptLevelByRoles(Set roles) { + if (CollUtil.isEmpty(roles)) { + return Integer.MAX_VALUE; + } + Set roleSet = new HashSet<>(); + for (SystemRoleTb role : roles) { + roleSet.add(getRoleById(role.getId())); + } + return Collections.min(roleSet.stream().map(SystemRoleTb::getLevel).collect(Collectors.toList())); } - } - /** - * 根据ID查询 - * - * @param id / - * @return / - */ - public SystemRoleTb getRoleById(Long id) { - return systemRoleMapper.selectById(id); - } - - /** - * 根据ID查询角色详情（包含关联信息） - * - * @param id / - * @return / - */ - public SystemRoleVo getRoleVoById(Long id) { - SystemRoleTb role = systemRoleMapper.selectById(id); - if (role == null) { - return null; + /** + * 获取用户权限信息 + * + * @param user 用户信息 + * @return 权限信息 + */ + public List buildUserRolePermissions(SystemUserTb user) { + Set permissions = new HashSet<>(); + // 如果是管理员直接返回 + if (user.getIsAdmin()) { + permissions.add("admin"); + return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); + } + List roles = this.queryRoleByUsersId(user.getId()); + permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuTb::getPermission) + .filter(StrUtil::isNotBlank).collect(Collectors.toSet()); + return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList()); } - return convertToRoleVo(role); - } - /** - * 根据菜单ID查询角色 - * - * @param menuId 菜单ID - * @return / - */ - public List queryRoleByMenuId(Long menuId) { - // 查询包含该菜单的角色ID列表 - LambdaQueryWrapper roleMenuWrapper = new LambdaQueryWrapper<>(); - roleMenuWrapper.eq(SystemRoleMenuTb::getMenuId, menuId); - List roleMenuList = systemRoleMenuMapper.selectList(roleMenuWrapper); - - if (CollUtil.isEmpty(roleMenuList)) { - return new ArrayList<>(); + /** + * 验证是否被用户关联 + * + * @param ids / + */ + public void verifyBindRelationByIds(Set ids) { + if (systemUserService.countUserByRoleIds(ids) > 0) { + throw new BadRequestException("所选角色存在用户关联, 请解除关联再试！"); + } } - - Set roleIds = roleMenuList.stream().map(SystemRoleMenuTb::getRoleId).collect(Collectors.toSet()); - List roles = systemRoleMapper.selectByIds(roleIds); - - return roles.stream().map(this::convertToRoleVo).collect(Collectors.toList()); - } - /** - * 根据部门ID统计角色数量 - * - * @param deptIds 部门ID集合 - * @return / - */ - public Integer countRoleByDeptIds(Set deptIds) { - if (CollUtil.isEmpty(deptIds)) { - return 0; + /** + * 根据ID查询 + * + * @param id / + * @return / + */ + public SystemRoleTb getRoleById(Long id) { + return systemRoleMapper.selectById(id); } - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemRoleDeptTb::getDeptId, deptIds); - return systemRoleDeptMapper.selectCount(wrapper).intValue(); - } - /** - * 转换为SystemRoleVo并关联查询菜单和部门信息 - * - * @param role 角色基本信息 - * @return 包含关联信息的SystemRoleVo - */ - private SystemRoleVo convertToRoleVo(SystemRoleTb role) { - if (role == null) { - return null; + /** + * 根据部门ID统计角色数量 + * + * @param deptIds 部门ID集合 + * @return / + */ + public Long countRoleByDeptIds(Set deptIds) { + if (CollUtil.isEmpty(deptIds)) { + return 0L; + } + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemRoleDeptTb::getDeptId, deptIds); + return systemRoleDeptMapper.selectCount(wrapper); + } + + /** + * 转换为SystemRoleVo并关联查询菜单和部门信息 + * + * @param role 角色基本信息 + * @return 包含关联信息的SystemRoleVo + */ + private SystemRoleVo convertToRoleVo(SystemRoleTb role) { + if (role == null) { + return null; + } + + SystemRoleVo roleVo = BeanUtil.copyProperties(role, SystemRoleVo.class); + // 查询关联的菜单信息 + Set menus = systemRoleMenuService.queryMenuByRoleIds(Collections.singleton(role.getId())); + roleVo.setMenus(menus); + + // 查询关联的部门信息 + List depts = systemRoleDeptService.listDeptByRoleId(role.getId()); + roleVo.setDepts(new LinkedHashSet<>(depts)); + + return roleVo; + } + + public Long countRoleByArgs(SystemQueryRoleArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + 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)); + } + } + return systemRoleMapper.selectCount(wrapper); } - - SystemRoleVo roleVo = BeanUtil.copyProperties(role, SystemRoleVo.class); - - // 查询关联的菜单信息 - Set menus = systemRoleMenuService.queryMenuByRoleIdsAndType( - Collections.singleton(role.getId()), -1); - roleVo.setMenus(menus); - - // 查询关联的部门信息 - List depts = systemRoleDeptService.selectDeptByRoleId(role.getId()); - roleVo.setDepts(new LinkedHashSet<>(depts)); - - return roleVo; - } } 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 90c450a6..a5769ca1 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 @@ -30,29 +30,28 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemUserJobService { - @Autowired - private SystemUserJobMapper systemUserJobMapper; + @Autowired private SystemUserJobMapper systemUserJobMapper; - @Transactional(rollbackFor = Exception.class) - public void batchInsertUserJob(Set jobs, Long userId) { - if (CollUtil.isNotEmpty(jobs)) { - List records = new ArrayList<>(); - for (SystemJobTb job : jobs) { - SystemUserJobTb record = new SystemUserJobTb(); - record.setUserId(userId); - record.setJobId(job.getId()); - records.add(record); - } - systemUserJobMapper.insert(records); + @Transactional(rollbackFor = Exception.class) + public void batchInsertUserJob(Set jobs, Long userId) { + if (CollUtil.isNotEmpty(jobs)) { + List records = new ArrayList<>(); + for (SystemJobTb job : jobs) { + SystemUserJobTb record = new SystemUserJobTb(); + record.setUserId(userId); + record.setJobId(job.getId()); + records.add(record); + } + systemUserJobMapper.insert(records); + } } - } - @Transactional(rollbackFor = Exception.class) - public void batchDeleteUserJob(Set userIds) { - if (CollUtil.isNotEmpty(userIds)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemUserJobTb::getUserId, userIds); - systemUserJobMapper.delete(wrapper); + @Transactional(rollbackFor = Exception.class) + public void batchDeleteUserJob(Set userIds) { + if (CollUtil.isNotEmpty(userIds)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemUserJobTb::getUserId, userIds); + systemUserJobMapper.delete(wrapper); + } } - } } 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 41a35584..b33d4eb8 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 @@ -30,29 +30,28 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SystemUserRoleService { - @Autowired - private SystemUserRoleMapper systemUserRoleMapper; + @Autowired private SystemUserRoleMapper systemUserRoleMapper; - @Transactional(rollbackFor = Exception.class) - public void batchInsertUserRole(Set roles, Long userId) { - if (CollUtil.isNotEmpty(roles)) { - List records = new ArrayList<>(); - for (SystemRoleTb role : roles) { - SystemUserRoleTb record = new SystemUserRoleTb(); - record.setUserId(userId); - record.setRoleId(role.getId()); - records.add(record); - } - systemUserRoleMapper.insert(records); + @Transactional(rollbackFor = Exception.class) + public void batchInsertUserRole(Set roles, Long userId) { + if (CollUtil.isNotEmpty(roles)) { + List records = new ArrayList<>(); + for (SystemRoleTb role : roles) { + SystemUserRoleTb record = new SystemUserRoleTb(); + record.setUserId(userId); + record.setRoleId(role.getId()); + records.add(record); + } + systemUserRoleMapper.insert(records); + } } - } - @Transactional(rollbackFor = Exception.class) - public void batchDeleteUserRole(Set userIds) { - if (CollUtil.isNotEmpty(userIds)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemUserRoleTb::getUserId, userIds); - systemUserRoleMapper.delete(wrapper); + @Transactional(rollbackFor = Exception.class) + public void batchDeleteUserRole(Set userIds) { + if (CollUtil.isNotEmpty(userIds)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemUserRoleTb::getUserId, userIds); + systemUserRoleMapper.delete(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 8a2a0635..23bd7c87 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 @@ -31,12 +31,12 @@ import cn.odboy.system.dal.dataobject.SystemUserRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; import cn.odboy.system.dal.model.SystemQueryUserArgs; import cn.odboy.system.dal.model.SystemUserVo; -import cn.odboy.system.dal.mysql.SystemUserMapper; -import cn.odboy.system.dal.mysql.SystemUserJobMapper; -import cn.odboy.system.dal.mysql.SystemUserRoleMapper; +import cn.odboy.system.dal.mysql.SystemDeptMapper; import cn.odboy.system.dal.mysql.SystemJobMapper; import cn.odboy.system.dal.mysql.SystemRoleMapper; -import cn.odboy.system.dal.mysql.SystemDeptMapper; +import cn.odboy.system.dal.mysql.SystemUserJobMapper; +import cn.odboy.system.dal.mysql.SystemUserMapper; +import cn.odboy.system.dal.mysql.SystemUserRoleMapper; import cn.odboy.system.dal.redis.SystemUserInfoDAO; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.system.framework.permission.core.KitSecurityHelper; @@ -45,6 +45,7 @@ import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -57,7 +58,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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -66,485 +66,418 @@ import org.springframework.web.multipart.MultipartFile; @Service public class SystemUserService { - @Autowired - private SystemUserMapper systemUserMapper; - @Autowired - private SystemUserJobService systemUserJobService; - @Autowired - private SystemUserRoleService systemUserRoleService; - @Autowired - private SystemUserInfoDAO systemUserInfoDAO; - @Autowired - private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; - @Autowired - private KitFileLocalUploadHelper fileUploadPathHelper; - @Autowired - private SystemUserJobMapper systemUserJobMapper; - @Autowired - private SystemUserRoleMapper systemUserRoleMapper; - @Autowired - private SystemJobMapper systemJobMapper; - @Autowired - private SystemRoleMapper systemRoleMapper; - @Autowired - private SystemDeptMapper systemDeptMapper; + @Autowired private SystemUserMapper systemUserMapper; + @Autowired private SystemUserJobService systemUserJobService; + @Autowired private SystemUserRoleService systemUserRoleService; + @Autowired private SystemUserInfoDAO systemUserInfoDAO; + @Autowired private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; + @Autowired private KitFileLocalUploadHelper fileUploadPathHelper; + @Autowired private SystemUserJobMapper systemUserJobMapper; + @Autowired private SystemUserRoleMapper systemUserRoleMapper; + @Autowired private SystemJobMapper systemJobMapper; + @Autowired private SystemRoleMapper systemRoleMapper; + @Autowired private SystemDeptMapper systemDeptMapper; - /** - * 新增用户 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void saveUser(SystemUserVo args) { - args.setDeptId(args.getDept().getId()); - if (systemUserMapper.getUserByUsername(args.getUsername()) != null) { - throw new BadRequestException("用户名已存在"); - } - if (systemUserMapper.getUserByEmail(args.getEmail()) != null) { - throw new BadRequestException("邮箱已存在"); - } - if (systemUserMapper.getUserByPhone(args.getPhone()) != null) { - throw new BadRequestException("手机号已存在"); - } - systemUserMapper.insert(args); - // 保存用户岗位 - systemUserJobService.batchInsertUserJob(args.getJobs(), args.getId()); - // 保存用户角色 - systemUserRoleService.batchInsertUserRole(args.getRoles(), args.getId()); - } - - /** - * 编辑用户 - * - * @param args / - * @throws Exception / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyUserById(SystemUserVo args) { - SystemUserTb user = systemUserMapper.selectById(args.getId()); - SystemUserTb user1 = systemUserMapper.getUserByUsername(args.getUsername()); - SystemUserTb user2 = systemUserMapper.getUserByEmail(args.getEmail()); - SystemUserTb user3 = systemUserMapper.getUserByPhone(args.getPhone()); - if (user1 != null && !user.getId().equals(user1.getId())) { - throw new BadRequestException("用户名已存在"); - } - if (user2 != null && !user.getId().equals(user2.getId())) { - throw new BadRequestException("邮箱已存在"); - } - if (user3 != null && !user.getId().equals(user3.getId())) { - throw new BadRequestException("手机号已存在"); - } - // 如果用户被禁用, 则清除用户登录信息 - if (!args.getEnabled()) { - systemUserOnlineInfoDAO.kickOutByUsername(args.getUsername()); - } - user.setDeptId(args.getDept().getId()); - user.setUsername(args.getUsername()); - user.setEmail(args.getEmail()); - user.setEnabled(args.getEnabled()); - user.setDept(args.getDept()); - user.setPhone(args.getPhone()); - user.setNickName(args.getNickName()); - user.setGender(args.getGender()); - systemUserMapper.insertOrUpdate(user); - // 清除用户登录缓存 - systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); - // 更新用户岗位 - systemUserJobService.batchDeleteUserJob(Collections.singleton(args.getId())); - systemUserJobService.batchInsertUserJob(args.getJobs(), args.getId()); - // 更新用户角色 - systemUserRoleService.batchDeleteUserRole(Collections.singleton(args.getId())); - systemUserRoleService.batchInsertUserRole(args.getRoles(), args.getId()); - } - - /** - * 用户自助修改资料 - * - * @param args / - */ - @Transactional(rollbackFor = Exception.class) - public void modifyUserCenterInfoById(SystemUserTb args) { - SystemUserTb user = systemUserMapper.selectById(args.getId()); - SystemUserTb user1 = systemUserMapper.getUserByPhone(args.getPhone()); - if (user1 != null && !user.getId().equals(user1.getId())) { - throw new BadRequestException("手机号已存在"); - } - user.setNickName(args.getNickName()); - user.setPhone(args.getPhone()); - user.setGender(args.getGender()); - systemUserMapper.insertOrUpdate(user); - systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); - } - - /** - * 删除用户 - * - * @param ids / - */ - @Transactional(rollbackFor = Exception.class) - public void removeUserByIds(Set ids) { - for (Long id : ids) { - // 清理缓存 - SystemUserTb user = systemUserMapper.selectById(id); - systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); - } - systemUserMapper.deleteByIds(ids); - // 删除用户岗位 - systemUserJobService.batchDeleteUserJob(ids); - // 删除用户角色 - systemUserRoleService.batchDeleteUserRole(ids); - } - - /** - * 修改密码 - * - * @param username 用户名 - * @param encryptPassword 密码 - */ - @Transactional(rollbackFor = Exception.class) - public void modifyUserPasswordByUsername(String username, String encryptPassword) { - systemUserMapper.updateUserPasswordByUsername(username, encryptPassword); - systemUserInfoDAO.deleteUserLoginInfoByUserName(username); - } - - /** - * 重置密码 - * - * @param ids 用户id - * @param password 密码 - */ - @Transactional(rollbackFor = Exception.class) - public void resetUserPasswordByIds(Set ids, String password) { - List users = systemUserMapper.selectByIds(ids); - // 清除缓存 - users.forEach(user -> { - // 清除缓存 - systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); - // 强制退出 - systemUserOnlineInfoDAO.kickOutByUsername(user.getUsername()); - }); - // 重置密码 - systemUserMapper.updateUserPasswordByUserIds(password, ids); - } - - /** - * 修改头像 - * - * @param multipartFile 文件 - * @return / - */ - @Transactional(rollbackFor = Exception.class) - public Map modifyUserAvatar(MultipartFile multipartFile) { - SystemUserTb user = systemUserMapper.getUserByUsername(KitSecurityHelper.getCurrentUsername()); - String username = user.getUsername(); - if (StrUtil.isBlank(username)) { - throw new BadRequestException("异常用户数据, 请联系管理员处理"); - } - // 文件大小验证 - KitFileUtil.checkSize(fileUploadPathHelper.getAvatarMaxSize(), multipartFile.getSize()); - // 验证文件上传的格式 - String image = "gif jpg png jpeg"; - String fileType = KitFileUtil.getSuffix(multipartFile.getOriginalFilename()); - if (fileType != null && !image.contains(fileType)) { - throw new BadRequestException("文件格式错误！, 仅支持 " + image + " 格式"); - } - String oldPath = user.getAvatarPath(); - File file = KitFileUtil.upload(multipartFile, fileUploadPathHelper.getPath()); - user.setAvatarPath(Objects.requireNonNull(file).getPath()); - user.setAvatarName(file.getName()); - systemUserMapper.insertOrUpdate(user); - if (StrUtil.isNotBlank(oldPath)) { - KitFileUtil.del(oldPath); - } - systemUserInfoDAO.deleteUserLoginInfoByUserName(username); - return new HashMap<>(1) {{ - put("avatar", file.getName()); - }}; - } - - /** - * 修改邮箱 - * - * @param username 用户名 - * @param email 邮箱 - */ - @Transactional(rollbackFor = Exception.class) - public void modifyUserEmailByUsername(String username, String email) { - systemUserMapper.updateUserEmailByUsername(username, email); - systemUserInfoDAO.deleteUserLoginInfoByUserName(username); - } - - /** - * 导出数据 - * - * @param users 待导出的数据 - * @param response / - * @throws IOException / - */ - public void exportUserExcel(List users, HttpServletResponse response) throws IOException { - List> list = new ArrayList<>(); - for (SystemUserVo user : users) { - List roles = user.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.toList()); - Map map = new LinkedHashMap<>(); - map.put("用户名", user.getUsername()); - map.put("角色", roles); - map.put("部门", user.getDept().getName()); - map.put("岗位", user.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.toList())); - map.put("邮箱", user.getEmail()); - map.put("状态", user.getEnabled() ? "启用" : "禁用"); - map.put("手机号码", user.getPhone()); - map.put("修改密码的时间", user.getPwdResetTime()); - map.put("创建日期", user.getCreateTime()); - list.add(map); - } - KitFileUtil.downloadExcel(list, response); - } - - /** - * 查询全部 - * - * @param criteria 条件 - * @param page 分页参数 - * @return / - */ - public KitPageResult queryUserByArgs(SystemQueryUserArgs criteria, Page page) { - // 查询用户基本信息 - LambdaQueryWrapper wrapper = buildUserQueryWrapper(criteria); - IPage userPage = systemUserMapper.selectPage(page, wrapper); - List users = userPage.getRecords(); - - // 转换为SystemUserVo并关联查询 - List userVos = users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - - return KitPageUtil.toPage(userVos, userPage.getTotal()); - } - - /** - * 查询全部不分页 - * - * @param criteria 条件 - * @return / - */ - public List queryUserByArgs(SystemQueryUserArgs criteria) { - // 查询用户基本信息 - LambdaQueryWrapper wrapper = buildUserQueryWrapper(criteria); - List users = systemUserMapper.selectList(wrapper); - - // 转换为SystemUserVo并关联查询 - return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - } - - /** - * 根据ID查询 - * - * @param id ID - * @return / - */ - public SystemUserTb getUserById(long id) { - return systemUserMapper.selectById(id); - } - - /** - * 根据用户名查询 - * - * @param username / - * @return / - */ - public SystemUserTb getUserByUsername(String username) { - return systemUserMapper.getUserByUsername(username); - } - - public List queryUserMetadataOptions(KitPageArgs args) { - SystemQueryUserArgs criteria = args.getArgs(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.select(SystemUserTb::getId, SystemUserTb::getDeptId, SystemUserTb::getEmail, SystemUserTb::getPhone); - wrapper.and(c -> { - c.eq(SystemUserTb::getPhone, criteria.getBlurry()); - c.or(); - c.eq(SystemUserTb::getEmail, criteria.getBlurry()); - c.or(); - c.like(SystemUserTb::getUsername, criteria.getBlurry()); - c.or(); - c.like(SystemUserTb::getNickName, criteria.getBlurry()); - }); - return systemUserMapper.selectPage(new Page<>(criteria.getPage(), 50), wrapper).getRecords().stream().map(m -> { - Map ext = new HashMap<>(1); - ext.put("id", m.getId()); - ext.put("deptId", m.getDeptId()); - ext.put("email", m.getEmail()); - ext.put("phone", m.getPhone()); - return KitSelectOptionVo.builder().label(m.getNickName()).value(String.valueOf(m.getId())).ext(ext).build(); - }).collect(Collectors.toList()); - } - - /** - * 根据角色ID查询用户 - * - * @param roleId 角色ID - * @return / - */ - public List selectUserByRoleId(Long roleId) { - // 查询用户角色关联 - LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); - userRoleWrapper.eq(SystemUserRoleTb::getRoleId, roleId); - List userRoles = systemUserRoleMapper.selectList(userRoleWrapper); - - if (CollUtil.isEmpty(userRoles)) { - return new ArrayList<>(); + /** + * 新增用户 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void saveUser(SystemUserVo args) { + args.setDeptId(args.getDept().getId()); + if (this.getUserByUsername(args.getUsername()) != null) { + throw new BadRequestException("用户名已存在"); + } + if (this.getUserByEmail(args.getEmail()) != null) { + throw new BadRequestException("邮箱已存在"); + } + if (this.getUserByPhone(args.getPhone()) != null) { + throw new BadRequestException("手机号已存在"); + } + systemUserMapper.insert(args); + // 保存用户岗位 + systemUserJobService.batchInsertUserJob(args.getJobs(), args.getId()); + // 保存用户角色 + systemUserRoleService.batchInsertUserRole(args.getRoles(), args.getId()); } - Set userIds = userRoles.stream().map(SystemUserRoleTb::getUserId).collect(Collectors.toSet()); - List users = systemUserMapper.selectByIds(userIds); - - return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - } - - /** - * 根据部门ID查询用户 - * - * @param deptId 部门ID - * @return / - */ - public List selectUserByDeptId(Long deptId) { - // 查询部门关联的角色 - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - userWrapper.eq(SystemUserTb::getDeptId, deptId); - List users = systemUserMapper.selectList(userWrapper); - - return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - } - - /** - * 根据菜单ID查询用户 - * - * @param menuId 菜单ID - * @return / - */ - public List selectUserByMenuId(Long menuId) { - // 查询菜单角色关联 - LambdaQueryWrapper userRoleWrapper = new LambdaQueryWrapper<>(); - // 这里需要通过菜单角色关联表查询，暂时简化处理 - List users = systemUserMapper.selectList(null); - - return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); - } - - /** - * 根据岗位ID统计用户数量 - * - * @param jobIds 岗位ID集合 - * @return / - */ - public Long countUserByJobIds(Set jobIds) { - if (CollUtil.isEmpty(jobIds)) { - return 0L; + /** + * 编辑用户 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateUserById(SystemUserVo args) { + SystemUserTb user = systemUserMapper.selectById(args.getId()); + SystemUserTb user1 = this.getUserByUsername(args.getUsername()); + SystemUserTb user2 = this.getUserByEmail(args.getEmail()); + SystemUserTb user3 = this.getUserByPhone(args.getPhone()); + if (user1 != null && !user.getId().equals(user1.getId())) { + throw new BadRequestException("用户名已存在"); + } + if (user2 != null && !user.getId().equals(user2.getId())) { + throw new BadRequestException("邮箱已存在"); + } + if (user3 != null && !user.getId().equals(user3.getId())) { + throw new BadRequestException("手机号已存在"); + } + // 如果用户被禁用, 则清除用户登录信息 + if (!args.getEnabled()) { + systemUserOnlineInfoDAO.kickOutByUsername(args.getUsername()); + } + user.setDeptId(args.getDept().getId()); + user.setUsername(args.getUsername()); + user.setEmail(args.getEmail()); + user.setEnabled(args.getEnabled()); + user.setDept(args.getDept()); + user.setPhone(args.getPhone()); + user.setNickName(args.getNickName()); + user.setGender(args.getGender()); + systemUserMapper.insertOrUpdate(user); + // 清除用户登录缓存 + systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); + // 更新用户岗位 + systemUserJobService.batchDeleteUserJob(Collections.singleton(args.getId())); + systemUserJobService.batchInsertUserJob(args.getJobs(), args.getId()); + // 更新用户角色 + systemUserRoleService.batchDeleteUserRole(Collections.singleton(args.getId())); + systemUserRoleService.batchInsertUserRole(args.getRoles(), args.getId()); } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemUserJobTb::getJobId, jobIds); - return systemUserJobMapper.selectCount(wrapper); - } - - /** - * 根据角色ID统计用户数量 - * - * @param roleIds 角色ID集合 - * @return / - */ - public Long countUserByRoleIds(Set roleIds) { - if (CollUtil.isEmpty(roleIds)) { - return 0L; + /** + * 用户自助修改资料 + * + * @param args / + */ + @Transactional(rollbackFor = Exception.class) + public void updateUserCenterInfoById(SystemUserTb args) { + SystemUserTb user = systemUserMapper.selectById(args.getId()); + SystemUserTb user1 = this.getUserByPhone(args.getPhone()); + if (user1 != null && !user.getId().equals(user1.getId())) { + throw new BadRequestException("手机号已存在"); + } + user.setNickName(args.getNickName()); + user.setPhone(args.getPhone()); + user.setGender(args.getGender()); + systemUserMapper.insertOrUpdate(user); + systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); } - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SystemUserRoleTb::getRoleId, roleIds); - return systemUserRoleMapper.selectCount(wrapper); - } + /** + * 删除用户 + * + * @param ids / + */ + @Transactional(rollbackFor = Exception.class) + public void removeUserByIds(Set ids) { + for (Long id : ids) { + // 清理缓存 + SystemUserTb user = systemUserMapper.selectById(id); + systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); + } + systemUserMapper.deleteByIds(ids); + // 删除用户岗位 + systemUserJobService.batchDeleteUserJob(ids); + // 删除用户角色 + systemUserRoleService.batchDeleteUserRole(ids); + } - /** - * 根据用户名查询用户详情（包含关联信息） - * - * @param username 用户名 - * @return / - */ - public SystemUserVo getUserVoByUsername(String username) { - SystemUserTb user = systemUserMapper.getUserByUsername(username); - if (user == null) { - return null; + /** + * 修改密码 + * + * @param username 用户名 + * @param encryptPassword 密码 + */ + @Transactional(rollbackFor = Exception.class) + public void updateUserPasswordByUsername(String username, String encryptPassword) { + systemUserMapper.updateUserPasswordByUsername(username, encryptPassword); + systemUserInfoDAO.deleteUserLoginInfoByUserName(username); } - return convertToUserVo(user); - } - /** - * 构建用户查询条件 - * - * @param criteria 查询条件 - * @return / - */ - private LambdaQueryWrapper buildUserQueryWrapper(SystemQueryUserArgs criteria) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (criteria != null) { - if (criteria.getId() != null) { - wrapper.eq(SystemUserTb::getId, criteria.getId()); - } - if (criteria.getEnabled() != null) { - wrapper.eq(SystemUserTb::getEnabled, criteria.getEnabled()); - } - if (CollUtil.isNotEmpty(criteria.getDeptIds())) { - wrapper.in(SystemUserTb::getDeptId, criteria.getDeptIds()); - } - if (StrUtil.isNotBlank(criteria.getBlurry())) { - wrapper.and(w -> w.like(SystemUserTb::getUsername, criteria.getBlurry()) - .or().like(SystemUserTb::getNickName, criteria.getBlurry()) - .or().like(SystemUserTb::getEmail, criteria.getBlurry())); - } - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemUserTb::getCreateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } + /** + * 重置密码 + * + * @param ids 用户id + * @param password 密码 + */ + @Transactional(rollbackFor = Exception.class) + public void resetUserPasswordByIds(Set ids, String password) { + List users = systemUserMapper.selectByIds(ids); + // 清除缓存 + users.forEach(user -> { + // 清除缓存 + systemUserInfoDAO.deleteUserLoginInfoByUserName(user.getUsername()); + // 强制退出 + systemUserOnlineInfoDAO.kickOutByUsername(user.getUsername()); + }); + // 重置密码 + systemUserMapper.updateUserPasswordByUserIds(password, ids); } - wrapper.orderByDesc(SystemUserTb::getCreateTime); - return wrapper; - } - /** - * 转换为SystemUserVo并关联查询部门、角色、岗位信息 - * - * @param user 用户基本信息 - * @return 包含关联信息的SystemUserVo - */ - private SystemUserVo convertToUserVo(SystemUserTb user) { - if (user == null) { - return null; + /** + * 修改头像 + * + * @param multipartFile 文件 + * @return / + */ + @Transactional(rollbackFor = Exception.class) + public Map updateUserAvatar(MultipartFile multipartFile) { + SystemUserTb user = this.getUserByUsername(KitSecurityHelper.getCurrentUsername()); + String username = user.getUsername(); + if (StrUtil.isBlank(username)) { + throw new BadRequestException("异常用户数据, 请联系管理员处理"); + } + // 文件大小验证 + KitFileUtil.checkSize(fileUploadPathHelper.getAvatarMaxSize(), multipartFile.getSize()); + // 验证文件上传的格式 + String image = "gif jpg png jpeg"; + String fileType = KitFileUtil.getSuffix(multipartFile.getOriginalFilename()); + if (fileType != null && !image.contains(fileType)) { + throw new BadRequestException("文件格式错误！, 仅支持 " + image + " 格式"); + } + String oldPath = user.getAvatarPath(); + File file = KitFileUtil.upload(multipartFile, fileUploadPathHelper.getPath()); + user.setAvatarPath(Objects.requireNonNull(file).getPath()); + user.setAvatarName(file.getName()); + systemUserMapper.insertOrUpdate(user); + if (StrUtil.isNotBlank(oldPath)) { + KitFileUtil.del(oldPath); + } + systemUserInfoDAO.deleteUserLoginInfoByUserName(username); + return new HashMap<>(1) {{ + put("avatar", file.getName()); + }}; } - SystemUserVo userVo = BeanUtil.copyProperties(user, SystemUserVo.class); - - // 查询关联的部门信息 - if (user.getDeptId() != null) { - SystemDeptTb dept = systemDeptMapper.selectById(user.getDeptId()); - userVo.setDept(dept); + + /** + * 修改邮箱 + * + * @param username 用户名 + * @param email 邮箱 + */ + @Transactional(rollbackFor = Exception.class) + public void updateUserEmailByUsername(String username, String email) { + systemUserMapper.updateUserEmailByUsername(username, email); + systemUserInfoDAO.deleteUserLoginInfoByUserName(username); } - - // 查询关联的岗位信息 - LambdaQueryWrapper jobWrapper = new LambdaQueryWrapper<>(); - jobWrapper.eq(SystemUserJobTb::getUserId, user.getId()); - List userJobs = systemUserJobMapper.selectList(jobWrapper); - if (CollUtil.isNotEmpty(userJobs)) { - Set jobIds = userJobs.stream().map(SystemUserJobTb::getJobId).collect(Collectors.toSet()); - List jobs = systemJobMapper.selectByIds(jobIds); - userVo.setJobs(new LinkedHashSet<>(jobs)); + + /** + * 导出数据 + * + * @param users 待导出的数据 + * @param response / + * @throws IOException / + */ + public void exportUserExcel(List users, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (SystemUserVo user : users) { + List roles = user.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.toList()); + Map map = new LinkedHashMap<>(); + map.put("用户名", user.getUsername()); + map.put("角色", roles); + map.put("部门", user.getDept().getName()); + map.put("岗位", user.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.toList())); + map.put("邮箱", user.getEmail()); + map.put("状态", user.getEnabled() ? "启用" : "禁用"); + map.put("手机号码", user.getPhone()); + map.put("修改密码的时间", user.getPwdResetTime()); + map.put("创建日期", user.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); } - - // 查询关联的角色信息 - LambdaQueryWrapper roleWrapper = new LambdaQueryWrapper<>(); - roleWrapper.eq(SystemUserRoleTb::getUserId, user.getId()); - List userRoles = systemUserRoleMapper.selectList(roleWrapper); - if (CollUtil.isNotEmpty(userRoles)) { - Set roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet()); - List roles = systemRoleMapper.selectByIds(roleIds); - userVo.setRoles(new LinkedHashSet<>(roles)); + + /** + * 查询全部 + * + * @param args 条件 + * @param page 分页参数 + * @return / + */ + public KitPageResult searchUserByArgs(SystemQueryUserArgs args, Page page) { + // 查询用户基本信息 + LambdaQueryWrapper wrapper = buildUserQueryWrapper(args); + IPage userPage = systemUserMapper.selectPage(page, wrapper); + List users = userPage.getRecords(); + // 转换为SystemUserVo并关联查询 + List userVos = users.stream().map(this::convertToUserVo).collect(Collectors.toList()); + return KitPageUtil.toPage(userVos, userPage.getTotal()); + } + + /** + * 查询全部不分页 + * + * @param args 条件 + * @return / + */ + public List queryUserByArgs(SystemQueryUserArgs args) { + // 查询用户基本信息 + LambdaQueryWrapper wrapper = buildUserQueryWrapper(args); + List users = systemUserMapper.selectList(wrapper); + // 转换为SystemUserVo并关联查询 + return users.stream().map(this::convertToUserVo).collect(Collectors.toList()); + } + + /** + * 根据ID查询 + * + * @param id ID + * @return / + */ + public SystemUserTb getUserById(long id) { + return systemUserMapper.selectById(id); + } + + public List queryUserMetadataOptions(KitPageArgs pageArgs) { + SystemQueryUserArgs args = pageArgs.getArgs(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.select(SystemUserTb::getId, SystemUserTb::getDeptId, SystemUserTb::getEmail, SystemUserTb::getPhone); + wrapper.and(c -> { + c.eq(SystemUserTb::getPhone, args.getBlurry()); + c.or(); + c.eq(SystemUserTb::getEmail, args.getBlurry()); + c.or(); + c.like(SystemUserTb::getUsername, args.getBlurry()); + c.or(); + c.like(SystemUserTb::getNickName, args.getBlurry()); + }); + return systemUserMapper.selectPage(new Page<>(args.getPage(), 50), wrapper).getRecords().stream().map(m -> { + Map ext = new HashMap<>(1); + ext.put("id", m.getId()); + ext.put("deptId", m.getDeptId()); + ext.put("email", m.getEmail()); + ext.put("phone", m.getPhone()); + return KitSelectOptionVo.builder().label(m.getNickName()).value(String.valueOf(m.getId())).ext(ext).build(); + }).collect(Collectors.toList()); + } + + /** + * 根据岗位ID统计用户数量 + * + * @param jobIds 岗位ID集合 + * @return / + */ + public Long countUserByJobIds(Set jobIds) { + if (CollUtil.isEmpty(jobIds)) { + return 0L; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemUserJobTb::getJobId, jobIds); + return systemUserJobMapper.selectCount(wrapper); + } + + /** + * 根据角色ID统计用户数量 + * + * @param roleIds 角色ID集合 + * @return / + */ + public Long countUserByRoleIds(Set roleIds) { + if (CollUtil.isEmpty(roleIds)) { + return 0L; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemUserRoleTb::getRoleId, roleIds); + return systemUserRoleMapper.selectCount(wrapper); + } + + /** + * 构建用户查询条件 + * + * @param args 查询条件 + * @return / + */ + private LambdaQueryWrapper buildUserQueryWrapper(SystemQueryUserArgs args) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (args != null) { + if (args.getId() != null) { + wrapper.eq(SystemUserTb::getId, args.getId()); + } + if (args.getEnabled() != null) { + wrapper.eq(SystemUserTb::getEnabled, args.getEnabled()); + } + if (CollUtil.isNotEmpty(args.getDeptIds())) { + wrapper.in(SystemUserTb::getDeptId, args.getDeptIds()); + } + if (StrUtil.isNotBlank(args.getBlurry())) { + wrapper.and(w -> w.like(SystemUserTb::getUsername, args.getBlurry()).or() + .like(SystemUserTb::getNickName, args.getBlurry()).or() + .like(SystemUserTb::getEmail, args.getBlurry())); + } + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemUserTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + } + } + wrapper.orderByDesc(SystemUserTb::getCreateTime); + return wrapper; + } + + /** + * 转换为SystemUserVo并关联查询部门、角色、岗位信息 + * + * @param user 用户基本信息 + * @return 包含关联信息的SystemUserVo + */ + private SystemUserVo convertToUserVo(SystemUserTb user) { + if (user == null) { + return null; + } + SystemUserVo userVo = BeanUtil.copyProperties(user, SystemUserVo.class); + + // 查询关联的部门信息 + if (user.getDeptId() != null) { + SystemDeptTb dept = systemDeptMapper.selectById(user.getDeptId()); + userVo.setDept(dept); + } + + // 查询关联的岗位信息 + LambdaQueryWrapper jobWrapper = new LambdaQueryWrapper<>(); + jobWrapper.eq(SystemUserJobTb::getUserId, user.getId()); + List userJobs = systemUserJobMapper.selectList(jobWrapper); + if (CollUtil.isNotEmpty(userJobs)) { + Set jobIds = userJobs.stream().map(SystemUserJobTb::getJobId).collect(Collectors.toSet()); + List jobs = systemJobMapper.selectByIds(jobIds); + userVo.setJobs(new LinkedHashSet<>(jobs)); + } + + // 查询关联的角色信息 + LambdaQueryWrapper roleWrapper = new LambdaQueryWrapper<>(); + roleWrapper.eq(SystemUserRoleTb::getUserId, user.getId()); + List userRoles = systemUserRoleMapper.selectList(roleWrapper); + if (CollUtil.isNotEmpty(userRoles)) { + Set roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet()); + List roles = systemRoleMapper.selectByIds(roleIds); + userVo.setRoles(new LinkedHashSet<>(roles)); + } + + return userVo; + } + + public SystemUserTb getUserByUsername(String username) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemUserTb::getUsername, username); + wrapper.eq(SystemUserTb::getEnabled, 1); + return systemUserMapper.selectOne(wrapper); + } + + public long countUserByDeptIds(Set deptIds) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SystemUserTb::getDeptId, deptIds); + return systemUserMapper.selectCount(wrapper); + } + + public SystemUserTb getUserByEmail(String email) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemUserTb::getEmail, email); + wrapper.eq(SystemUserTb::getEnabled, 1); + return systemUserMapper.selectOne(wrapper); + } + + public SystemUserTb getUserByPhone(String phone) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SystemUserTb::getPhone, phone); + wrapper.eq(SystemUserTb::getEnabled, 1); + return systemUserMapper.selectOne(wrapper); } - - return userVo; - } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java index cb1749fb..cc329d4b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java @@ -36,13 +36,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 jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,121 +60,117 @@ import org.springframework.web.multipart.MultipartFile; public class SystemOssStorageServiceImpl extends ServiceImpl implements SystemOssStorageService { - @Autowired - private MinioRepository minioRepository; - @Autowired - private AppProperties properties; - @Autowired - private KitFileLocalUploadHelper fileLocalUploadHelper; - @Autowired - private SystemOssStorageMapper systemOssStorageMapper; + @Autowired private MinioRepository minioRepository; + @Autowired private AppProperties properties; + @Autowired private KitFileLocalUploadHelper fileLocalUploadHelper; + @Autowired private SystemOssStorageMapper systemOssStorageMapper; - @Override - public KitPageResult queryOssStorage(SystemQueryStorageArgs criteria, - Page page) { - IPage ossStorageTbs = this.selectOssStorageByArgs(criteria, page); - IPage convert = ossStorageTbs.convert(c -> { - SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class); - storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize())); - return storageVo; - }); - return KitPageUtil.toPage(convert); - } + @Override + public KitPageResult searchOssStorage(SystemQueryStorageArgs args, + Page page) { + IPage ossStorageTbs = this.selectOssStorageByArgs(args, page); + IPage convert = ossStorageTbs.convert(c -> { + SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class); + storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize())); + return storageVo; + }); + return KitPageUtil.toPage(convert); + } - private IPage selectOssStorageByArgs(SystemQueryStorageArgs criteria, - Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (criteria != null) { - wrapper.and(StrUtil.isNotBlank(criteria.getBlurry()), - c -> c.like(SystemOssStorageTb::getFileName, criteria.getBlurry()).or() - .like(SystemOssStorageTb::getFilePrefix, criteria.getBlurry()).or() - .like(SystemOssStorageTb::getFileMime, criteria.getBlurry()).or() - .like(SystemOssStorageTb::getFileMd5, criteria.getBlurry())); - if (CollUtil.isNotEmpty(criteria.getCreateTime()) && criteria.getCreateTime().size() >= 2) { - wrapper.between(SystemOssStorageTb::getUpdateTime, criteria.getCreateTime().get(0), - criteria.getCreateTime().get(1)); - } + private IPage selectOssStorageByArgs(SystemQueryStorageArgs args, + Page page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (args != null) { + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), + c -> c.like(SystemOssStorageTb::getFileName, args.getBlurry()).or() + .like(SystemOssStorageTb::getFilePrefix, args.getBlurry()).or() + .like(SystemOssStorageTb::getFileMime, args.getBlurry()).or() + .like(SystemOssStorageTb::getFileMd5, args.getBlurry())); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemOssStorageTb::getUpdateTime, args.getCreateTime().get(0), + args.getCreateTime().get(1)); + } + } + wrapper.orderByAsc(SystemOssStorageTb::getId); + return systemOssStorageMapper.selectPage(page, wrapper); } - wrapper.orderByAsc(SystemOssStorageTb::getId); - return systemOssStorageMapper.selectPage(page, wrapper); - } - @Override - public List queryOssStorage(SystemQueryStorageArgs criteria) { - // 防止刷数据 - Page page = new Page<>(1, 500); - return queryOssStorage(criteria, page).getContent(); - } + @Override + public List queryOssStorage(SystemQueryStorageArgs args) { + // 防止刷数据 + Page page = new Page<>(1, 500); + return searchOssStorage(args, page).getContent(); + } - @Override - public void exportOssStorageExcel(List ossStorages, HttpServletResponse response) - throws IOException { - List> list = new ArrayList<>(); - for (SystemOssStorageVo ossStorage : ossStorages) { - Map map = new LinkedHashMap<>(); - map.put("服务类型", ossStorage.getServiceType()); - map.put("服务地址", ossStorage.getEndpoint()); - map.put("存储桶名称", ossStorage.getBucketName()); - map.put("文件名称", ossStorage.getFileName()); - map.put("文件大小", ossStorage.getFileSizeDesc()); - map.put("文件类型", ossStorage.getFileMime()); - map.put("创建人", ossStorage.getCreateBy()); - map.put("创建日期", ossStorage.getCreateTime()); - list.add(map); + @Override + public void exportOssStorageExcel(List ossStorages, HttpServletResponse response) + throws IOException { + List> list = new ArrayList<>(); + for (SystemOssStorageVo ossStorage : ossStorages) { + Map map = new LinkedHashMap<>(); + map.put("服务类型", ossStorage.getServiceType()); + map.put("服务地址", ossStorage.getEndpoint()); + map.put("存储桶名称", ossStorage.getBucketName()); + map.put("文件名称", ossStorage.getFileName()); + map.put("文件大小", ossStorage.getFileSizeDesc()); + map.put("文件类型", ossStorage.getFileMime()); + map.put("创建人", ossStorage.getCreateBy()); + map.put("创建日期", ossStorage.getCreateTime()); + list.add(map); + } + KitFileUtil.downloadExcel(list, response); } - KitFileUtil.downloadExcel(list, response); - } - @Override - @Transactional(rollbackFor = Exception.class) - public String uploadFile(MultipartFile file) { - String originalFilename = file.getOriginalFilename(); - if (StrUtil.isBlank(originalFilename)) { - throw new BadRequestException("文件名不能为空"); + @Override + @Transactional(rollbackFor = Exception.class) + public String uploadFile(MultipartFile file) { + String originalFilename = file.getOriginalFilename(); + if (StrUtil.isBlank(originalFilename)) { + throw new BadRequestException("文件名不能为空"); + } + StorageOSSModel ossConfig = properties.getOss(); + long fileSize = file.getSize(); + String contentType = file.getContentType(); + KitFileUtil.checkSize(ossConfig.getMaxSize(), fileSize); + // 按天分组 + String nowDateStr = KitDateUtil.getNowDateStr(); + // 上传到本地临时目录 + File tempFile = KitFileUtil.upload(file, fileLocalUploadHelper.getPath() + nowDateStr + File.separator); + if (tempFile == null) { + throw new BadRequestException("上传失败"); + } + // 校验文件md5, 看是否已存在云端（不确定, 可能云端已经删除, 但是正常来说云端是不允许私自删除的, 所以这里忽略云端不存在的情况） + String md5 = KitFileUtil.getMd5(tempFile); + SystemOssStorageTb systemOssStorageTb = this.getOssStorageByMd5(md5); + if (systemOssStorageTb != null) { + // 重新生成7天链接 + return minioRepository.generatePreviewUrl(systemOssStorageTb.getObjectName()); + } + // 上传到OSS + SystemOssStorageTb storageTb = minioRepository.upload(tempFile, originalFilename, fileSize, contentType, md5); + if (storageTb == null) { + throw new BadRequestException("文件上传失败"); + } + save(storageTb); + return minioRepository.generatePreviewUrl(storageTb.getObjectName()); } - StorageOSSModel ossConfig = properties.getOss(); - long fileSize = file.getSize(); - String contentType = file.getContentType(); - KitFileUtil.checkSize(ossConfig.getMaxSize(), fileSize); - // 按天分组 - String nowDateStr = KitDateUtil.getNowDateStr(); - // 上传到本地临时目录 - File tempFile = KitFileUtil.upload(file, fileLocalUploadHelper.getPath() + nowDateStr + File.separator); - if (tempFile == null) { - throw new BadRequestException("上传失败"); - } - // 校验文件md5, 看是否已存在云端（不确定, 可能云端已经删除, 但是正常来说云端是不允许私自删除的, 所以这里忽略云端不存在的情况） - String md5 = KitFileUtil.getMd5(tempFile); - SystemOssStorageTb systemOssStorageTb = this.getByMd5(md5); - if (systemOssStorageTb != null) { - // 重新生成7天链接 - return minioRepository.generatePreviewUrl(systemOssStorageTb.getObjectName()); - } - // 上传到OSS - SystemOssStorageTb storageTb = minioRepository.upload(tempFile, originalFilename, fileSize, contentType, md5); - if (storageTb == null) { - throw new BadRequestException("文件上传失败"); - } - save(storageTb); - return minioRepository.generatePreviewUrl(storageTb.getObjectName()); - } - /** - * 多选删除 - * - * @param ids / - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void removeFileByIds(Long[] ids) { - for (Long id : ids) { - SystemOssStorageTb storage = getById(id); - minioRepository.removeBucketFile(storage.getObjectName()); - removeById(storage); + /** + * 多选删除 + * + * @param ids / + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteFileByIds(Long[] ids) { + for (Long id : ids) { + SystemOssStorageTb storage = getById(id); + minioRepository.removeBucketFile(storage.getObjectName()); + removeById(storage); + } } - } - private SystemOssStorageTb getByMd5(String md5) { - return lambdaQuery().eq(SystemOssStorageTb::getFileMd5, md5).one(); - } + private SystemOssStorageTb getOssStorageByMd5(String md5) { + return lambdaQuery().eq(SystemOssStorageTb::getFileMd5, md5).one(); + } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java index 0d443168..a95c39a5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java @@ -37,150 +37,150 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public final class KitSqlUtil { - /** - * 获取数据源 - * - * @param jdbcUrl / - * @param userName / - * @param password / - * @return DataSource - */ - private static DataSource getDataSource(String jdbcUrl, String userName, String password) { - HikariDataSource druidDataSource = new HikariDataSource(); - String className; - try { - className = DriverManager.getDriver(jdbcUrl.trim()).getClass().getName(); - } catch (SQLException e) { - throw new BadRequestException("Get class name error: =" + jdbcUrl); - } - if (StringUtils.isEmpty(className)) { - DataTypeEnum dataTypeEnum = DataTypeEnum.urlOf(jdbcUrl); - if (null == dataTypeEnum) { - throw new BadRequestException("Not supported data type: jdbcUrl=" + jdbcUrl); - } - druidDataSource.setDriverClassName(dataTypeEnum.getDriver()); - } else { - druidDataSource.setDriverClassName(className); - } - druidDataSource.setJdbcUrl(jdbcUrl); - druidDataSource.setUsername(userName); - druidDataSource.setPassword(password); - druidDataSource.setConnectionTimeout(3000); - return druidDataSource; - } - - private static Connection getConnection(String jdbcUrl, String userName, String password) { - DataSource dataSource = getDataSource(jdbcUrl, userName, password); - Connection connection = null; - try { - connection = dataSource.getConnection(); - } catch (Exception ignored) { - } - try { - int timeOut = 5; - if (null == connection || connection.isClosed() || !connection.isValid(timeOut)) { - log.info("connection is closed or invalid, retry get connection!"); - connection = dataSource.getConnection(); - } - } catch (Exception e) { - log.error("create connection error, jdbcUrl: {}", jdbcUrl); - throw new BadRequestException("create connection error, jdbcUrl: " + jdbcUrl); - } finally { - KitCloseUtil.close(connection); - } - return connection; - } - - private static void releaseConnection(Connection connection) { - if (null != connection) { - try { - connection.close(); - } catch (Exception e) { - log.error(e.getMessage(), e); - log.error("connection close error：" + e.getMessage()); - } - } - } - - public static boolean testConnection(String jdbcUrl, String userName, String password) { - Connection connection = null; - try { - connection = getConnection(jdbcUrl, userName, password); - if (null != connection) { - return true; - } - } catch (Exception e) { - log.info("Get connection failed:" + e.getMessage()); - } finally { - releaseConnection(connection); - } - return false; - } - - public static String executeFile(String jdbcUrl, String username, String password, File sqlFile) { - Connection connection = getConnection(jdbcUrl, username, password); - try { - batchExecute(connection, readSqlList(sqlFile)); - } catch (Exception e) { - log.error("sql脚本执行发生异常:{}", e.getMessage()); - return e.getMessage(); - } finally { - releaseConnection(connection); - } - return "success"; - } - - /** - * 批量执行sql - * - * @param connection / - * @param sqlList / - */ - public static void batchExecute(Connection connection, List sqlList) { - Statement st = null; - try { - st = connection.createStatement(); - for (String sql : sqlList) { - if (sql.endsWith(";")) { - sql = sql.substring(0, sql.length() - 1); + /** + * 获取数据源 + * + * @param jdbcUrl / + * @param userName / + * @param password / + * @return DataSource + */ + private static DataSource getDataSource(String jdbcUrl, String userName, String password) { + HikariDataSource druidDataSource = new HikariDataSource(); + String className; + try { + className = DriverManager.getDriver(jdbcUrl.trim()).getClass().getName(); + } catch (SQLException e) { + throw new BadRequestException("Get class name error: =" + jdbcUrl); } - st.addBatch(sql); - } - st.executeBatch(); - } catch (SQLException throwables) { - throwables.printStackTrace(); - } finally { - KitCloseUtil.close(st); - } - } - - /** - * 将文件中的sql语句以；为单位读取到列表中 - * - * @param sqlFile / - * @return / - * @throws Exception e - */ - private static List readSqlList(File sqlFile) throws Exception { - List sqlList = Lists.newArrayList(); - StringBuilder sb = new StringBuilder(); - try (BufferedReader reader = new BufferedReader( - new InputStreamReader(Files.newInputStream(sqlFile.toPath()), StandardCharsets.UTF_8))) { - String tmp; - while ((tmp = reader.readLine()) != null) { - log.info("line:{}", tmp); - if (tmp.endsWith(";")) { - sb.append(tmp); - sqlList.add(sb.toString()); - sb.delete(0, sb.length()); + if (StringUtils.isEmpty(className)) { + DataTypeEnum dataTypeEnum = DataTypeEnum.urlOf(jdbcUrl); + if (null == dataTypeEnum) { + throw new BadRequestException("Not supported data type: jdbcUrl=" + jdbcUrl); + } + druidDataSource.setDriverClassName(dataTypeEnum.getDriver()); } else { - sb.append(tmp); + druidDataSource.setDriverClassName(className); } - } - if (!"".endsWith(sb.toString().trim())) { - sqlList.add(sb.toString()); - } + druidDataSource.setJdbcUrl(jdbcUrl); + druidDataSource.setUsername(userName); + druidDataSource.setPassword(password); + druidDataSource.setConnectionTimeout(3000); + return druidDataSource; + } + + private static Connection getConnection(String jdbcUrl, String userName, String password) { + DataSource dataSource = getDataSource(jdbcUrl, userName, password); + Connection connection = null; + try { + connection = dataSource.getConnection(); + } catch (Exception ignored) { + } + try { + int timeOut = 5; + if (null == connection || connection.isClosed() || !connection.isValid(timeOut)) { + log.info("connection is closed or invalid, retry get connection!"); + connection = dataSource.getConnection(); + } + } catch (Exception e) { + log.error("create connection error, jdbcUrl: {}", jdbcUrl); + throw new BadRequestException("create connection error, jdbcUrl: " + jdbcUrl); + } finally { + KitCloseUtil.close(connection); + } + return connection; + } + + private static void releaseConnection(Connection connection) { + if (null != connection) { + try { + connection.close(); + } catch (Exception e) { + log.error(e.getMessage(), e); + log.error("connection close error：" + e.getMessage()); + } + } + } + + public static boolean testConnection(String jdbcUrl, String userName, String password) { + Connection connection = null; + try { + connection = getConnection(jdbcUrl, userName, password); + if (null != connection) { + return true; + } + } catch (Exception e) { + log.info("Get connection failed:" + e.getMessage()); + } finally { + releaseConnection(connection); + } + return false; + } + + public static String executeFile(String jdbcUrl, String username, String password, File sqlFile) { + Connection connection = getConnection(jdbcUrl, username, password); + try { + batchExecute(connection, readSqlList(sqlFile)); + } catch (Exception e) { + log.error("sql脚本执行发生异常:{}", e.getMessage()); + return e.getMessage(); + } finally { + releaseConnection(connection); + } + return "success"; + } + + /** + * 批量执行sql + * + * @param connection / + * @param sqlList / + */ + public static void batchExecute(Connection connection, List sqlList) { + Statement st = null; + try { + st = connection.createStatement(); + for (String sql : sqlList) { + if (sql.endsWith(";")) { + sql = sql.substring(0, sql.length() - 1); + } + st.addBatch(sql); + } + st.executeBatch(); + } catch (SQLException throwables) { + throwables.printStackTrace(); + } finally { + KitCloseUtil.close(st); + } + } + + /** + * 将文件中的sql语句以；为单位读取到列表中 + * + * @param sqlFile / + * @return / + * @throws Exception e + */ + private static List readSqlList(File sqlFile) throws Exception { + List sqlList = Lists.newArrayList(); + StringBuilder sb = new StringBuilder(); + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(Files.newInputStream(sqlFile.toPath()), StandardCharsets.UTF_8))) { + String tmp; + while ((tmp = reader.readLine()) != null) { + log.info("line:{}", tmp); + if (tmp.endsWith(";")) { + sb.append(tmp); + sqlList.add(sb.toString()); + sb.delete(0, sb.length()); + } else { + sb.append(tmp); + } + } + if (!"".endsWith(sb.toString().trim())) { + sqlList.add(sb.toString()); + } + } + return sqlList; } - return sqlList; - } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl b/cutejava-springboot3/cutejava-module-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl index 78b79672..1e4a8513 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl +++ b/cutejava-springboot3/cutejava-module-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl @@ -3,9 +3,9 @@