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 2b7fae6e..b1e40bee 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 @@ -67,8 +67,8 @@ public class SystemMenuController { @ApiOperation("返回全部的菜单") @PostMapping(value = "/listMenuByPid") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> listMenuByPid(@RequestParam Long pid) { - List systemMenuTbs = systemMenuService.listMenuByPid(pid); + public ResponseEntity> listMenuByPid(@RequestParam Long pid) { + List systemMenuTbs = systemMenuService.listMenuByPid(pid); return ResponseEntity.ok(systemMenuTbs); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 2122da6c..95d997ed 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 @@ -21,7 +21,7 @@ import cn.odboy.base.KitSelectOptionVo; import cn.odboy.system.dal.dataobject.SystemUserTb; import cn.odboy.system.dal.model.SystemQueryUserArgs; import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; -import cn.odboy.system.dal.model.SystemUserInfoVo; +import cn.odboy.system.dal.model.SystemUserJwtVo; import cn.odboy.system.dal.model.SystemUserVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.framework.permission.core.KitSecurityHelper; @@ -151,8 +151,8 @@ public class SystemUserController { @ApiOperation("获取用户信息") @PostMapping(value = "/getCurrentUserInfo") - public ResponseEntity getUserInfo() { - SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo(); + public ResponseEntity getUserInfo() { + SystemUserJwtVo userInfoVo = systemAuthService.getCurrentUserInfo(); return ResponseEntity.ok(userInfoVo); } } 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..d7dbfcf7 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 @@ -1,7 +1,6 @@ package cn.odboy.system.dal.model; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; import io.swagger.annotations.ApiModelProperty; @@ -16,7 +15,7 @@ public class SystemRoleVo extends SystemRoleTb { @ApiModelProperty(value = "用户", hidden = true) private Set users; @ApiModelProperty(value = "菜单", hidden = true) - private Set menus; + 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/SystemUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java index 0719ec2b..e0811d40 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,6 +12,7 @@ import lombok.Setter; @Getter @Setter public class SystemUserVo extends SystemUserTb { + @ApiModelProperty(value = "用户部门") private SystemDeptTb dept; @ApiModelProperty(value = "用户角色") 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 d71dac1d..2e007759 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 @@ -5,6 +5,7 @@ import cn.odboy.base.KitPageResult; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.model.SystemUserOnlineExportRowVo; import cn.odboy.system.dal.model.SystemUserOnlineVo; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.util.KitBeanUtil; @@ -167,9 +168,7 @@ public class SystemUserOnlineInfoDAO { public void exportOnlineUserXlsx(HttpServletResponse response, String username) { List userOnlineVos = this.queryUserOnlineModelListByUsername(username); -// KitXlsxExportUtil.exportFile(response, "在线用户数据", userOnlineVos, SystemUserOnlineExportRowVo.class, -// (dataObject) -> CollUtil.newArrayList(KitBeanUtil.copyProperties(dataObject, SystemUserOnlineExportRowVo.class))); - List rowVos = KitBeanUtil.copyToList(userOnlineVos, SystemUserOnlineVo.class); - KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineVo.class, rowVos); + List rowVos = KitBeanUtil.copyToList(userOnlineVos, SystemUserOnlineExportRowVo.class); + KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineExportRowVo.class, rowVos); } } 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 9112506f..c0e444c0 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 @@ -71,6 +71,7 @@ public class SystemAuthService { // 返回 token 与 用户信息 Map authInfo = new HashMap<>(2) {{ put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); + // 这里是为了清空密码 put("user", KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class)); }}; if (properties.getLogin().isSingle()) { @@ -83,10 +84,12 @@ public class SystemAuthService { return authInfo; } - public SystemUserInfoVo getCurrentUserInfoVo() { + public SystemUserJwtVo getCurrentUserInfo() { SystemUserJwtVo jwtUser = (SystemUserJwtVo) KitSecurityHelper.getCurrentUser(); - // 转换是为了去掉密码 - return KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class); + if (jwtUser.getUser() != null) { + jwtUser.getUser().setPassword(null); + } + return jwtUser; } public Map getCaptchaInfo() { 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 880d588c..0089e2ad 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 @@ -19,6 +19,7 @@ import cn.hutool.core.collection.CollUtil; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.model.SystemDeptVo; import cn.odboy.system.dal.model.SystemRoleVo; import cn.odboy.system.dal.model.SystemUserVo; import java.util.ArrayList; @@ -81,7 +82,7 @@ public class SystemDataService { List deptList = systemRoleDeptService.listDeptByRoleId(role.getId()); for (SystemDeptTb dept : deptList) { deptIds.add(dept.getId()); - List deptChildren = systemDeptService.listDeptByPid(dept.getId()); + List deptChildren = systemDeptService.listDeptByPid(dept.getId()); if (CollUtil.isNotEmpty(deptChildren)) { deptIds.addAll(systemDeptService.queryChildDeptIdByDeptIds(deptChildren)); } 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 dbaf2674..06508f3f 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 @@ -34,6 +34,7 @@ import cn.odboy.system.dal.mysql.SystemDeptMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitClassUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.lang.reflect.Field; @@ -69,7 +70,8 @@ public class SystemDeptService { */ @Transactional(rollbackFor = Exception.class) public void saveDept(SystemCreateDeptArgs args) { - systemDeptMapper.insert(KitBeanUtil.copyToClass(args, SystemDeptTb.class)); + SystemDeptTb deptTb = KitBeanUtil.copyToClass(args, SystemDeptTb.class); + systemDeptMapper.insert(deptTb); this.updateDeptSubCnt(args.getPid()); } @@ -146,17 +148,16 @@ public class SystemDeptService { } private List queryDeptByArgs(SystemQueryDeptArgs args) { + KitValidUtil.notNull(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.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); @@ -221,10 +222,10 @@ public class SystemDeptService { * @param depts / * @return / */ - private Set queryRelationDeptByArgs(List deptTbList, Set depts) { + private Set queryRelationDeptByArgs(List deptTbList, Set depts) { for (SystemDeptTb dept : deptTbList) { depts.add(dept); - List deptList = this.listDeptByPid(dept.getId()); + List deptList = this.listDeptByPid(dept.getId()); if (CollUtil.isNotEmpty(deptList)) { queryRelationDeptByArgs(deptList, depts); } @@ -232,11 +233,11 @@ public class SystemDeptService { return depts; } - public List queryChildDeptIdByDeptIds(List deptList) { + public List queryChildDeptIdByDeptIds(List deptList) { List list = new ArrayList<>(); - for (SystemDeptTb systemDeptTb : deptList) { + for (SystemDeptVo systemDeptTb : deptList) { if (systemDeptTb != null && systemDeptTb.getEnabled()) { - List deptList1 = this.listDeptByPid(systemDeptTb.getId()); + List deptList1 = this.listDeptByPid(systemDeptTb.getId()); if (CollUtil.isNotEmpty(deptList1)) { list.addAll(queryChildDeptIdByDeptIds(deptList1)); } @@ -253,7 +254,7 @@ public class SystemDeptService { * @param deptList / * @return / */ - private List querySuperiorDeptByPid(SystemDeptTb dept, List deptList) { + private List querySuperiorDeptByPid(SystemDeptTb dept, List deptList) { if (dept.getPid() == null) { deptList.addAll(this.listRootDept()); return deptList; @@ -262,10 +263,10 @@ public class SystemDeptService { return querySuperiorDeptByPid(this.getDeptById(dept.getPid()), deptList); } - private List listRootDept() { + private List listRootDept() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.isNull(SystemDeptTb::getPid); - return systemDeptMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class); } /** @@ -274,14 +275,14 @@ public class SystemDeptService { * @return / */ public KitPageResult searchDeptTree(List ids, Boolean exclude) { - Set deptSet1 = new LinkedHashSet<>(); + Set deptSet1 = new LinkedHashSet<>(); for (Long id : ids) { // 同级数据 SystemDeptTb dept = this.getDeptById(id); // 上级数据 - List depts = this.querySuperiorDeptByPid(dept, new ArrayList<>()); + List depts = this.querySuperiorDeptByPid(dept, new ArrayList<>()); if (exclude) { - for (SystemDeptTb data : depts) { + for (SystemDeptVo data : depts) { if (data.getId().equals(dept.getPid())) { data.setSubCount(data.getSubCount() - 1); } @@ -291,7 +292,7 @@ public class SystemDeptService { } deptSet1.addAll(depts); } - List deptList = KitBeanUtil.copyToList(new ArrayList<>(deptSet1), SystemDeptVo.class); + List deptList = new ArrayList<>(deptSet1); // 构建部门树 Set trees = new LinkedHashSet<>(); Set deptSet = new LinkedHashSet<>(); @@ -358,9 +359,9 @@ public class SystemDeptService { // 根部门 depts.add(this.getDeptById(id)); // 子部门 - List deptList = listDeptByPid(id); + List deptList = this.listDeptByPid(id); if (CollectionUtil.isNotEmpty(deptList)) { - depts = queryRelationDeptByArgs(deptList, depts); + queryRelationDeptByArgs(deptList, depts); } } return depts; @@ -464,10 +465,10 @@ public class SystemDeptService { return vo; } - public List listDeptByPid(long pid) { + public List listDeptByPid(long pid) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemDeptTb::getPid, pid); - return systemDeptMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class); } public void exportDeptXlsx(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index 183b465d..7d2521f9 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 @@ -27,6 +27,7 @@ import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -55,6 +56,8 @@ public class SystemDictDetailService { */ @Transactional(rollbackFor = Exception.class) public void saveDictDetail(SystemCreateDictDetailArgs args) { + KitValidUtil.notNull(args); + KitValidUtil.notNull(args.getDict()); SystemDictDetailTb dictDetail = KitBeanUtil.copyToClass(args, SystemDictDetailTb.class); dictDetail.setDictId(args.getDict().getId()); systemDictDetailMapper.insert(dictDetail); @@ -104,8 +107,7 @@ public class SystemDictDetailService { * @param page 分页参数 * @return / */ - public KitPageResult searchDictDetail(SystemQueryDictDetailArgs args, - Page page) { + public KitPageResult searchDictDetail(SystemQueryDictDetailArgs args, Page page) { IPage iPage = systemDictDetailMapper.selectPageByArgs(page, args).convert(i -> KitBeanUtil.copyToClass(i, SystemDictDetailVo.class)); List dictIds = iPage.getRecords().stream().map(SystemDictDetailTb::getDictId).collect(Collectors.toList()); Map id2ItemMap = systemDictMapper.selectByIds(dictIds).stream().collect(Collectors.toMap(SystemDictTb::getId, i -> i)); @@ -129,11 +131,12 @@ public class SystemDictDetailService { if (systemDictTb == null) { return new ArrayList<>(); } - return this.listDictDetailByDictId(systemDictTb.getId()).stream().map(m -> { - SystemDictDetailVo detailVo = KitBeanUtil.copyToClass(m, SystemDictDetailVo.class); + List detailTbs = this.listDictDetailByDictId(systemDictTb.getId()); + List detailVos = KitBeanUtil.copyToList(detailTbs, SystemDictDetailVo.class); + for (SystemDictDetailVo detailVo : detailVos) { detailVo.setDict(systemDictTb); - return detailVo; - }).collect(Collectors.toList()); + } + return detailVos; } public Map> getDictDetailMap(String dictName) { 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 c2338b5c..df5932a5 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 @@ -26,6 +26,7 @@ import cn.odboy.system.dal.model.SystemQueryDictArgs; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -52,7 +53,8 @@ public class SystemDictService { */ @Transactional(rollbackFor = Exception.class) public void saveDict(SystemCreateDictArgs args) { - systemDictMapper.insert(KitBeanUtil.copyToClass(args, SystemDictTb.class)); + SystemDictTb dictTb = KitBeanUtil.copyToClass(args, SystemDictTb.class); + systemDictMapper.insert(dictTb); } /** @@ -96,10 +98,9 @@ public class SystemDictService { } 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())); - } + KitValidUtil.notNull(args); + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or() + .like(SystemDictTb::getDescription, args.getBlurry())); } public List queryDictByArgs(SystemQueryDictArgs args) { 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 d76b925b..ecfe7596 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 @@ -26,6 +26,7 @@ import cn.odboy.system.dal.model.SystemQueryJobArgs; import cn.odboy.system.dal.mysql.SystemJobMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -56,7 +57,8 @@ public class SystemJobService { if (job != null) { throw new BadRequestException("职位名称已存在"); } - systemJobMapper.insert(KitBeanUtil.copyToClass(args, SystemJobTb.class)); + SystemJobTb systemJobTb = KitBeanUtil.copyToClass(args, SystemJobTb.class); + systemJobMapper.insert(systemJobTb); } /** @@ -127,13 +129,12 @@ public class SystemJobService { } 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)); - } + KitValidUtil.notNull(args); + 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 a423d4dd..feb4f387 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 @@ -33,6 +33,7 @@ import cn.odboy.system.dal.mysql.SystemLocalStorageMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -139,16 +140,15 @@ public class SystemLocalStorageService { } 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)); - } + KitValidUtil.notNull(args); + 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); } @@ -171,8 +171,6 @@ public class SystemLocalStorageService { public void exportLocalStorageXlsx(HttpServletResponse response, SystemQueryStorageArgs args) { List systemLocalStorageTbs = this.queryLocalStorageByArgs(args); -// KitXlsxExportUtil.exportFile(response, "文件上传记录数据", systemLocalStorageTbs, SystemLocalStorageExportRowVo.class, -// (dataObject) -> CollUtil.newArrayList(KitBeanUtil.copyProperties(dataObject, SystemLocalStorageExportRowVo.class))); List rowVos = KitBeanUtil.copyToList(systemLocalStorageTbs, SystemLocalStorageExportRowVo.class); KitExcelExporter.exportSimple(response, "文件上传记录数据", SystemLocalStorageExportRowVo.class, rowVos); } 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 8fcd43c2..f90a2a64 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,7 @@ import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitClassUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -152,10 +153,10 @@ public class SystemMenuService { */ @Transactional(rollbackFor = Exception.class) public void deleteMenuByIds(Set ids) { - Set menuSet = new HashSet<>(); + Set menuSet = new HashSet<>(); for (Long id : ids) { - List menuList = this.listMenuByPid(id); - menuSet.add(systemMenuMapper.selectById(id)); + List menuList = this.listMenuByPid(id); + menuSet.add(this.getMenuVoById(id)); menuSet = this.queryChildMenuByArgs(menuList, menuSet); } List menuIds = @@ -169,6 +170,10 @@ public class SystemMenuService { } } + private SystemMenuVo getMenuVoById(Long id) { + return KitBeanUtil.copyToClass(systemMenuMapper.selectById(id), SystemMenuVo.class); + } + @Transactional(rollbackFor = Exception.class) public void updateMenuSubCnt(Long menuId) { if (menuId != null) { @@ -215,7 +220,7 @@ public class SystemMenuService { * @param currentUserId / * @return / */ - public List listMenuByUserId(Long currentUserId) { + public List listMenuByUserId(Long currentUserId) { List roles = systemUserRoleService.queryRoleByUsersId(currentUserId); Set roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet()); return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds)); @@ -228,10 +233,10 @@ public class SystemMenuService { * @param menuSet / * @return / */ - public Set queryChildMenuByArgs(List menuList, Set menuSet) { - for (SystemMenuTb menu : menuList) { + public Set queryChildMenuByArgs(List menuList, Set menuSet) { + for (SystemMenuVo menu : menuList) { menuSet.add(menu); - List menus = this.listMenuByPid(menu.getId()); + List menus = this.listMenuByPid(menu.getId()); if (CollUtil.isNotEmpty(menus)) { queryChildMenuByArgs(menus, menuSet); } @@ -245,13 +250,13 @@ public class SystemMenuService { * @param pid / * @return / */ - public List listMenuByPid(Long pid) { - List menus; + public List listMenuByPid(Long pid) { + List menus; if (pid != null && !pid.equals(0L)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemMenuTb::getPid, pid); wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return systemMenuMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class); } else { menus = this.listRootMenu(); } @@ -265,13 +270,13 @@ public class SystemMenuService { * @param menus / * @return / */ - public List querySuperiorMenuByArgs(SystemMenuTb menu, List menus) { + public List querySuperiorMenuByArgs(SystemMenuTb menu, List menus) { if (menu.getPid() == null) { menus.addAll(this.listRootMenu()); return menus; } menus.addAll(this.listMenuByPid(menu.getPid())); - return querySuperiorMenuByArgs(systemMenuMapper.selectById(menu.getPid()), menus); + return querySuperiorMenuByArgs(this.getMenuVoById(menu.getPid()), menus); } /** @@ -373,8 +378,8 @@ public class SystemMenuService { return menuVo1; } - public List listMenuByIds(List ids) { - return systemMenuMapper.selectByIds(ids); + public List listMenuByIds(List ids) { + return KitBeanUtil.copyToList(systemMenuMapper.selectByIds(ids), SystemMenuVo.class); } private SystemMenuTb getMenuByComponentName(String componentName) { @@ -396,53 +401,51 @@ public class SystemMenuService { } private List queryMenuByArgs(SystemQueryMenuArgs args) { + KitValidUtil.notNull(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.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() { + private List listRootMenu() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.isNull(SystemMenuTb::getPid); wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return systemMenuMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class); } public List buildFrontMenus() { - List menuList = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); - List originMenus = KitBeanUtil.copyToList(menuList, SystemMenuVo.class); + List originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); List targetMenus = this.buildMenuTree(originMenus); return this.buildMenuVo(targetMenus); } public Set listChildMenuSetByMenuId(Long id) { - Set menuSet = new HashSet<>(); - List menuList = this.listMenuByPid(id); - menuSet.add(systemMenuMapper.selectById(id)); + Set menuSet = new HashSet<>(); + List menuList = this.listMenuByPid(id); + menuSet.add(this.getMenuVoById(id)); menuSet = this.queryChildMenuByArgs(menuList, menuSet); return menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); } public List listMenuSuperior(List ids) { - Set menus; + Set menus; List systemMenuTbs; if (CollectionUtil.isNotEmpty(ids)) { menus = new LinkedHashSet<>(this.listMenuByIds(ids)); for (SystemMenuTb menu : menus) { - List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); - for (SystemMenuTb data : menuList) { + List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); + for (SystemMenuVo data : menuList) { if (data.getId().equals(menu.getPid())) { data.setSubCount(data.getSubCount() - 1); } @@ -451,28 +454,16 @@ public class SystemMenuService { } // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); - List newMenuList = new ArrayList<>(menus); - systemMenuTbs = this.buildMenuTree(KitBeanUtil.copyToList(newMenuList, SystemMenuVo.class)); + List newMenuList = new ArrayList<>(menus); + systemMenuTbs = this.buildMenuTree(newMenuList); } else { - List newMenuList = this.listMenuByPid(null); - systemMenuTbs = KitBeanUtil.copyToList(newMenuList, SystemMenuVo.class); + systemMenuTbs = this.listMenuByPid(null); } return systemMenuTbs; } public void exportMenuXlsx(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception { List systemMenuTbs = this.queryAllMenu(args, false); -// KitXlsxExportUtil.exportFile(response, "菜单数据", systemMenuTbs, SystemMenuExportRowVo.class, (dataObject -> { -// SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo(); -// rowVo.setTitle(dataObject.getTitle()); -// rowVo.setType(dataObject.getType() == null ? "目录" : dataObject.getType() == 1 ? "菜单" : "按钮"); -// rowVo.setPermission(dataObject.getPermission()); -// rowVo.setIFrame(dataObject.getIFrame() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR); -// rowVo.setHidden(dataObject.getHidden() ? SystemYesOrNoChConst.NO_STR : SystemYesOrNoChConst.YES_STR); -// rowVo.setCache(dataObject.getCache() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// })); List rowVos = new ArrayList<>(); for (SystemMenuTb dataObject : systemMenuTbs) { SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo(); 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 727cbe67..c8139fd4 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 @@ -34,6 +34,7 @@ import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.framework.quartz.QuartzManage; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -199,36 +200,27 @@ public class SystemQuartzJobService { * @param page 分页参数 * @return / */ - public KitPageResult searchQuartzJobByArgs(SystemQueryQuartzJobArgs args, - Page page) { + public KitPageResult searchQuartzJobByArgs(SystemQueryQuartzJobArgs args, Page page) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); this.injectQuartzJobQueryParams(args, wrapper); return KitPageUtil.toPage(systemQuartzJobMapper.selectPage(page, wrapper)); } - 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)); - } + private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper wrapper) { + KitValidUtil.notNull(args); + 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); } - 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)); - } + private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper wrapper) { + KitValidUtil.notNull(args); + 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); } 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 d50737bb..f1a49e8f 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 @@ -18,8 +18,10 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; +import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; +import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -46,10 +48,10 @@ public class SystemRoleMenuService { } @Transactional(rollbackFor = Exception.class) - public void batchInsertRoleMenu(Set menus, Long roleId) { + public void batchInsertRoleMenu(Set menus, Long roleId) { if (CollUtil.isNotEmpty(menus)) { List records = new ArrayList<>(); - for (SystemMenuTb menu : menus) { + for (SystemMenuVo menu : menus) { SystemRoleMenuTb record = new SystemRoleMenuTb(); record.setMenuId(menu.getId()); record.setRoleId(roleId); @@ -68,7 +70,7 @@ public class SystemRoleMenuService { } } - public LinkedHashSet queryMenuByRoleIds(Set roleIds) { + public LinkedHashSet queryMenuByRoleIds(Set roleIds) { if (CollUtil.isEmpty(roleIds)) { return new LinkedHashSet<>(); } @@ -84,7 +86,10 @@ public class SystemRoleMenuService { // 排除"按钮" menuWrapper.ne(SystemMenuTb::getType, 2); menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); - return new LinkedHashSet<>(systemMenuMapper.selectList(menuWrapper)); + + List systemMenuTbs = systemMenuMapper.selectList(menuWrapper); + List systemMenuVos = KitBeanUtil.copyToList(systemMenuTbs, SystemMenuVo.class); + return new LinkedHashSet<>(systemMenuVos); } @Transactional(rollbackFor = Exception.class) 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 de8fbc98..3cf71083 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 @@ -25,6 +25,7 @@ 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.model.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.model.SystemQueryRoleArgs; import cn.odboy.system.dal.model.SystemRoleCodeVo; import cn.odboy.system.dal.model.SystemRoleExportRowVo; @@ -33,6 +34,7 @@ import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -70,7 +72,8 @@ public class SystemRoleService { if (this.getRoleByName(args.getName()) != null) { throw new BadRequestException("角色名称已存在"); } - systemRoleMapper.insert(KitBeanUtil.copyToClass(args, SystemRoleTb.class)); + SystemRoleTb roleTb = KitBeanUtil.copyToClass(args, SystemRoleTb.class); + systemRoleMapper.insert(roleTb); // 判断是否有部门数据, 若有, 则需创建关联 if (CollectionUtil.isNotEmpty(args.getDepts())) { systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId()); @@ -91,7 +94,7 @@ public class SystemRoleService { @Transactional(rollbackFor = Exception.class) public void updateRoleById(SystemRoleVo args) { checkRoleLevels(args.getLevel()); - SystemRoleVo role = KitBeanUtil.copyToClass(systemRoleMapper.selectById(args.getId()), SystemRoleVo.class); + SystemRoleVo role = this.getRoleVoById(args.getId()); SystemRoleTb role1 = this.getRoleByName(args.getName()); if (role1 != null && !role1.getId().equals(role.getId())) { throw new BadRequestException("角色名称已存在"); @@ -111,6 +114,10 @@ public class SystemRoleService { } } + private SystemRoleVo getRoleVoById(Long id) { + return KitBeanUtil.copyToClass(systemRoleMapper.selectById(id), SystemRoleVo.class); + } + /** * 修改绑定的菜单 * @@ -122,8 +129,9 @@ public class SystemRoleService { // 更新菜单 systemRoleMenuService.deleteRoleMenuByRoleId(role.getId()); // 判断是否为空 - if (CollUtil.isNotEmpty(args.getMenus())) { - systemRoleMenuService.batchInsertRoleMenu(args.getMenus(), role.getId()); + Set menus = args.getMenus(); + if (CollUtil.isNotEmpty(menus)) { + systemRoleMenuService.batchInsertRoleMenu(menus, role.getId()); } } @@ -163,19 +171,18 @@ public class SystemRoleService { * @return / */ public List queryRoleByArgs(SystemQueryRoleArgs args) { + KitValidUtil.notNull(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.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) { + if (args.getSize() != null) { Page rolePage = new Page<>(args.getPage(), args.getSize()); Page page = systemRoleMapper.selectPage(rolePage, wrapper); List roles = page.getRecords(); @@ -232,15 +239,14 @@ public class SystemRoleService { } public Long countRoleByArgs(SystemQueryRoleArgs args) { + KitValidUtil.notNull(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.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); } 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 4296953a..6b838e6a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java @@ -18,9 +18,9 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; +import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.model.SystemRoleVo; import cn.odboy.system.dal.model.SystemUserVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; @@ -86,8 +86,7 @@ public class SystemUserRoleService { } SystemRoleVo roleVo = KitBeanUtil.copyToClass(role, SystemRoleVo.class); // 查询关联的菜单信息 - Set menus = systemRoleMenuService.queryMenuByRoleIds( - Collections.singleton(role.getId())); + Set menus = systemRoleMenuService.queryMenuByRoleIds(Collections.singleton(role.getId())); roleVo.setMenus(menus); // 查询关联的部门信息 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 fa5b154c..9daa3a78 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 @@ -32,6 +32,7 @@ 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.SystemDeptVo; import cn.odboy.system.dal.model.SystemQueryUserArgs; import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; import cn.odboy.system.dal.model.SystemUserExportRowVo; @@ -44,6 +45,7 @@ import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; import cn.odboy.util.KitRsaEncryptUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -400,26 +402,25 @@ public class SystemUserService { * @return / */ private LambdaQueryWrapper buildUserQueryWrapper(SystemQueryUserArgs args) { + KitValidUtil.notNull(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)); - } + 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; @@ -487,7 +488,7 @@ public class SystemUserService { if (!ObjectUtils.isEmpty(args.getDeptId())) { args.getDeptIds().add(args.getDeptId()); // 先查找是否存在子节点 - List data = systemDeptService.listDeptByPid(args.getDeptId()); + List data = systemDeptService.listDeptByPid(args.getDeptId()); // 然后把子节点的ID都加入到集合中 args.getDeptIds().addAll(systemDeptService.queryChildDeptIdByDeptIds(data)); } 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 5931c8b6..848de53e 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 @@ -33,6 +33,7 @@ import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitDateUtil; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -68,33 +69,27 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl searchOssStorage(SystemQueryStorageArgs args, - Page page) { - IPage ossStorageTbs = this.selectOssStorageByArgs(args, page); - IPage convert = ossStorageTbs.convert(c -> { - SystemOssStorageVo storageVo = KitBeanUtil.copyToClass(c, SystemOssStorageVo.class); + public KitPageResult searchOssStorage(SystemQueryStorageArgs args, Page page) { + IPage ossStorageTbs = this.selectOssStorageByArgs(args, page); + for (SystemOssStorageVo storageVo : ossStorageTbs.getRecords()) { storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize())); - return storageVo; - }); - return KitPageUtil.toPage(convert); + } + return KitPageUtil.toPage(ossStorageTbs); } - private IPage selectOssStorageByArgs(SystemQueryStorageArgs args, - Page page) { + private IPage selectOssStorageByArgs(SystemQueryStorageArgs args, Page page) { + KitValidUtil.notNull(args); 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.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); + return systemOssStorageMapper.selectPage(page, wrapper).convert(i -> KitBeanUtil.copyToClass(i, SystemOssStorageVo.class)); } @Override diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index c6e26f3c..2f3e9058 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -67,8 +67,8 @@ public class SystemMenuController { @ApiOperation("返回全部的菜单") @PostMapping(value = "/listMenuByPid") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity> listMenuByPid(@RequestParam Long pid) { - List systemMenuTbs = systemMenuService.listMenuByPid(pid); + public ResponseEntity> listMenuByPid(@RequestParam Long pid) { + List systemMenuTbs = systemMenuService.listMenuByPid(pid); return ResponseEntity.ok(systemMenuTbs); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java index 90e2d2ca..d7dbfcf7 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java @@ -1,7 +1,6 @@ package cn.odboy.system.dal.model; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; import io.swagger.annotations.ApiModelProperty; @@ -16,7 +15,7 @@ public class SystemRoleVo extends SystemRoleTb { @ApiModelProperty(value = "用户", hidden = true) private Set users; @ApiModelProperty(value = "菜单", hidden = true) - private Set menus; + private Set menus; @ApiModelProperty(value = "部门", hidden = true) private Set depts; } 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 2dc1a3eb..99816d88 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 @@ -168,8 +168,6 @@ public class SystemUserOnlineInfoDAO { public void exportOnlineUserXlsx(HttpServletResponse response, String username) { List userOnlineVos = this.queryUserOnlineModelListByUsername(username); -// KitXlsxExportUtil.exportFile(response, "在线用户数据", userOnlineVos, SystemUserOnlineExportRowVo.class, -// (dataObject) -> CollUtil.newArrayList(KitBeanUtil.copyProperties(dataObject, SystemUserOnlineExportRowVo.class))); List rowVos = KitBeanUtil.copyToList(userOnlineVos, SystemUserOnlineExportRowVo.class); KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineExportRowVo.class, rowVos); } 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 a062aa9c..4a956e95 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 @@ -71,6 +71,7 @@ public class SystemAuthService { // 返回 token 与 用户信息 Map authInfo = new HashMap<>(2) {{ put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); + // 这里是为了清空密码 put("user", KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class)); }}; if (properties.getLogin().isSingle()) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java index c7707ae0..ec7d8826 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java @@ -19,6 +19,7 @@ import cn.hutool.core.collection.CollUtil; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; +import cn.odboy.system.dal.model.SystemDeptVo; import cn.odboy.system.dal.model.SystemRoleVo; import cn.odboy.system.dal.model.SystemUserVo; import java.util.ArrayList; @@ -81,7 +82,7 @@ public class SystemDataService { List deptList = systemRoleDeptService.listDeptByRoleId(role.getId()); for (SystemDeptTb dept : deptList) { deptIds.add(dept.getId()); - List deptChildren = systemDeptService.listDeptByPid(dept.getId()); + List deptChildren = systemDeptService.listDeptByPid(dept.getId()); if (CollUtil.isNotEmpty(deptChildren)) { deptIds.addAll(systemDeptService.queryChildDeptIdByDeptIds(deptChildren)); } 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 ff3e83a0..f1ae8897 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 @@ -70,7 +70,8 @@ public class SystemDeptService { */ @Transactional(rollbackFor = Exception.class) public void saveDept(SystemCreateDeptArgs args) { - systemDeptMapper.insert(KitBeanUtil.copyToClass(args, SystemDeptTb.class)); + SystemDeptTb deptTb = KitBeanUtil.copyToClass(args, SystemDeptTb.class); + systemDeptMapper.insert(deptTb); this.updateDeptSubCnt(args.getPid()); } @@ -221,10 +222,10 @@ public class SystemDeptService { * @param depts / * @return / */ - private Set queryRelationDeptByArgs(List deptTbList, Set depts) { + private Set queryRelationDeptByArgs(List deptTbList, Set depts) { for (SystemDeptTb dept : deptTbList) { depts.add(dept); - List deptList = this.listDeptByPid(dept.getId()); + List deptList = this.listDeptByPid(dept.getId()); if (CollUtil.isNotEmpty(deptList)) { queryRelationDeptByArgs(deptList, depts); } @@ -232,11 +233,11 @@ public class SystemDeptService { return depts; } - public List queryChildDeptIdByDeptIds(List deptList) { + public List queryChildDeptIdByDeptIds(List deptList) { List list = new ArrayList<>(); - for (SystemDeptTb systemDeptTb : deptList) { + for (SystemDeptVo systemDeptTb : deptList) { if (systemDeptTb != null && systemDeptTb.getEnabled()) { - List deptList1 = this.listDeptByPid(systemDeptTb.getId()); + List deptList1 = this.listDeptByPid(systemDeptTb.getId()); if (CollUtil.isNotEmpty(deptList1)) { list.addAll(queryChildDeptIdByDeptIds(deptList1)); } @@ -253,7 +254,7 @@ public class SystemDeptService { * @param deptList / * @return / */ - private List querySuperiorDeptByPid(SystemDeptTb dept, List deptList) { + private List querySuperiorDeptByPid(SystemDeptTb dept, List deptList) { if (dept.getPid() == null) { deptList.addAll(this.listRootDept()); return deptList; @@ -262,10 +263,10 @@ public class SystemDeptService { return querySuperiorDeptByPid(this.getDeptById(dept.getPid()), deptList); } - private List listRootDept() { + private List listRootDept() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.isNull(SystemDeptTb::getPid); - return systemDeptMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class); } /** @@ -274,14 +275,14 @@ public class SystemDeptService { * @return / */ public KitPageResult searchDeptTree(List ids, Boolean exclude) { - Set deptSet1 = new LinkedHashSet<>(); + Set deptSet1 = new LinkedHashSet<>(); for (Long id : ids) { // 同级数据 SystemDeptTb dept = this.getDeptById(id); // 上级数据 - List depts = this.querySuperiorDeptByPid(dept, new ArrayList<>()); + List depts = this.querySuperiorDeptByPid(dept, new ArrayList<>()); if (exclude) { - for (SystemDeptTb data : depts) { + for (SystemDeptVo data : depts) { if (data.getId().equals(dept.getPid())) { data.setSubCount(data.getSubCount() - 1); } @@ -291,7 +292,7 @@ public class SystemDeptService { } deptSet1.addAll(depts); } - List deptList = KitBeanUtil.copyToList(new ArrayList<>(deptSet1), SystemDeptVo.class); + List deptList = new ArrayList<>(deptSet1); // 构建部门树 Set trees = new LinkedHashSet<>(); Set deptSet = new LinkedHashSet<>(); @@ -358,9 +359,9 @@ public class SystemDeptService { // 根部门 depts.add(this.getDeptById(id)); // 子部门 - List deptList = listDeptByPid(id); + List deptList = this.listDeptByPid(id); if (CollectionUtil.isNotEmpty(deptList)) { - depts = queryRelationDeptByArgs(deptList, depts); + queryRelationDeptByArgs(deptList, depts); } } return depts; @@ -464,10 +465,10 @@ public class SystemDeptService { return vo; } - public List listDeptByPid(long pid) { + public List listDeptByPid(long pid) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemDeptTb::getPid, pid); - return systemDeptMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class); } public void exportDeptXlsx(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception { 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 aabcd1d5..0c33235a 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 @@ -27,6 +27,7 @@ import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; +import cn.odboy.util.KitValidUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -55,6 +56,8 @@ public class SystemDictDetailService { */ @Transactional(rollbackFor = Exception.class) public void saveDictDetail(SystemCreateDictDetailArgs args) { + KitValidUtil.notNull(args); + KitValidUtil.notNull(args.getDict()); SystemDictDetailTb dictDetail = KitBeanUtil.copyToClass(args, SystemDictDetailTb.class); dictDetail.setDictId(args.getDict().getId()); systemDictDetailMapper.insert(dictDetail); @@ -104,8 +107,7 @@ public class SystemDictDetailService { * @param page 分页参数 * @return / */ - public KitPageResult searchDictDetail(SystemQueryDictDetailArgs args, - Page page) { + public KitPageResult searchDictDetail(SystemQueryDictDetailArgs args, Page page) { IPage iPage = systemDictDetailMapper.selectPageByArgs(page, args).convert(i -> KitBeanUtil.copyToClass(i, SystemDictDetailVo.class)); List dictIds = iPage.getRecords().stream().map(SystemDictDetailTb::getDictId).collect(Collectors.toList()); Map id2ItemMap = systemDictMapper.selectByIds(dictIds).stream().collect(Collectors.toMap(SystemDictTb::getId, i -> i)); @@ -129,11 +131,12 @@ public class SystemDictDetailService { if (systemDictTb == null) { return new ArrayList<>(); } - return this.listDictDetailByDictId(systemDictTb.getId()).stream().map(m -> { - SystemDictDetailVo detailVo = KitBeanUtil.copyToClass(m, SystemDictDetailVo.class); + List detailTbs = this.listDictDetailByDictId(systemDictTb.getId()); + List detailVos = KitBeanUtil.copyToList(detailTbs, SystemDictDetailVo.class); + for (SystemDictDetailVo detailVo : detailVos) { detailVo.setDict(systemDictTb); - return detailVo; - }).collect(Collectors.toList()); + } + return detailVos; } public Map> getDictDetailMap(String dictName) { 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 f48b25fd..26593dd9 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 @@ -53,7 +53,8 @@ public class SystemDictService { */ @Transactional(rollbackFor = Exception.class) public void saveDict(SystemCreateDictArgs args) { - systemDictMapper.insert(KitBeanUtil.copyToClass(args, SystemDictTb.class)); + SystemDictTb dictTb = KitBeanUtil.copyToClass(args, SystemDictTb.class); + systemDictMapper.insert(dictTb); } /** 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 9b16cb34..185b4bd6 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 @@ -57,7 +57,8 @@ public class SystemJobService { if (job != null) { throw new BadRequestException("职位名称已存在"); } - systemJobMapper.insert(KitBeanUtil.copyToClass(args, SystemJobTb.class)); + SystemJobTb systemJobTb = KitBeanUtil.copyToClass(args, SystemJobTb.class); + systemJobMapper.insert(systemJobTb); } /** diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index c5c50811..64b9b2e4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -171,8 +171,6 @@ public class SystemLocalStorageService { public void exportLocalStorageXlsx(HttpServletResponse response, SystemQueryStorageArgs args) { List systemLocalStorageTbs = this.queryLocalStorageByArgs(args); -// KitXlsxExportUtil.exportFile(response, "文件上传记录数据", systemLocalStorageTbs, SystemLocalStorageExportRowVo.class, -// (dataObject) -> CollUtil.newArrayList(KitBeanUtil.copyProperties(dataObject, SystemLocalStorageExportRowVo.class))); List rowVos = KitBeanUtil.copyToList(systemLocalStorageTbs, SystemLocalStorageExportRowVo.class); KitExcelExporter.exportSimple(response, "文件上传记录数据", SystemLocalStorageExportRowVo.class, rowVos); } 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 4ab97e12..22e93bb3 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 @@ -153,10 +153,10 @@ public class SystemMenuService { */ @Transactional(rollbackFor = Exception.class) public void deleteMenuByIds(Set ids) { - Set menuSet = new HashSet<>(); + Set menuSet = new HashSet<>(); for (Long id : ids) { - List menuList = this.listMenuByPid(id); - menuSet.add(systemMenuMapper.selectById(id)); + List menuList = this.listMenuByPid(id); + menuSet.add(this.getMenuVoById(id)); menuSet = this.queryChildMenuByArgs(menuList, menuSet); } List menuIds = @@ -170,6 +170,10 @@ public class SystemMenuService { } } + private SystemMenuVo getMenuVoById(Long id) { + return KitBeanUtil.copyToClass(systemMenuMapper.selectById(id), SystemMenuVo.class); + } + @Transactional(rollbackFor = Exception.class) public void updateMenuSubCnt(Long menuId) { if (menuId != null) { @@ -216,7 +220,7 @@ public class SystemMenuService { * @param currentUserId / * @return / */ - public List listMenuByUserId(Long currentUserId) { + public List listMenuByUserId(Long currentUserId) { List roles = systemUserRoleService.queryRoleByUsersId(currentUserId); Set roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet()); return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds)); @@ -229,10 +233,10 @@ public class SystemMenuService { * @param menuSet / * @return / */ - public Set queryChildMenuByArgs(List menuList, Set menuSet) { - for (SystemMenuTb menu : menuList) { + public Set queryChildMenuByArgs(List menuList, Set menuSet) { + for (SystemMenuVo menu : menuList) { menuSet.add(menu); - List menus = this.listMenuByPid(menu.getId()); + List menus = this.listMenuByPid(menu.getId()); if (CollUtil.isNotEmpty(menus)) { queryChildMenuByArgs(menus, menuSet); } @@ -246,13 +250,13 @@ public class SystemMenuService { * @param pid / * @return / */ - public List listMenuByPid(Long pid) { - List menus; + public List listMenuByPid(Long pid) { + List menus; if (pid != null && !pid.equals(0L)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SystemMenuTb::getPid, pid); wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return systemMenuMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class); } else { menus = this.listRootMenu(); } @@ -266,13 +270,13 @@ public class SystemMenuService { * @param menus / * @return / */ - public List querySuperiorMenuByArgs(SystemMenuTb menu, List menus) { + public List querySuperiorMenuByArgs(SystemMenuTb menu, List menus) { if (menu.getPid() == null) { menus.addAll(this.listRootMenu()); return menus; } menus.addAll(this.listMenuByPid(menu.getPid())); - return querySuperiorMenuByArgs(systemMenuMapper.selectById(menu.getPid()), menus); + return querySuperiorMenuByArgs(this.getMenuVoById(menu.getPid()), menus); } /** @@ -374,8 +378,8 @@ public class SystemMenuService { return menuVo1; } - public List listMenuByIds(List ids) { - return systemMenuMapper.selectByIds(ids); + public List listMenuByIds(List ids) { + return KitBeanUtil.copyToList(systemMenuMapper.selectByIds(ids), SystemMenuVo.class); } private SystemMenuTb getMenuByComponentName(String componentName) { @@ -413,36 +417,35 @@ public class SystemMenuService { return systemMenuMapper.selectList(wrapper); } - private List listRootMenu() { + private List listRootMenu() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.isNull(SystemMenuTb::getPid); wrapper.orderByAsc(SystemMenuTb::getMenuSort); - return systemMenuMapper.selectList(wrapper); + return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class); } public List buildFrontMenus() { - List menuList = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); - List originMenus = KitBeanUtil.copyToList(menuList, SystemMenuVo.class); + List originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId()); List targetMenus = this.buildMenuTree(originMenus); return this.buildMenuVo(targetMenus); } public Set listChildMenuSetByMenuId(Long id) { - Set menuSet = new HashSet<>(); - List menuList = this.listMenuByPid(id); - menuSet.add(systemMenuMapper.selectById(id)); + Set menuSet = new HashSet<>(); + List menuList = this.listMenuByPid(id); + menuSet.add(this.getMenuVoById(id)); menuSet = this.queryChildMenuByArgs(menuList, menuSet); return menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet()); } public List listMenuSuperior(List ids) { - Set menus; + Set menus; List systemMenuTbs; if (CollectionUtil.isNotEmpty(ids)) { menus = new LinkedHashSet<>(this.listMenuByIds(ids)); for (SystemMenuTb menu : menus) { - List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); - for (SystemMenuTb data : menuList) { + List menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>()); + for (SystemMenuVo data : menuList) { if (data.getId().equals(menu.getPid())) { data.setSubCount(data.getSubCount() - 1); } @@ -451,28 +454,16 @@ public class SystemMenuService { } // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题 menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet()); - List newMenuList = new ArrayList<>(menus); - systemMenuTbs = this.buildMenuTree(KitBeanUtil.copyToList(newMenuList, SystemMenuVo.class)); + List newMenuList = new ArrayList<>(menus); + systemMenuTbs = this.buildMenuTree(newMenuList); } else { - List newMenuList = this.listMenuByPid(null); - systemMenuTbs = KitBeanUtil.copyToList(newMenuList, SystemMenuVo.class); + systemMenuTbs = this.listMenuByPid(null); } return systemMenuTbs; } public void exportMenuXlsx(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception { List systemMenuTbs = this.queryAllMenu(args, false); -// KitXlsxExportUtil.exportFile(response, "菜单数据", systemMenuTbs, SystemMenuExportRowVo.class, (dataObject -> { -// SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo(); -// rowVo.setTitle(dataObject.getTitle()); -// rowVo.setType(dataObject.getType() == null ? "目录" : dataObject.getType() == 1 ? "菜单" : "按钮"); -// rowVo.setPermission(dataObject.getPermission()); -// rowVo.setIFrame(dataObject.getIFrame() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR); -// rowVo.setHidden(dataObject.getHidden() ? SystemYesOrNoChConst.NO_STR : SystemYesOrNoChConst.YES_STR); -// rowVo.setCache(dataObject.getCache() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR); -// rowVo.setCreateTime(dataObject.getCreateTime()); -// return CollUtil.newArrayList(rowVo); -// })); List rowVos = new ArrayList<>(); for (SystemMenuTb dataObject : systemMenuTbs) { SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java index d50737bb..f1a49e8f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java @@ -18,8 +18,10 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; +import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; +import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -46,10 +48,10 @@ public class SystemRoleMenuService { } @Transactional(rollbackFor = Exception.class) - public void batchInsertRoleMenu(Set menus, Long roleId) { + public void batchInsertRoleMenu(Set menus, Long roleId) { if (CollUtil.isNotEmpty(menus)) { List records = new ArrayList<>(); - for (SystemMenuTb menu : menus) { + for (SystemMenuVo menu : menus) { SystemRoleMenuTb record = new SystemRoleMenuTb(); record.setMenuId(menu.getId()); record.setRoleId(roleId); @@ -68,7 +70,7 @@ public class SystemRoleMenuService { } } - public LinkedHashSet queryMenuByRoleIds(Set roleIds) { + public LinkedHashSet queryMenuByRoleIds(Set roleIds) { if (CollUtil.isEmpty(roleIds)) { return new LinkedHashSet<>(); } @@ -84,7 +86,10 @@ public class SystemRoleMenuService { // 排除"按钮" menuWrapper.ne(SystemMenuTb::getType, 2); menuWrapper.orderByAsc(SystemMenuTb::getMenuSort); - return new LinkedHashSet<>(systemMenuMapper.selectList(menuWrapper)); + + List systemMenuTbs = systemMenuMapper.selectList(menuWrapper); + List systemMenuVos = KitBeanUtil.copyToList(systemMenuTbs, SystemMenuVo.class); + return new LinkedHashSet<>(systemMenuVos); } @Transactional(rollbackFor = Exception.class) 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 d7926e40..2ee88f40 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 @@ -25,6 +25,7 @@ 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.model.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.model.SystemQueryRoleArgs; import cn.odboy.system.dal.model.SystemRoleCodeVo; import cn.odboy.system.dal.model.SystemRoleExportRowVo; @@ -71,7 +72,8 @@ public class SystemRoleService { if (this.getRoleByName(args.getName()) != null) { throw new BadRequestException("角色名称已存在"); } - systemRoleMapper.insert(KitBeanUtil.copyToClass(args, SystemRoleTb.class)); + SystemRoleTb roleTb = KitBeanUtil.copyToClass(args, SystemRoleTb.class); + systemRoleMapper.insert(roleTb); // 判断是否有部门数据, 若有, 则需创建关联 if (CollectionUtil.isNotEmpty(args.getDepts())) { systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId()); @@ -92,7 +94,7 @@ public class SystemRoleService { @Transactional(rollbackFor = Exception.class) public void updateRoleById(SystemRoleVo args) { checkRoleLevels(args.getLevel()); - SystemRoleVo role = KitBeanUtil.copyToClass(systemRoleMapper.selectById(args.getId()), SystemRoleVo.class); + SystemRoleVo role = this.getRoleVoById(args.getId()); SystemRoleTb role1 = this.getRoleByName(args.getName()); if (role1 != null && !role1.getId().equals(role.getId())) { throw new BadRequestException("角色名称已存在"); @@ -112,6 +114,10 @@ public class SystemRoleService { } } + private SystemRoleVo getRoleVoById(Long id) { + return KitBeanUtil.copyToClass(systemRoleMapper.selectById(id), SystemRoleVo.class); + } + /** * 修改绑定的菜单 * @@ -123,8 +129,9 @@ public class SystemRoleService { // 更新菜单 systemRoleMenuService.deleteRoleMenuByRoleId(role.getId()); // 判断是否为空 - if (CollUtil.isNotEmpty(args.getMenus())) { - systemRoleMenuService.batchInsertRoleMenu(args.getMenus(), role.getId()); + Set menus = args.getMenus(); + if (CollUtil.isNotEmpty(menus)) { + systemRoleMenuService.batchInsertRoleMenu(menus, role.getId()); } } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java index 4296953a..c008421d 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java @@ -21,6 +21,7 @@ import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; +import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.model.SystemRoleVo; import cn.odboy.system.dal.model.SystemUserVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; @@ -86,8 +87,7 @@ public class SystemUserRoleService { } SystemRoleVo roleVo = KitBeanUtil.copyToClass(role, SystemRoleVo.class); // 查询关联的菜单信息 - Set menus = systemRoleMenuService.queryMenuByRoleIds( - Collections.singleton(role.getId())); + Set menus = systemRoleMenuService.queryMenuByRoleIds(Collections.singleton(role.getId())); roleVo.setMenus(menus); // 查询关联的部门信息 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index 97425e66..cc9a9a8a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -32,6 +32,7 @@ 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.SystemDeptVo; import cn.odboy.system.dal.model.SystemQueryUserArgs; import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; import cn.odboy.system.dal.model.SystemUserExportRowVo; @@ -487,7 +488,7 @@ public class SystemUserService { if (!ObjectUtils.isEmpty(args.getDeptId())) { args.getDeptIds().add(args.getDeptId()); // 先查找是否存在子节点 - List data = systemDeptService.listDeptByPid(args.getDeptId()); + List data = systemDeptService.listDeptByPid(args.getDeptId()); // 然后把子节点的ID都加入到集合中 args.getDeptIds().addAll(systemDeptService.queryChildDeptIdByDeptIds(data)); }