WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug52973提示语覆盖修改

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