diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java index 86031e35..995e44ac 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java @@ -15,6 +15,7 @@ */ package cn.odboy.util; +import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; import java.util.Set; import java.util.stream.Collectors; @@ -22,6 +23,7 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotNull; import jakarta.validation.groups.Default; import lombok.experimental.UtilityClass; @@ -61,4 +63,22 @@ public final class KitValidUtil { throw new BadRequestException("参数非必填"); } } + + public static void notNull(Object value, @NotNull String name, @NotNull String code) { + if (value != null) { + throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); + } + } + + public static void isBlank(CharSequence value, @NotNull String name, @NotNull String code) { + if (StrUtil.isNotBlank(value)) { + throw new BadRequestException(String.format("参数 %s(%s) 非必填", name, code)); + } + } + + public static void notBlank(CharSequence value, @NotNull String name, @NotNull String code) { + if (StrUtil.isBlank(value)) { + throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); + } + } } \ No newline at end of file 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..5fc6f746 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,13 +24,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum SystemCaptchaBizEnum { - /* 通过手机号码重置邮箱 */ - PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", - "通过手机号码重置邮箱"), /* 通过旧邮箱重置邮箱 */ + 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", "通过邮箱重置密码"); /** * 业务编码 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..47f7d19f 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,9 +24,8 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum SystemDataScopeEnum { - /* 全部的数据权限 */ - ALL("全部", "全部的数据权限"), /* 自己部门的数据权限 */ - THIS_LEVEL("本级", "自己部门的数据权限"), /* 自定义的数据权限 */ + ALL("全部", "全部的数据权限"), + THIS_LEVEL("本级", "自己部门的数据权限"), CUSTOMIZE("自定义", "自定义的数据权限"); private final String value; private final String description; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java index c4d5c807..037f8b47 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package cn.odboy.system.framework.bizlock; import java.lang.annotation.Documented; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java index 1f5ccff4..9805d137 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package cn.odboy.system.framework.bizlock; import cn.odboy.framework.exception.BadRequestException; @@ -63,14 +62,11 @@ public class BizLockAspect { return String.format("%s:%s", bizLock.bizName(), ((MethodSignature) joinPoint.getSignature()).getMethod().getName()); } - // 解析SpEL表达式 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod(); - // 创建SpEL上下文 StandardEvaluationContext context = new StandardEvaluationContext(); - // 设置方法参数 String[] parameterNames = signature.getParameterNames(); Object[] args = joinPoint.getArgs(); @@ -79,15 +75,12 @@ public class BizLockAspect { // 支持#p0,#p1格式 context.setVariable("p" + i, args[i]); } - // 设置方法相关信息 context.setVariable("methodName", method.getName()); context.setVariable("targetClass", joinPoint.getTarget().getClass().getName()); - // 解析表达式 Expression expression = parser.parseExpression(bizLock.key()); String value = expression.getValue(context, String.class); - // 组合最终的key: bizName:解析后的key return String.format("%s:%s", bizLock.bizName(), value); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java index 15da77d0..7aba1d5f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java @@ -26,8 +26,8 @@ import cn.odboy.framework.quartz.core.QuartzRunnable; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.model.request.SystemSendEmailArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.service.SystemEmailService; import cn.odboy.system.service.SystemQuartzJobService; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java index 2c4a0d09..5d3cc43a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java @@ -3,17 +3,17 @@ package cn.odboy.system.service; import cn.odboy.constant.SystemConst; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; -import cn.odboy.framework.redis.KitRedisHelper; +import cn.odboy.system.dal.model.request.SystemUserLoginArgs; import cn.odboy.system.dal.model.response.SystemAuthVo; import cn.odboy.system.dal.model.response.SystemUserInfoVo; import cn.odboy.system.dal.model.response.SystemUserJwtVo; -import cn.odboy.system.dal.model.request.SystemUserLoginArgs; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitRsaEncryptUtil; +import cn.odboy.util.KitValidUtil; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -25,8 +25,6 @@ import org.springframework.stereotype.Service; @Service public class SystemAuthService { - @Autowired - private KitRedisHelper redisHelper; @Autowired private AppProperties properties; @Autowired @@ -40,29 +38,35 @@ public class SystemAuthService { @Autowired private SystemCaptchaService systemCaptchaService; - public SystemAuthVo doLogin(SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception { + public SystemAuthVo doLogin(SystemUserLoginArgs loginArgs, HttpServletRequest request) throws Exception { + KitValidUtil.notNull(loginArgs); + // 密码解密 - String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword()); + String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginArgs.getPassword()); // 校验验证码 - systemCaptchaService.validate(loginRequest.getUuid(), loginRequest.getCode()); + systemCaptchaService.validate(loginArgs.getUuid(), loginArgs.getCode()); // 获取用户信息 - SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername()); + SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginArgs.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 与 用户信息 SystemAuthVo authInfo = new SystemAuthVo(); authInfo.setToken(String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); - // 这里是为了清空密码 + /// 这里是为了清空密码 authInfo.setUser(KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class)); + if (properties.getLogin().isSingle()) { // 踢掉之前已经登录的token - systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername()); + systemUserOnlineInfoDAO.kickOutByUsername(loginArgs.getUsername()); } // 保存在线信息 systemUserOnlineInfoDAO.saveUserJwtModelByToken(jwtUser, token, request); 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 fb37d9d1..53f10b1d 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 @@ -24,12 +24,12 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.constant.SystemZhConst; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; import cn.odboy.system.dal.model.export.SystemDeptExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; +import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.dal.model.response.SystemDeptVo; import cn.odboy.system.dal.model.response.SystemProductLineTreeVo; import cn.odboy.system.dal.model.response.SystemProductLineVo; -import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.dal.mysql.SystemDeptMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; @@ -70,8 +70,8 @@ public class SystemDeptService { */ @Transactional(rollbackFor = Exception.class) public void saveDept(SystemCreateDeptArgs args) { - SystemDeptTb deptTb = KitBeanUtil.copyToClass(args, SystemDeptTb.class); - systemDeptMapper.insert(deptTb); + KitValidUtil.notNull(args); + systemDeptMapper.insert(KitBeanUtil.copyToClass(args, SystemDeptTb.class)); this.updateDeptSubCnt(args.getPid()); } @@ -82,8 +82,10 @@ public class SystemDeptService { */ @Transactional(rollbackFor = Exception.class) public void updateDeptById(SystemDeptTb args) { - // 旧的部门 + KitValidUtil.notNull(args); + // 旧的父部门 Long oldPid = this.getDeptVoById(args.getId()).getPid(); + // 新的父部门 Long newPid = args.getPid(); if (args.getPid() != null && args.getId().equals(args.getPid())) { throw new BadRequestException("上级不能为自己"); @@ -220,9 +222,8 @@ public class SystemDeptService { * * @param deptTbList / * @param depts / - * @return / */ - private Set queryRelationDeptByArgs(List deptTbList, Set depts) { + private void queryRelationDeptByArgs(List deptTbList, Set depts) { for (SystemDeptVo dept : deptTbList) { depts.add(dept); List deptList = this.listDeptByPid(dept.getId()); @@ -230,7 +231,6 @@ public class SystemDeptService { queryRelationDeptByArgs(deptList, depts); } } - return depts; } public List queryChildDeptIdByDeptIds(List deptList) { @@ -473,13 +473,6 @@ public class SystemDeptService { public void exportDeptXlsx(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception { List systemDeptTbs = this.queryAllDeptByArgs(args, false); -// KitXlsxExportUtil.exportFile(response, "部门数据", systemDeptTbs, SystemDeptExportRowVo.class, (dataObject) -> { -// SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo(); -// rowVo.setName(dataObject.getName()); -// rowVo.setEnabled(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// }); List rowVos = new ArrayList<>(); for (SystemDeptTb dataObject : systemDeptTbs) { SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo(); 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 558f2950..19c9b210 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 @@ -21,8 +21,8 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.dataobject.SystemDictTb; import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; 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 4e6f6433..2966ea91 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 @@ -19,10 +19,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.request.SystemCreateDictArgs; -import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.model.export.SystemDictExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateDictArgs; import cn.odboy.system.dal.model.request.SystemQueryDictArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; @@ -111,29 +111,6 @@ public class SystemDictService { public void exportDictXlsx(HttpServletResponse response, SystemQueryDictArgs args) { List systemDictTbs = this.queryDictByArgs(args); -// KitXlsxExportUtil.exportFile(response, "字典数据", systemDictTbs, SystemDictExportRowVo.class, (dataObject) -> { -// List dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName()); -// if (CollUtil.isEmpty(dictDetails)) { -// SystemDictExportRowVo rowVo = new SystemDictExportRowVo(); -// rowVo.setName(dataObject.getName()); -// rowVo.setDescription(dataObject.getDescription()); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// rowVo.setLabel(""); -// rowVo.setValue(""); -// return CollUtil.newArrayList(rowVo); -// } -// List rowVos = new ArrayList<>(); -// for (SystemDictDetailVo dictDetail : dictDetails) { -// SystemDictExportRowVo rowVo = new SystemDictExportRowVo(); -// rowVo.setName(dataObject.getName()); -// rowVo.setDescription(dataObject.getDescription()); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// rowVo.setLabel(dictDetail.getLabel()); -// rowVo.setValue(dictDetail.getValue()); -// rowVos.add(rowVo); -// } -// return rowVos; -// }); List rowVos = new ArrayList<>(); for (SystemDictTb dataObject : systemDictTbs) { List dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName()); 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 a6af2d67..80c60b83 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 @@ -20,8 +20,8 @@ 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.request.SystemCreateJobArgs; import cn.odboy.system.dal.model.export.SystemJobExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateJobArgs; import cn.odboy.system.dal.model.request.SystemQueryJobArgs; import cn.odboy.system.dal.mysql.SystemJobMapper; import cn.odboy.util.KitBeanUtil; @@ -141,13 +141,6 @@ public class SystemJobService { public void exportJobXlsx(HttpServletResponse response, SystemQueryJobArgs args) { List systemJobTbs = this.queryJobByArgs(args); -// KitXlsxExportUtil.exportFile(response, "岗位数据", systemJobTbs, SystemJobExportRowVo.class, (dataObject) -> { -// SystemJobExportRowVo rowVo = new SystemJobExportRowVo(); -// rowVo.setName(dataObject.getName()); -// rowVo.setEnabled(dataObject.getEnabled() ? "启用" : "停用"); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// }); List rowVos = new ArrayList<>(); for (SystemJobTb dataObject : systemJobTbs) { SystemJobExportRowVo rowVo = new SystemJobExportRowVo(); 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 868d2939..7986ce5c 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 @@ -20,14 +20,14 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; -import cn.odboy.system.constant.SystemYesOrNoChConst; import cn.odboy.system.constant.SystemTransferProtocolConst; +import cn.odboy.system.constant.SystemYesOrNoChConst; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.export.SystemMenuExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemMenuMetaVo; import cn.odboy.system.dal.model.response.SystemMenuRouterVo; import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; 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 a35a2e54..10e66194 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 @@ -17,8 +17,8 @@ package cn.odboy.system.service; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; 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 6e859ebb..91056c88 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 @@ -25,10 +25,10 @@ import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; import cn.odboy.system.dal.model.export.SystemQuartzJobExportRowVo; -import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.model.export.SystemQuartzLogExportRowVo; import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.mysql.SystemQuartzJobMapper; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.framework.quartz.QuartzManage; @@ -296,20 +296,6 @@ public class SystemQuartzJobService { public void exportQuartzLogXlsx(HttpServletResponse response, SystemQueryQuartzJobArgs args) { List systemQuartzLogTbs = this.queryQuartzLogByArgs(args); -// KitXlsxExportUtil.exportFile(response, "定时任务日志数据", systemQuartzLogTbs, SystemQuartzLogExportRowVo.class, -// (dataObject) -> { -// SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo(); -// rowVo.setJobName(dataObject.getJobName()); -// rowVo.setBeanName(dataObject.getBeanName()); -// rowVo.setMethodName(dataObject.getMethodName()); -// rowVo.setParams(dataObject.getParams()); -// rowVo.setCronExpression(dataObject.getCronExpression()); -// rowVo.setExceptionDetail(dataObject.getExceptionDetail()); -// rowVo.setTime(dataObject.getTime()); -// rowVo.setStatus(dataObject.getIsSuccess() ? "成功" : "失败"); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// }); List rowVos = new ArrayList<>(); for (SystemQuartzLogTb dataObject : systemQuartzLogTbs) { SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo(); 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 63b064ad..1b953385 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 @@ -23,11 +23,11 @@ import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; -import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.response.SystemRoleCodeVo; import cn.odboy.system.dal.model.export.SystemRoleExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.response.SystemRoleCodeVo; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; @@ -281,14 +281,6 @@ public class SystemRoleService { public void exportRoleXlsx(HttpServletResponse response, SystemQueryRoleArgs args) { List systemRoleVos = this.queryRoleByArgs(args); -// KitXlsxExportUtil.exportFile(response, "角色数据", systemRoleVos, SystemRoleExportRowVo.class, (dataObject) -> { -// SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo(); -// rowVo.setName(dataObject.getName()); -// rowVo.setLevel(dataObject.getLevel()); -// rowVo.setDescription(dataObject.getDescription()); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// }); List rowVos = new ArrayList<>(); for (SystemRoleVo dataObject : systemRoleVos) { SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo(); 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 4525308e..3187f273 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,11 +31,11 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserJobTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.response.SystemDeptVo; -import cn.odboy.system.dal.model.request.SystemQueryUserArgs; -import cn.odboy.system.dal.model.response.SystemRoleVo; -import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs; import cn.odboy.system.dal.model.export.SystemUserExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryUserArgs; +import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.mysql.SystemUserMapper; import cn.odboy.system.dal.redis.SystemUserInfoDAO; @@ -510,35 +510,6 @@ public class SystemUserService { } public void exportUserXlsx(HttpServletResponse response, SystemQueryUserArgs args) { - // List systemUserVos = systemUserService.queryUserVoByArgs(args); -// KitXlsxExportUtil.exportFile(response, "用户数据", systemUserVos, SystemUserExportRowVo.class, (dataObject) -> { -// SystemUserExportRowVo rowVo = new SystemUserExportRowVo(); -// rowVo.setUsername(dataObject.getUsername()); -// rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(","))); -// rowVo.setDept(dataObject.getDept().getName()); -// rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(","))); -// rowVo.setEmail(dataObject.getEmail()); -// rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR); -// rowVo.setMobile(dataObject.getPhone()); -// rowVo.setUpdatePwdTime(dataObject.getPwdResetTime()); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// }); -// List rowVos = new ArrayList<>(); -// for (SystemUserVo dataObject : systemUserVos) { -// SystemUserExportRowVo rowVo = new SystemUserExportRowVo(); -// rowVo.setUsername(dataObject.getUsername()); -// rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(","))); -// rowVo.setDept(dataObject.getDept().getName()); -// rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(","))); -// rowVo.setEmail(dataObject.getEmail()); -// rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR); -// rowVo.setMobile(dataObject.getPhone()); -// rowVo.setUpdatePwdTime(dataObject.getPwdResetTime()); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// rowVos.add(rowVo); -// } -// KitExcelExporter.exportSimple(response, "用户数据", SystemUserExportRowVo.class, rowVos); long totalCount = this.countUserByArgs(args); KitExcelExporter.exportByPage(response, "用户数据", SystemUserExportRowVo.class, totalCount, (long pageNum, long pageSize) -> { KitPageResult pageResult = this.searchUserByArgs(args, new Page<>(pageNum, pageSize)); diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java index dc7bab7c..143a32b1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java @@ -24,8 +24,8 @@ import cn.odboy.framework.properties.model.StorageOSSModel; import cn.odboy.framework.server.core.KitFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; import cn.odboy.system.dal.model.export.SystemOssStorageExportRowVo; -import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.mysql.SystemOssStorageMapper; import cn.odboy.system.framework.storage.minio.MinioRepository; import cn.odboy.system.service.SystemOssStorageService; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java index b122fa7f..a68cab2a 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java @@ -15,6 +15,7 @@ */ package cn.odboy.util; +import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; import java.util.Set; import java.util.stream.Collectors; @@ -22,6 +23,7 @@ import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; +import javax.validation.constraints.NotNull; import javax.validation.groups.Default; import lombok.experimental.UtilityClass; @@ -61,4 +63,22 @@ public final class KitValidUtil { throw new BadRequestException("参数非必填"); } } + + public static void notNull(Object value, @NotNull String name, @NotNull String code) { + if (value != null) { + throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); + } + } + + public static void isBlank(CharSequence value, @NotNull String name, @NotNull String code) { + if (StrUtil.isNotBlank(value)) { + throw new BadRequestException(String.format("参数 %s(%s) 非必填", name, code)); + } + } + + public static void notBlank(CharSequence value, @NotNull String name, @NotNull String code) { + if (StrUtil.isBlank(value)) { + throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); + } + } } \ No newline at end of file diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java index a33a1c11..6c4ec4b1 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java @@ -24,13 +24,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum SystemCaptchaBizEnum { - /* 通过手机号码重置邮箱 */ - PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", - "通过手机号码重置邮箱"), /* 通过旧邮箱重置邮箱 */ + 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", "通过邮箱重置密码"); /** * 业务编码 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java index 4bdff0d0..fae764ef 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java @@ -24,9 +24,8 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum SystemDataScopeEnum { - /* 全部的数据权限 */ - ALL("全部", "全部的数据权限"), /* 自己部门的数据权限 */ - THIS_LEVEL("本级", "自己部门的数据权限"), /* 自定义的数据权限 */ + ALL("全部", "全部的数据权限"), + THIS_LEVEL("本级", "自己部门的数据权限"), CUSTOMIZE("自定义", "自定义的数据权限"); private final String value; private final String description; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 5d7cf99c..5c8129b4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.response.SystemUserJwtVo; import cn.odboy.system.dal.model.export.SystemUserOnlineExportRowVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java index cf82ccec..9805d137 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java @@ -72,7 +72,8 @@ public class BizLockAspect { Object[] args = joinPoint.getArgs(); for (int i = 0; i < parameterNames.length; i++) { context.setVariable(parameterNames[i], args[i]); - context.setVariable("p" + i, args[i]); // 支持#p0,#p1格式 + // 支持#p0,#p1格式 + context.setVariable("p" + i, args[i]); } // 设置方法相关信息 context.setVariable("methodName", method.getName()); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java index 6a109d0b..b41d2cd8 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java @@ -26,8 +26,8 @@ import cn.odboy.framework.quartz.core.QuartzRunnable; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.model.request.SystemSendEmailArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.service.SystemEmailService; import cn.odboy.system.service.SystemQuartzJobService; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java index e9925a9a..28e2f86a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java @@ -13,6 +13,7 @@ import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitRsaEncryptUtil; +import cn.odboy.util.KitValidUtil; import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -37,13 +38,15 @@ public class SystemAuthService { @Autowired private SystemCaptchaService systemCaptchaService; - public SystemAuthVo doLogin(SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception { + public SystemAuthVo doLogin(SystemUserLoginArgs loginArgs, HttpServletRequest request) throws Exception { + KitValidUtil.notNull(loginArgs); + // 密码解密 - String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword()); + String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginArgs.getPassword()); // 校验验证码 - systemCaptchaService.validate(loginRequest.getUuid(), loginRequest.getCode()); + systemCaptchaService.validate(loginArgs.getUuid(), loginArgs.getCode()); // 获取用户信息 - SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername()); + SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginArgs.getUsername()); // 验证用户密码 if (!passwordEncoder.matches(password, jwtUser.getPassword())) { throw new BadRequestException("登录密码错误"); @@ -63,7 +66,7 @@ public class SystemAuthService { if (properties.getLogin().isSingle()) { // 踢掉之前已经登录的token - systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername()); + systemUserOnlineInfoDAO.kickOutByUsername(loginArgs.getUsername()); } // 保存在线信息 systemUserOnlineInfoDAO.saveUserJwtModelByToken(jwtUser, token, request); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index d0cfc942..7c0aa0ec 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -24,12 +24,12 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.constant.SystemZhConst; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; import cn.odboy.system.dal.model.export.SystemDeptExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; +import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.dal.model.response.SystemDeptVo; import cn.odboy.system.dal.model.response.SystemProductLineTreeVo; import cn.odboy.system.dal.model.response.SystemProductLineVo; -import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.dal.mysql.SystemDeptMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; @@ -70,8 +70,8 @@ public class SystemDeptService { */ @Transactional(rollbackFor = Exception.class) public void saveDept(SystemCreateDeptArgs args) { - SystemDeptTb deptTb = KitBeanUtil.copyToClass(args, SystemDeptTb.class); - systemDeptMapper.insert(deptTb); + KitValidUtil.notNull(args); + systemDeptMapper.insert(KitBeanUtil.copyToClass(args, SystemDeptTb.class)); this.updateDeptSubCnt(args.getPid()); } @@ -82,8 +82,10 @@ public class SystemDeptService { */ @Transactional(rollbackFor = Exception.class) public void updateDeptById(SystemDeptTb args) { - // 旧的部门 + KitValidUtil.notNull(args); + // 旧的父部门 Long oldPid = this.getDeptVoById(args.getId()).getPid(); + // 新的父部门 Long newPid = args.getPid(); if (args.getPid() != null && args.getId().equals(args.getPid())) { throw new BadRequestException("上级不能为自己"); @@ -220,9 +222,8 @@ public class SystemDeptService { * * @param deptTbList / * @param depts / - * @return / */ - private Set queryRelationDeptByArgs(List deptTbList, Set depts) { + private void queryRelationDeptByArgs(List deptTbList, Set depts) { for (SystemDeptVo dept : deptTbList) { depts.add(dept); List deptList = this.listDeptByPid(dept.getId()); @@ -230,7 +231,6 @@ public class SystemDeptService { queryRelationDeptByArgs(deptList, depts); } } - return depts; } public List queryChildDeptIdByDeptIds(List deptList) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index c04d775c..bffcdd85 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -21,8 +21,8 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.dataobject.SystemDictTb; import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index f57f8216..843230ad 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -19,10 +19,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.request.SystemCreateDictArgs; -import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.model.export.SystemDictExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateDictArgs; import cn.odboy.system.dal.model.request.SystemQueryDictArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index 5790d78c..0b03c384 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -20,8 +20,8 @@ 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.request.SystemCreateJobArgs; import cn.odboy.system.dal.model.export.SystemJobExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateJobArgs; import cn.odboy.system.dal.model.request.SystemQueryJobArgs; import cn.odboy.system.dal.mysql.SystemJobMapper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 959e9ef9..b6b3e486 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -20,14 +20,14 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; -import cn.odboy.system.constant.SystemYesOrNoChConst; import cn.odboy.system.constant.SystemTransferProtocolConst; +import cn.odboy.system.constant.SystemYesOrNoChConst; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.export.SystemMenuExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemMenuMetaVo; import cn.odboy.system.dal.model.response.SystemMenuRouterVo; import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java index a6dc500f..4b557483 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java @@ -17,8 +17,8 @@ package cn.odboy.system.service; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index 4c1c335b..88e500b4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -25,10 +25,10 @@ import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; import cn.odboy.system.dal.model.export.SystemQuartzJobExportRowVo; -import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.model.export.SystemQuartzLogExportRowVo; import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.mysql.SystemQuartzJobMapper; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.framework.quartz.QuartzManage; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 5b16bcaa..ac5bc2c0 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -23,11 +23,11 @@ import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; -import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.response.SystemRoleCodeVo; import cn.odboy.system.dal.model.export.SystemRoleExportRowVo; +import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.response.SystemRoleCodeVo; import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java index d230f16a..2d9c8145 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java @@ -24,8 +24,8 @@ import cn.odboy.framework.properties.model.StorageOSSModel; import cn.odboy.framework.server.core.KitFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; import cn.odboy.system.dal.model.export.SystemOssStorageExportRowVo; -import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.mysql.SystemOssStorageMapper; import cn.odboy.system.framework.storage.minio.MinioRepository; import cn.odboy.system.service.SystemOssStorageService;