diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 3a67cbe3e..830910af5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -52,7 +52,7 @@ public class SysCategoryController { private ISysCategoryService sysCategoryService; /** - * 分页列表查询 + * 分页列表查询 * @param sysCategory * @param pageNo * @param pageSize @@ -62,9 +62,9 @@ public class SysCategoryController { // @RequiresPermissions("sys:category:list") @GetMapping(value = "/rootList") public Result> queryPageList(SysCategory sysCategory, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { if(oConvertUtils.isEmpty(sysCategory.getPid())){ sysCategory.setPid("0"); } @@ -84,7 +84,7 @@ public class SysCategoryController { return result; } -// @RequiresPermissions("sys:category:list") + // @RequiresPermissions("sys:category:list") @GetMapping(value = "/childList") public Result> queryPageList(SysCategory sysCategory,HttpServletRequest req) { Result> result = new Result>(); @@ -95,11 +95,11 @@ public class SysCategoryController { return result; } - /**标签内容-树形结构列表 - * - * @param params - * @return - */ + /**标签内容-树形结构列表 + * + * @param params + * @return + */ @AutoLog(value = "标签内容-树形结构列表") @ApiOperation(value="标签内容-树形结构列表", notes="标签内容-树形结构列表") @PostMapping(value = "/queryPageList") @@ -110,7 +110,7 @@ public class SysCategoryController { } /** - * 添加 + * 添加 * @param sysCategory * @return */ @@ -118,19 +118,14 @@ public class SysCategoryController { @PostMapping(value = "/add") public Result add(@RequestBody SysCategory sysCategory) { Result result = new Result(); - try { - sysCategory.setName(sysCategory.getName().replace(" ","")); - sysCategoryService.addSysCategory(sysCategory); - result.success("添加成功!"); - } catch (Exception e) { - log.error(e.getMessage(),e); - result.error500("操作失败"); - } + sysCategory.setName(sysCategory.getName().replace(" ","")); + sysCategoryService.addSysCategory(sysCategory); + result.success("添加成功!"); return result; } /** - * 编辑 + * 编辑 * @param sysCategory * @return */ @@ -150,7 +145,7 @@ public class SysCategoryController { } /** - * 通过id删除 + * 通过id删除 * @param id * @return */ @@ -169,11 +164,11 @@ public class SysCategoryController { return result; } - /** - * 逻辑删除 - * @param id - * @return - */ + /** + * 逻辑删除 + * @param id + * @return + */ // @RequiresPermissions("sys:category:list") @GetMapping(value = "/logicDelete") public Result logicDelete(@RequestParam(name="id",required=true) String id) { @@ -235,7 +230,7 @@ public class SysCategoryController { } /** - * 通过id查询 + * 通过id查询 * @param id * @return */ @@ -253,126 +248,126 @@ public class SysCategoryController { return result; } - /** - * 导出excel - * - * @param request - */ - @RequiresPermissions("sys:category:export") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, SysCategory sysCategory) { - // Step.1 组装查询条件查询数据 - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, request.getParameterMap()); - List pageList = sysCategoryService.list(queryWrapper); - // Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - // 过滤选中数据 - String selections = request.getParameter("selections"); - if(oConvertUtils.isEmpty(selections)) { - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - }else { - List selectionList = Arrays.asList(selections.split(",")); - List exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - } - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "分类字典列表"); - mv.addObject(NormalExcelConstants.CLASS, SysCategory.class); - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("分类字典列表数据", "导出人:"+user.getRealname(), "导出信息")); - return mv; - } + /** + * 导出excel + * + * @param request + */ + @RequiresPermissions("sys:category:export") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SysCategory sysCategory) { + // Step.1 组装查询条件查询数据 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, request.getParameterMap()); + List pageList = sysCategoryService.list(queryWrapper); + // Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + // 过滤选中数据 + String selections = request.getParameter("selections"); + if(oConvertUtils.isEmpty(selections)) { + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + }else { + List selectionList = Arrays.asList(selections.split(",")); + List exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + } + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "分类字典列表"); + mv.addObject(NormalExcelConstants.CLASS, SysCategory.class); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("分类字典列表数据", "导出人:"+user.getRealname(), "导出信息")); + return mv; + } - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequiresPermissions("sys:category:import") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listSysCategorys = ExcelImportUtil.importExcel(file.getInputStream(), SysCategory.class, params); - //按照编码长度排序 - Collections.sort(listSysCategorys); - log.info("排序后的list====>",listSysCategorys); - for (SysCategory sysCategoryExcel : listSysCategorys) { - String code = sysCategoryExcel.getCode(); - if(code.length()>3){ - String pCode = sysCategoryExcel.getCode().substring(0,code.length()-3); - log.info("pCode====>",pCode); - String pId=sysCategoryService.queryIdByCode(pCode); - log.info("pId====>",pId); - if(StringUtils.isNotBlank(pId)){ - sysCategoryExcel.setPid(pId); - } - }else{ - sysCategoryExcel.setPid("0"); - } - sysCategoryService.save(sysCategoryExcel); - } - return Result.OK("文件导入成功!数据行数:" + listSysCategorys.size()); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("文件导入失败:"+e.getMessage()); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.error("文件导入失败!"); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("sys:category:import") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listSysCategorys = ExcelImportUtil.importExcel(file.getInputStream(), SysCategory.class, params); + //按照编码长度排序 + Collections.sort(listSysCategorys); + log.info("排序后的list====>",listSysCategorys); + for (SysCategory sysCategoryExcel : listSysCategorys) { + String code = sysCategoryExcel.getCode(); + if(code.length()>3){ + String pCode = sysCategoryExcel.getCode().substring(0,code.length()-3); + log.info("pCode====>",pCode); + String pId=sysCategoryService.queryIdByCode(pCode); + log.info("pId====>",pId); + if(StringUtils.isNotBlank(pId)){ + sysCategoryExcel.setPid(pId); + } + }else{ + sysCategoryExcel.setPid("0"); + } + sysCategoryService.save(sysCategoryExcel); + } + return Result.OK("文件导入成功!数据行数:" + listSysCategorys.size()); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error("文件导入失败:"+e.getMessage()); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.error("文件导入失败!"); + } - /** - * 加载单个数据 用于回显 - */ - @RequiresPermissions("sys:category:list") - @RequestMapping(value = "/loadOne", method = RequestMethod.GET) - public Result loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { - Result result = new Result(); - try { - - QueryWrapper query = new QueryWrapper(); - query.eq(field, val); - List ls = this.sysCategoryService.list(query); - if(ls==null || ls.size()==0) { - result.setMessage("查询无果"); - result.setSuccess(false); - }else if(ls.size()>1) { - result.setMessage("查询数据异常,["+field+"]存在多个值:"+val); - result.setSuccess(false); - }else { - result.setSuccess(true); - result.setResult(ls.get(0)); - } - } catch (Exception e) { - e.printStackTrace(); - result.setMessage(e.getMessage()); - result.setSuccess(false); - } - return result; - } - - /** - * 加载节点的子数据 - */ + /** + * 加载单个数据 用于回显 + */ @RequiresPermissions("sys:category:list") - @RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET) + @RequestMapping(value = "/loadOne", method = RequestMethod.GET) + public Result loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { + Result result = new Result(); + try { + + QueryWrapper query = new QueryWrapper(); + query.eq(field, val); + List ls = this.sysCategoryService.list(query); + if(ls==null || ls.size()==0) { + result.setMessage("查询无果"); + result.setSuccess(false); + }else if(ls.size()>1) { + result.setMessage("查询数据异常,["+field+"]存在多个值:"+val); + result.setSuccess(false); + }else { + result.setSuccess(true); + result.setResult(ls.get(0)); + } + } catch (Exception e) { + e.printStackTrace(); + result.setMessage(e.getMessage()); + result.setSuccess(false); + } + return result; + } + + /** + * 加载节点的子数据 + */ + @RequiresPermissions("sys:category:list") + @RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET) public Result> loadTreeChildren(@RequestParam(name="pid") String pid) { Result> result = new Result>(); try { @@ -387,51 +382,51 @@ public class SysCategoryController { return result; } - /** - * 加载一级节点/如果是同步 则所有数据 - */ + /** + * 加载一级节点/如果是同步 则所有数据 + */ @RequiresPermissions("sys:category:list") - @RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET) - public Result> loadTreeRoot(@RequestParam(name="async") Boolean async,@RequestParam(name="pcode") String pcode) { - Result> result = new Result>(); - try { - List ls = this.sysCategoryService.queryListByCode(pcode); - if(!async) { - loadAllCategoryChildren(ls); - } - result.setResult(ls); - result.setSuccess(true); - } catch (Exception e) { - e.printStackTrace(); - result.setMessage(e.getMessage()); - result.setSuccess(false); - } - return result; - } + @RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET) + public Result> loadTreeRoot(@RequestParam(name="async") Boolean async,@RequestParam(name="pcode") String pcode) { + Result> result = new Result>(); + try { + List ls = this.sysCategoryService.queryListByCode(pcode); + if(!async) { + loadAllCategoryChildren(ls); + } + result.setResult(ls); + result.setSuccess(true); + } catch (Exception e) { + e.printStackTrace(); + result.setMessage(e.getMessage()); + result.setSuccess(false); + } + return result; + } - /** - * 递归求子节点 同步加载用到 - */ + /** + * 递归求子节点 同步加载用到 + */ @RequiresPermissions("sys:category:list") - private void loadAllCategoryChildren(List ls) { - for (TreeSelectModel tsm : ls) { + private void loadAllCategoryChildren(List ls) { + for (TreeSelectModel tsm : ls) { List temp = this.sysCategoryService.queryListByPid(tsm.getKey()); if(temp!=null && temp.size()>0) { tsm.setChildren(temp); loadAllCategoryChildren(temp); } } - } + } - /** - * 校验编码 - * @param pid - * @param code - * @return - */ - @RequiresPermissions("sys:category:list") - @GetMapping(value = "/checkCode") - public Result checkCode(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="code",required = false) String code) { + /** + * 校验编码 + * @param pid + * @param code + * @return + */ + @RequiresPermissions("sys:category:list") + @GetMapping(value = "/checkCode") + public Result checkCode(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="code",required = false) String code) { if(oConvertUtils.isEmpty(code)){ return Result.error("错误,类型编码为空!"); } @@ -445,28 +440,28 @@ public class SysCategoryController { return Result.error("编码不符合规范,须以\""+parent.getCode()+"\"开头!"); } - } + } - /** - * 分类字典树控件 加载节点 - * @param pid - * @param pcode - * @param condition - * @return - */ - @RequiresPermissions("sys:category:list") - @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET) - public Result> loadDict(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="pcode",required = false) String pcode, @RequestParam(name="condition",required = false) String condition) { - Result> result = new Result>(); - //pid如果传值了 就忽略pcode的作用 - if(oConvertUtils.isEmpty(pid)){ - if(oConvertUtils.isEmpty(pcode)){ + /** + * 分类字典树控件 加载节点 + * @param pid + * @param pcode + * @param condition + * @return + */ + @RequiresPermissions("sys:category:list") + @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET) + public Result> loadDict(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="pcode",required = false) String pcode, @RequestParam(name="condition",required = false) String condition) { + Result> result = new Result>(); + //pid如果传值了 就忽略pcode的作用 + if(oConvertUtils.isEmpty(pid)){ + if(oConvertUtils.isEmpty(pcode)){ result.setSuccess(false); result.setMessage("加载分类字典树参数有误.[null]!"); return result; }else{ - if(ISysCategoryService.ROOT_PID_VALUE.equals(pcode)){ + if(ISysCategoryService.ROOT_PID_VALUE.equals(pcode)){ pid = ISysCategoryService.ROOT_PID_VALUE; }else{ pid = this.sysCategoryService.queryIdByCode(pcode); @@ -477,102 +472,102 @@ public class SysCategoryController { return result; } } - } - Map query = null; - if(oConvertUtils.isNotEmpty(condition)) { - query = JSON.parseObject(condition, Map.class); - } - List ls = sysCategoryService.queryListByPid(pid,query); - result.setSuccess(true); - result.setResult(ls); - return result; - } + } + Map query = null; + if(oConvertUtils.isNotEmpty(condition)) { + query = JSON.parseObject(condition, Map.class); + } + List ls = sysCategoryService.queryListByPid(pid,query); + result.setSuccess(true); + result.setResult(ls); + return result; + } - /** - * 分类字典控件数据回显[表单页面] - * - * @param ids - * @return - */ - @RequiresPermissions("sys:category:list") - @RequestMapping(value = "/loadDictItem", method = RequestMethod.GET) - public Result> loadDictItem(@RequestParam(name = "ids") String ids) { - Result> result = new Result<>(); - // 非空判断 - if (StringUtils.isBlank(ids)) { - result.setSuccess(false); - result.setMessage("ids 不能为空"); - return result; - } - String[] idArray = ids.split(","); - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.in(SysCategory::getId, Arrays.asList(idArray)); - // 查询数据 - List list = this.sysCategoryService.list(query); - // 取出name并返回 - List textList = list.stream().map(SysCategory::getName).collect(Collectors.toList()); - result.setSuccess(true); - result.setResult(textList); - return result; - } + /** + * 分类字典控件数据回显[表单页面] + * + * @param ids + * @return + */ + @RequiresPermissions("sys:category:list") + @RequestMapping(value = "/loadDictItem", method = RequestMethod.GET) + public Result> loadDictItem(@RequestParam(name = "ids") String ids) { + Result> result = new Result<>(); + // 非空判断 + if (StringUtils.isBlank(ids)) { + result.setSuccess(false); + result.setMessage("ids 不能为空"); + return result; + } + String[] idArray = ids.split(","); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.in(SysCategory::getId, Arrays.asList(idArray)); + // 查询数据 + List list = this.sysCategoryService.list(query); + // 取出name并返回 + List textList = list.stream().map(SysCategory::getName).collect(Collectors.toList()); + result.setSuccess(true); + result.setResult(textList); + return result; + } - /** - * [列表页面]加载分类字典数据 用于值的替换 - * @param code - * @return - */ - @RequiresPermissions("sys:category:list") - @RequestMapping(value = "/loadAllData", method = RequestMethod.GET) - public Result> loadAllData(@RequestParam(name="code",required = true) String code) { - Result> result = new Result>(); - LambdaQueryWrapper query = new LambdaQueryWrapper(); - if(oConvertUtils.isNotEmpty(code) && !"0".equals(code)){ - query.likeRight(SysCategory::getCode,code); - } - List list = this.sysCategoryService.list(query); - if(list==null || list.size()==0) { - result.setMessage("无数据,参数有误.[code]"); - result.setSuccess(false); - return result; - } - List rdList = new ArrayList(); - for (SysCategory c : list) { - rdList.add(new DictModel(c.getId(),c.getName())); - } - result.setSuccess(true); - result.setResult(rdList); - return result; - } + /** + * [列表页面]加载分类字典数据 用于值的替换 + * @param code + * @return + */ + @RequiresPermissions("sys:category:list") + @RequestMapping(value = "/loadAllData", method = RequestMethod.GET) + public Result> loadAllData(@RequestParam(name="code",required = true) String code) { + Result> result = new Result>(); + LambdaQueryWrapper query = new LambdaQueryWrapper(); + if(oConvertUtils.isNotEmpty(code) && !"0".equals(code)){ + query.likeRight(SysCategory::getCode,code); + } + List list = this.sysCategoryService.list(query); + if(list==null || list.size()==0) { + result.setMessage("无数据,参数有误.[code]"); + result.setSuccess(false); + return result; + } + List rdList = new ArrayList(); + for (SysCategory c : list) { + rdList.add(new DictModel(c.getId(),c.getName())); + } + result.setSuccess(true); + result.setResult(rdList); + return result; + } - /** - * 根据父级id批量查询子节点 - * @param parentIds - * @return - */ - @RequiresPermissions("sys:category:list") - @GetMapping("/getChildListBatch") - public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { - try { - QueryWrapper queryWrapper = new QueryWrapper<>(); - List parentIdList = Arrays.asList(parentIds.split(",")); - queryWrapper.in("pid", parentIdList); - List list = sysCategoryService.list(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("批量查询子节点失败:" + e.getMessage()); - } - } + /** + * 根据父级id批量查询子节点 + * @param parentIds + * @return + */ + @RequiresPermissions("sys:category:list") + @GetMapping("/getChildListBatch") + public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List parentIdList = Arrays.asList(parentIds.split(",")); + queryWrapper.in("pid", parentIdList); + List list = sysCategoryService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error("批量查询子节点失败:" + e.getMessage()); + } + } /** * 只查询技术领域的树形数据字典 * @return */ @GetMapping("/getSysCategoryTree") - public Result getSysCategoryTree() { - return Result.OK(sysCategoryService.getSysCategoryTree()); - } + public Result getSysCategoryTree() { + return Result.OK(sysCategoryService.getSysCategoryTree()); + } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index c14d6b8b1..5868d597d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -10,10 +10,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.FillRuleConstant; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; -import com.jero.common.util.FillRuleUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategoryTreeVO; @@ -64,16 +62,16 @@ public class SysCategoryServiceImpl extends ServiceImpl