zhangherong
2025-05-12 7e254edced5f0361882471ebffbad572c181235d
art: 系统管理-分类字典功能改造,导入功能修改
已修改6个文件
1685 ■■■■■ 文件已修改
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java 912 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java 135 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java 502 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
@@ -5,15 +5,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import liquibase.pro.packaged.Q;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.ImportExcelUtil;
import org.jeecg.common.util.SqlInjectionUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.SysCategory;
@@ -33,485 +33,485 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
 /**
/**
 * @Description: 分类字典
 * @Author: jeecg-boot
 * @Date:   2019-05-29
 * @Date: 2019-05-29
 * @Version: V1.0
 */
@RestController
@RequestMapping("/sys/category")
@Slf4j
public class SysCategoryController {
    @Autowired
    private ISysCategoryService sysCategoryService;
    @Autowired
    private ISysCategoryService sysCategoryService;
     /**
      * 分类编码0
      */
     private static final String CATEGORY_ROOT_CODE = "0";
    /**
      * 分页列表查询
     * @param sysCategory
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @GetMapping(value = "/rootList")
    public Result<IPage<SysCategory>> queryPageList(SysCategory sysCategory,
                                      @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                      @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                      HttpServletRequest req) {
        if(oConvertUtils.isEmpty(sysCategory.getPid())){
            sysCategory.setPid("0");
        }
        Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>();
        //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
        //--author:liusq---date:20211119 -----for: 【vue3】分类字典页面查询条件配置--------start
        QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
        String name = sysCategory.getName();
        String code = sysCategory.getCode();
        //QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<SysCategory>();
        if(StringUtils.isBlank(name)&&StringUtils.isBlank(code)){
            queryWrapper.eq("pid", sysCategory.getPid());
        }
        //--author:liusq---date:20211119 -----for: 分类字典页面查询条件配置--------end
        //--author:os_chengtgen---date:20190804 -----for:【vue3】 分类字典页面显示错误,issues:377--------end
        Page<SysCategory> page = new Page<SysCategory>(pageNo, pageSize);
        IPage<SysCategory> pageList = sysCategoryService.page(page, queryWrapper);
        result.setSuccess(true);
        result.setResult(pageList);
        return result;
    }
    @GetMapping(value = "/childList")
    public Result<List<SysCategory>> queryPageList(SysCategory sysCategory,HttpServletRequest req) {
        Result<List<SysCategory>> result = new Result<List<SysCategory>>();
        QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
        List<SysCategory> list = sysCategoryService.list(queryWrapper);
        result.setSuccess(true);
        result.setResult(list);
        return result;
    }
    /**
      *   添加
     * @param sysCategory
     * @return
     */
    @PostMapping(value = "/add")
    public Result<SysCategory> add(@RequestBody SysCategory sysCategory) {
        Result<SysCategory> result = new Result<SysCategory>();
        try {
            sysCategoryService.addSysCategory(sysCategory);
            result.success("添加成功!");
        } catch (Exception e) {
            log.error(e.getMessage(),e);
            result.error500("操作失败");
        }
        return result;
    }
    /**
      *  编辑
     * @param sysCategory
     * @return
     */
    @RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
    public Result<SysCategory> edit(@RequestBody SysCategory sysCategory) {
        Result<SysCategory> result = new Result<SysCategory>();
        SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId());
        if(sysCategoryEntity==null) {
            result.error500("未找到对应实体");
        }else {
            sysCategoryService.updateSysCategory(sysCategory);
            result.success("修改成功!");
        }
        return result;
    }
    /**
      *   通过id删除
     * @param id
     * @return
     */
    @DeleteMapping(value = "/delete")
    public Result<SysCategory> delete(@RequestParam(name="id",required=true) String id) {
        Result<SysCategory> result = new Result<SysCategory>();
        SysCategory sysCategory = sysCategoryService.getById(id);
        if(sysCategory==null) {
            result.error500("未找到对应实体");
        }else {
            this.sysCategoryService.deleteSysCategory(id);
            result.success("删除成功!");
        }
        return result;
    }
    /**
      *  批量删除
     * @param ids
     * @return
     */
    @DeleteMapping(value = "/deleteBatch")
    public Result<SysCategory> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        Result<SysCategory> result = new Result<SysCategory>();
        if(ids==null || "".equals(ids.trim())) {
            result.error500("参数不识别!");
        }else {
            this.sysCategoryService.deleteSysCategory(ids);
            result.success("删除成功!");
        }
        return result;
    }
    /**
      * 通过id查询
     * @param id
     * @return
     */
    @GetMapping(value = "/queryById")
    public Result<SysCategory> queryById(@RequestParam(name="id",required=true) String id) {
        Result<SysCategory> result = new Result<SysCategory>();
        SysCategory sysCategory = sysCategoryService.getById(id);
        if(sysCategory==null) {
            result.error500("未找到对应实体");
        }else {
            result.setResult(sysCategory);
            result.setSuccess(true);
        }
        return result;
    }
  /**
      * 导出excel
   *
   * @param request
   */
  @RequestMapping(value = "/exportXls")
  public ModelAndView exportXls(HttpServletRequest request, SysCategory sysCategory) {
      // Step.1 组装查询条件查询数据
      QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, request.getParameterMap());
      List<SysCategory> 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<String> selectionList = Arrays.asList(selections.split(","));
          List<SysCategory> 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
   */
  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException{
      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
      // 错误信息
      List<String> errorMessage = new ArrayList<>();
      int successLines = 0, errorLines = 0;
      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
          // 获取上传文件对象
          MultipartFile file = entity.getValue();
          ImportParams params = new ImportParams();
          params.setTitleRows(2);
          params.setHeadRows(1);
          params.setNeedSave(true);
          try {
              List<SysCategory> listSysCategorys = ExcelImportUtil.importExcel(file.getInputStream(), SysCategory.class, params);
             //按照编码长度排序
              Collections.sort(listSysCategorys);
              log.info("排序后的list====>",listSysCategorys);
              for (int i = 0; i < listSysCategorys.size(); i++) {
                  SysCategory sysCategoryExcel = listSysCategorys.get(i);
                  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");
                  }
                  try {
                      sysCategoryService.save(sysCategoryExcel);
                      successLines++;
                  } catch (Exception e) {
                      errorLines++;
                      String message = e.getMessage().toLowerCase();
                      int lineNumber = i + 1;
                      // 通过索引名判断出错信息
                      if (message.contains(CommonConstant.SQL_INDEX_UNIQ_CATEGORY_CODE)) {
                          errorMessage.add("第 " + lineNumber + " 行:分类编码已经存在,忽略导入。");
                      }  else {
                          errorMessage.add("第 " + lineNumber + " 行:未知错误,忽略导入");
                          log.error(e.getMessage(), e);
                      }
                  }
              }
          } catch (Exception e) {
              errorMessage.add("发生异常:" + e.getMessage());
              log.error(e.getMessage(), e);
          } finally {
              try {
                  file.getInputStream().close();
              } catch (IOException e) {
                  e.printStackTrace();
              }
          }
      }
      return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
  }
  /**
     * 加载单个数据 用于回显
   */
    @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 {
            //update-begin-author:taoyan date:2022-5-6 for: issues/3663 sql注入问题
            boolean isClassField = SqlInjectionUtil.isClassField(field, SysCategory.class);
            if (!isClassField) {
                return Result.error("字段无效,请检查!");
            }
            //update-end-author:taoyan date:2022-5-6 for: issues/3663 sql注入问题
             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;
     }
    /**
          * 加载节点的子数据
     * 分类编码0
     */
    private static final String CATEGORY_ROOT_CODE = "0";
    /**
     * 分页列表查询
     *
     * @param sysCategory
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @GetMapping(value = "/rootList")
    public Result<IPage<SysCategory>> queryPageList(SysCategory sysCategory,
                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
        if (oConvertUtils.isEmpty(sysCategory.getPid())) {
            sysCategory.setPid("0");
        }
        Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>();
        //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
        //--author:liusq---date:20211119 -----for: 【vue3】分类字典页面查询条件配置--------start
        QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
        String name = sysCategory.getName();
        String code = sysCategory.getCode();
        //QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<SysCategory>();
        if (StringUtils.isBlank(name) && StringUtils.isBlank(code)) {
            queryWrapper.eq("pid", sysCategory.getPid());
        }
        //--author:liusq---date:20211119 -----for: 分类字典页面查询条件配置--------end
        //--author:os_chengtgen---date:20190804 -----for:【vue3】 分类字典页面显示错误,issues:377--------end
        Page<SysCategory> page = new Page<SysCategory>(pageNo, pageSize);
        IPage<SysCategory> pageList = sysCategoryService.page(page, queryWrapper);
        result.setSuccess(true);
        result.setResult(pageList);
        return result;
    }
    @GetMapping(value = "/childList")
    public Result<List<SysCategory>> queryPageList(SysCategory sysCategory, HttpServletRequest req) {
        Result<List<SysCategory>> result = new Result<List<SysCategory>>();
        QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("pid", sysCategory.getPid());
        queryWrapper.orderByAsc("code");
        List<SysCategory> list = sysCategoryService.list(queryWrapper);
        result.setSuccess(true);
        result.setResult(list);
        return result;
    }
    /**
     * 添加
     *
     * @param sysCategory
     * @return
     */
    @PostMapping(value = "/add")
    public Result<SysCategory> add(@RequestBody SysCategory sysCategory) {
        Result<SysCategory> result = new Result<SysCategory>();
        sysCategoryService.addSysCategory(sysCategory);
        result.success("添加成功!");
        return result;
    }
    /**
     * 编辑
     *
     * @param sysCategory
     * @return
     */
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<SysCategory> edit(@RequestBody SysCategory sysCategory) {
        Result<SysCategory> result = new Result<SysCategory>();
        sysCategoryService.updateSysCategory(sysCategory);
        result.success("修改成功!");
        return result;
    }
    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @DeleteMapping(value = "/delete")
    public Result<SysCategory> delete(@RequestParam(name = "id", required = true) String id) {
        Result<SysCategory> result = new Result<SysCategory>();
        SysCategory sysCategory = sysCategoryService.getById(id);
        if (sysCategory == null) {
            result.error500("未找到对应实体");
        } else {
            this.sysCategoryService.deleteSysCategory(id);
            result.success("删除成功!");
        }
        return result;
    }
    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @DeleteMapping(value = "/deleteBatch")
    public Result<SysCategory> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        Result<SysCategory> result = new Result<SysCategory>();
        if (ids == null || "".equals(ids.trim())) {
            result.error500("参数不识别!");
        } else {
            this.sysCategoryService.deleteSysCategory(ids);
            result.success("删除成功!");
        }
        return result;
    }
    /**
     * 通过id查询
     *
     * @param id
     * @return
     */
    @GetMapping(value = "/queryById")
    public Result<SysCategory> queryById(@RequestParam(name = "id", required = true) String id) {
        Result<SysCategory> result = new Result<SysCategory>();
        SysCategory sysCategory = sysCategoryService.getById(id);
        if (sysCategory == null) {
            result.error500("未找到对应实体");
        } else {
            result.setResult(sysCategory);
            result.setSuccess(true);
        }
        return result;
    }
    /**
     * 导出excel
     *
     * @param request
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, SysCategory sysCategory) {
        // Step.1 组装查询条件查询数据
        List<SysCategory> pageList = sysCategoryService.listByParams(sysCategory);
        // 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<String> selectionList = Arrays.asList(selections.split(","));
            List<SysCategory> 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
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // 错误信息
        List<String> errorMessage = new ArrayList<>();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // 获取上传文件对象
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setTitleRows(0);
            params.setHeadRows(1);
            params.setNeedSave(true);
            try {
                List<SysCategory> listSysCategorys = ExcelImportUtil.importExcel(file.getInputStream(), SysCategory.class, params);
                //组装树结构
                List<SysCategory> treeNodes = buildTree(listSysCategorys);
                for (SysCategory sysCategory : treeNodes) {
                    sysCategoryService.deepAdd(sysCategory, errorMessage);
                }
            } catch (Exception e) {
                log.error(e.getMessage(), e);
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException ignored) {
                }
            }
        }
        return Result.ok("导入成功");
    }
    /**
     * 加载单个数据 用于回显
     */
    @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 {
            //update-begin-author:taoyan date:2022-5-6 for: issues/3663 sql注入问题
            boolean isClassField = SqlInjectionUtil.isClassField(field, SysCategory.class);
            if (!isClassField) {
                return Result.error("字段无效,请检查!");
            }
            //update-end-author:taoyan date:2022-5-6 for: issues/3663 sql注入问题
            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;
    }
    /**
     * 加载节点的子数据
     */
    @RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET)
    public Result<List<TreeSelectModel>> loadTreeChildren(@RequestParam(name="pid") String pid) {
        Result<List<TreeSelectModel>> result = new Result<List<TreeSelectModel>>();
        try {
            List<TreeSelectModel> ls = this.sysCategoryService.queryListByPid(pid);
            result.setResult(ls);
            result.setSuccess(true);
        } catch (Exception e) {
            e.printStackTrace();
            result.setMessage(e.getMessage());
            result.setSuccess(false);
        }
        return result;
    }
    public Result<List<TreeSelectModel>> loadTreeChildren(@RequestParam(name = "pid") String pid) {
        Result<List<TreeSelectModel>> result = new Result<List<TreeSelectModel>>();
        try {
            List<TreeSelectModel> ls = this.sysCategoryService.queryListByPid(pid);
            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<List<TreeSelectModel>> loadTreeRoot(@RequestParam(name="async") Boolean async,@RequestParam(name="pcode") String pcode) {
           Result<List<TreeSelectModel>> result = new Result<List<TreeSelectModel>>();
           try {
               List<TreeSelectModel> 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;
       }
    public Result<List<TreeSelectModel>> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) {
        Result<List<TreeSelectModel>> result = new Result<List<TreeSelectModel>>();
        try {
            List<TreeSelectModel> 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;
    }
    /**
         * 递归求子节点 同步加载用到
     * 递归求子节点 同步加载用到
     */
      private void loadAllCategoryChildren(List<TreeSelectModel> ls) {
          for (TreeSelectModel tsm : ls) {
            List<TreeSelectModel> temp = this.sysCategoryService.queryListByPid(tsm.getKey());
            if(temp!=null && temp.size()>0) {
                tsm.setChildren(temp);
                loadAllCategoryChildren(temp);
            }
        }
      }
    private void loadAllCategoryChildren(List<TreeSelectModel> ls) {
        for (TreeSelectModel tsm : ls) {
            List<TreeSelectModel> temp = this.sysCategoryService.queryListByPid(tsm.getKey());
            if (temp != null && temp.size() > 0) {
                tsm.setChildren(temp);
                loadAllCategoryChildren(temp);
            }
        }
    }
     /**
      * 校验编码
      * @param pid
      * @param code
      * @return
      */
     @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("错误,类型编码为空!");
        }
        if(oConvertUtils.isEmpty(pid)){
            return Result.ok();
        }
        SysCategory parent = this.sysCategoryService.getById(pid);
        if(code.startsWith(parent.getCode())){
            return Result.ok();
        }else{
            return Result.error("编码不符合规范,须以\""+parent.getCode()+"\"开头!");
        }
     }
    /**
     * 校验编码
     *
     * @param pid
     * @param code
     * @return
     */
    @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("错误,分类编码为空!");
        }
        SysCategory parent = sysCategoryService.getById(pid);
        String rootCode = null;
        if (parent != null) {
            rootCode = parent.getRootCode();
        }
        SysCategory original = sysCategoryService.getByCodeAndRootCode(code, rootCode);
        if (original != null) {
            return Result.error("编码已存在,请重新输入!");
        }
        return Result.ok();
    }
     /**
      * 分类字典树控件 加载节点
      * @param pid
      * @param pcode
      * @param condition
      * @return
      */
     @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) {
         Result<List<TreeSelectModel>> result = new Result<List<TreeSelectModel>>();
         //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)){
                    pid = ISysCategoryService.ROOT_PID_VALUE;
                }else{
                    pid = this.sysCategoryService.queryIdByCode(pcode);
                }
                if(oConvertUtils.isEmpty(pid)){
                    result.setSuccess(false);
                    result.setMessage("加载分类字典树参数有误.[code]!");
                    return result;
                }
            }
         }
         Map<String, String> query = null;
         if(oConvertUtils.isNotEmpty(condition)) {
             query = JSON.parseObject(condition, Map.class);
         }
         List<TreeSelectModel> ls = sysCategoryService.queryListByPid(pid,query);
         result.setSuccess(true);
         result.setResult(ls);
         return result;
     }
    /**
     * 分类字典树控件 加载节点
     *
     * @param pid
     * @param pcode
     * @param condition
     * @return
     */
    @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) {
        Result<List<TreeSelectModel>> result = new Result<List<TreeSelectModel>>();
        //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)) {
                    pid = ISysCategoryService.ROOT_PID_VALUE;
                } else {
                    pid = this.sysCategoryService.queryIdByCode(pcode);
                }
                if (oConvertUtils.isEmpty(pid)) {
                    result.setSuccess(false);
                    result.setMessage("加载分类字典树参数有误.[code]!");
                    return result;
                }
            }
        }
        Map<String, String> query = null;
        if (oConvertUtils.isNotEmpty(condition)) {
            query = JSON.parseObject(condition, Map.class);
        }
        List<TreeSelectModel> ls = sysCategoryService.queryListByPid(pid, query);
        result.setSuccess(true);
        result.setResult(ls);
        return result;
    }
     /**
      * 分类字典控件数据回显[表单页面]
      *
      * @param ids
      * @param delNotExist 是否移除不存在的项,默认为true,设为false如果某个key不存在数据库中,则直接返回key本身
      * @return
      */
     @RequestMapping(value = "/loadDictItem", method = RequestMethod.GET)
     public Result<List<String>> loadDictItem(@RequestParam(name = "ids") String ids, @RequestParam(name = "delNotExist", required = false, defaultValue = "true") boolean delNotExist) {
         Result<List<String>> result = new Result<>();
         // 非空判断
         if (StringUtils.isBlank(ids)) {
             result.setSuccess(false);
             result.setMessage("ids 不能为空");
             return result;
         }
         // 查询数据
         List<String> textList = sysCategoryService.loadDictItem(ids, delNotExist);
         result.setSuccess(true);
         result.setResult(textList);
         return result;
     }
    /**
     * 分类字典控件数据回显[表单页面]
     *
     * @param ids
     * @param delNotExist 是否移除不存在的项,默认为true,设为false如果某个key不存在数据库中,则直接返回key本身
     * @return
     */
    @RequestMapping(value = "/loadDictItem", method = RequestMethod.GET)
    public Result<List<String>> loadDictItem(@RequestParam(name = "ids") String ids, @RequestParam(name = "delNotExist", required = false, defaultValue = "true") boolean delNotExist) {
        Result<List<String>> result = new Result<>();
        // 非空判断
        if (StringUtils.isBlank(ids)) {
            result.setSuccess(false);
            result.setMessage("ids 不能为空");
            return result;
        }
        // 查询数据
        List<String> textList = sysCategoryService.loadDictItem(ids, delNotExist);
        result.setSuccess(true);
        result.setResult(textList);
        return result;
    }
     /**
      * [列表页面]加载分类字典数据 用于值的替换
      * @param code
      * @return
      */
     @RequestMapping(value = "/loadAllData", method = RequestMethod.GET)
     public Result<List<DictModel>> loadAllData(@RequestParam(name="code",required = true) String code) {
         Result<List<DictModel>> result = new Result<List<DictModel>>();
         LambdaQueryWrapper<SysCategory> query = new LambdaQueryWrapper<SysCategory>();
         if(oConvertUtils.isNotEmpty(code) && !CATEGORY_ROOT_CODE.equals(code)){
             query.likeRight(SysCategory::getCode,code);
         }
         List<SysCategory> list = this.sysCategoryService.list(query);
         if(list==null || list.size()==0) {
             result.setMessage("无数据,参数有误.[code]");
             result.setSuccess(false);
             return result;
         }
         List<DictModel> rdList = new ArrayList<DictModel>();
         for (SysCategory c : list) {
             rdList.add(new DictModel(c.getId(),c.getName()));
         }
         result.setSuccess(true);
         result.setResult(rdList);
         return result;
     }
    /**
     * [列表页面]加载分类字典数据 用于值的替换
     *
     * @param code
     * @return
     */
    @RequestMapping(value = "/loadAllData", method = RequestMethod.GET)
    public Result<List<DictModel>> loadAllData(@RequestParam(name = "code", required = true) String code) {
        Result<List<DictModel>> result = new Result<List<DictModel>>();
        LambdaQueryWrapper<SysCategory> query = new LambdaQueryWrapper<SysCategory>();
        if (oConvertUtils.isNotEmpty(code) && !CATEGORY_ROOT_CODE.equals(code)) {
            query.likeRight(SysCategory::getCode, code);
        }
        List<SysCategory> list = this.sysCategoryService.list(query);
        if (list == null || list.size() == 0) {
            result.setMessage("无数据,参数有误.[code]");
            result.setSuccess(false);
            return result;
        }
        List<DictModel> rdList = new ArrayList<DictModel>();
        for (SysCategory c : list) {
            rdList.add(new DictModel(c.getId(), c.getName()));
        }
        result.setSuccess(true);
        result.setResult(rdList);
        return result;
    }
     /**
      * 根据父级id批量查询子节点
      * @param parentIds
      * @return
      */
     @GetMapping("/getChildListBatch")
     public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
         try {
             QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
             List<String> parentIdList = Arrays.asList(parentIds.split(","));
             queryWrapper.in("pid", parentIdList);
             List<SysCategory> list = sysCategoryService.list(queryWrapper);
             IPage<SysCategory> 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
     */
    @GetMapping("/getChildListBatch")
    public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
        try {
            QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
            List<String> parentIdList = Arrays.asList(parentIds.split(","));
            queryWrapper.in("pid", parentIdList);
            List<SysCategory> list = sysCategoryService.list(queryWrapper);
            IPage<SysCategory> 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());
        }
    }
    /**
     * 组装 树型结构
     *
     * @param list
     * @return
     */
    private List<SysCategory> buildTree(List<SysCategory> list) {
        //根节点
        List<SysCategory> rootList = new ArrayList<>();
        //节点 Map
        Map<String, SysCategory> nodeMap = list.stream().collect(Collectors.toMap(SysCategory::getCode, node -> node));
        for (SysCategory node : list) {
            if (StringUtils.isBlank(node.getParentCode()) || ISysCategoryService.ROOT_PID_VALUE.equals(node.getParentCode())) {
                rootList.add(node);
            } else {
                SysCategory parent = nodeMap.get(node.getParentCode());
                if (parent == null) {
                    throw new JeecgBootException("父节点不存在:" + node.getParentCode());
                }
                parent.addChild(node);
            }
        }
        return rootList;
    }
}
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -9,58 +10,93 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
 * @Description: 分类字典
 * @Author: jeecg-boot
 * @Date:   2019-05-29
 * @Date: 2019-05-29
 * @Version: V1.0
 */
@Data
@TableName("sys_category")
public class SysCategory implements Serializable,Comparable<SysCategory>{
public class SysCategory implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    private java.lang.String id;
    /**父级节点*/
    private java.lang.String pid;
    /**类型名称*/
    @Excel(name = "类型名称", width = 15)
    private java.lang.String name;
    /**类型编码*/
    @Excel(name = "类型编码", width = 15)
    private java.lang.String code;
    /**创建人*/
    private java.lang.String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private java.util.Date createTime;
    /**更新人*/
    private java.lang.String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private java.util.Date updateTime;
    /**所属部门*/
    private java.lang.String sysOrgCode;
    /**是否有子节点*/
    @Excel(name = "是否有子节点(1:有)", width = 15)
    private java.lang.String hasChild;
    @Override
    public int compareTo(SysCategory o) {
        //比较条件我们定的是按照code的长度升序
        // <0:当前对象比传入对象小。
        // =0:当前对象等于传入对象。
        // >0:当前对象比传入对象大。
        int     s = this.code.length() - o.code.length();
        return s;
    }
    @Override
    public String toString() {
        return "SysCategory [code=" + code + ", name=" + name + "]";
    }
    /**
     * 主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private String id;
    /**
     * 父级节点
     */
    private String pid;
    /**
     * 类型编码
     */
    @Excel(name = "分类编码", width = 15, orderNum = "1")
    private String code;
    /**
     * 类型名称
     */
    @Excel(name = "分类名称", width = 15, orderNum = "2")
    private String name;
    /**
     * 创建人
     */
    private String createBy;
    /**
     * 创建日期
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private java.util.Date createTime;
    /**
     * 更新人
     */
    private String updateBy;
    /**
     * 更新日期
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private java.util.Date updateTime;
    /**
     * 所属部门
     */
    private String sysOrgCode;
    /**
     * 是否有子节点
     */
    private String hasChild;
    /**
     * 根节点编码
     */
    @Excel(name = "根节点编码", width = 15, orderNum = "4")
    private String rootCode;
    /**
     * 所有父节点ID
     */
    private String parentIds;
    @TableField(exist = false)
    @Excel(name = "父节点编码", width = 15, orderNum = "3")
    private String parentCode;
    @TableField(exist = false)
    private List<SysCategory> children;
    @Override
    public String toString() {
        return "SysCategory [code=" + code + ", name=" + name + "]";
    }
    public void addChild(SysCategory node) {
        if (children == null) {
            children = new ArrayList<>();
        }
        children.add(node);
    }
}
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java
@@ -3,6 +3,8 @@
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.system.entity.SysCategory;
@@ -33,6 +35,7 @@
     */
    @Select("SELECT ID FROM sys_category WHERE CODE = #{code,jdbcType=VARCHAR}")
    public String queryIdByCode(@Param("code")  String code);
    List<SysCategory> listByParams(@Param(Constants.WRAPPER) QueryWrapper<SysCategory> queryWrapper);
}
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml
@@ -32,6 +32,13 @@
                </if>
            </if>
    </select>
    <select id="listByParams" resultType="org.jeecg.modules.system.entity.SysCategory">
        select t.*, p.code as parentCode
        from sys_category t
        left join sys_category p
        on t.pid = p.id
        ${ew.customSqlSegment}
    </select>
</mapper>
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java
@@ -11,82 +11,113 @@
/**
 * @Description: 分类字典
 * @Author: jeecg-boot
 * @Date:   2019-05-29
 * @Date: 2019-05-29
 * @Version: V1.0
 */
public interface ISysCategoryService extends IService<SysCategory> {
    /**根节点父ID的值*/
    public static final String ROOT_PID_VALUE = "0";
    /**
     * 根节点父ID的值
     */
    String ROOT_PID_VALUE = "0";
    /**
     * 存在子节点
     */
    public static final String HAS_CHILD = "1";
    String HAS_CHILD = "1";
    /**
     * 添加分类字典
     *
     * @param sysCategory
     */
    void addSysCategory(SysCategory sysCategory);
    void addSysCategory(SysCategory sysCategory);
    /**
     * 修改分类字典
     *
     * @param sysCategory
     */
    void updateSysCategory(SysCategory sysCategory);
    /**
    void updateSysCategory(SysCategory sysCategory);
    /**
     * 根据父级编码加载分类字典的数据
     * @param pcode
     * @return
     *
     * @param pcode
     * @return
     * @throws JeecgBootException
     */
    public List<TreeSelectModel> queryListByCode(String pcode) throws JeecgBootException;
    /**
      * 根据pid查询子节点集合
     * @param pid
     * @return
     */
    public List<TreeSelectModel> queryListByPid(String pid);
     */
    List<TreeSelectModel> queryListByCode(String pcode) throws JeecgBootException;
    /**
     * 根据pid查询子节点集合,支持查询条件
     * @param pid
     * @param condition
     * @return
     */
    public List<TreeSelectModel> queryListByPid(String pid, Map<String,String> condition);
    /**
     * 根据pid查询子节点集合
     *
     * @param pid
     * @return
     */
    List<TreeSelectModel> queryListByPid(String pid);
    /**
     * 根据code查询id
     * @param code
     * @return
     */
    public String queryIdByCode(String code);
    /**
     * 根据pid查询子节点集合,支持查询条件
     *
     * @param pid
     * @param condition
     * @return
     */
    List<TreeSelectModel> queryListByPid(String pid, Map<String, String> condition);
    /**
     * 删除节点时同时删除子节点及修改父级节点
     * @param ids
     */
    void deleteSysCategory(String ids);
    /**
     * 根据code查询id
     *
     * @param code
     * @return
     */
    String queryIdByCode(String code);
    /**
     * 分类字典控件数据回显[表单页面]
     *
     * @param ids
     * @return
     */
    List<String> loadDictItem(String ids);
    /**
     * 删除节点时同时删除子节点及修改父级节点
     *
     * @param ids
     */
    void deleteSysCategory(String ids);
    /**
     * 分类字典控件数据回显[表单页面]
     *
     * @param ids
     * @param delNotExist 是否移除不存在的项,设为false如果某个key不存在数据库中,则直接返回key本身
     * @return
     */
    List<String> loadDictItem(String ids, boolean delNotExist);
    /**
     * 分类字典控件数据回显[表单页面]
     *
     * @param ids
     * @return
     */
    List<String> loadDictItem(String ids);
    /**
     * 分类字典控件数据回显[表单页面]
     *
     * @param ids
     * @param delNotExist 是否移除不存在的项,设为false如果某个key不存在数据库中,则直接返回key本身
     * @return
     */
    List<String> loadDictItem(String ids, boolean delNotExist);
    /**
     * 加载所有分类字典
     *
     * @param query
     * @return
     */
    List<SysCategory> listByParams(SysCategory query);
    /**
     * 递归添加
     *
     * @param sysCategory
     */
    void deepAdd(SysCategory sysCategory, List<String> errorMessage);
    /**
     * 取某个节点下的编码
     * @param code
     * @param rootCode
     * @return
     */
    SysCategory getByCodeAndRootCode(String code, String rootCode);
}
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
@@ -1,15 +1,14 @@
package org.jeecg.modules.system.service.impl;
import com.alibaba.fastjson.JSONObject;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.FillRuleConstant;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.SymbolConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.SysCategory;
import org.jeecg.modules.system.mapper.SysCategoryMapper;
@@ -18,221 +17,328 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
 * @Description: 分类字典
 * @Author: jeecg-boot
 * @Date:   2019-05-29
 * @Date: 2019-05-29
 * @Version: V1.0
 */
@Service
public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCategory> implements ISysCategoryService {
    @Override
    public void addSysCategory(SysCategory sysCategory) {
        String categoryCode = "";
        String categoryPid = ISysCategoryService.ROOT_PID_VALUE;
        String parentCode = null;
        if(oConvertUtils.isNotEmpty(sysCategory.getPid())){
            categoryPid = sysCategory.getPid();
    @Resource
    private SysCategoryMapper sysCategoryMapper;
            //PID 不是根节点 说明需要设置父节点 hasChild 为1
            if(!ISysCategoryService.ROOT_PID_VALUE.equals(categoryPid)){
                SysCategory parent = baseMapper.selectById(categoryPid);
                parentCode = parent.getCode();
                if(parent!=null && !ISysCategoryService.HAS_CHILD.equals(parent.getHasChild())){
                    parent.setHasChild(ISysCategoryService.HAS_CHILD);
                    baseMapper.updateById(parent);
                }
            }
        }
        //update-begin--Author:baihailong  Date:20191209 for:分类字典编码规则生成器做成公用配置
        JSONObject formData = new JSONObject();
        formData.put("pid",categoryPid);
        categoryCode = (String) FillRuleUtil.executeRule(FillRuleConstant.CATEGORY,formData);
        //update-end--Author:baihailong  Date:20191209 for:分类字典编码规则生成器做成公用配置
        sysCategory.setCode(categoryCode);
        sysCategory.setPid(categoryPid);
        baseMapper.insert(sysCategory);
    }
    @Override
    public void updateSysCategory(SysCategory sysCategory) {
        if(oConvertUtils.isEmpty(sysCategory.getPid())){
            sysCategory.setPid(ISysCategoryService.ROOT_PID_VALUE);
        }else{
            //如果当前节点父ID不为空 则设置父节点的hasChild 为1
            SysCategory parent = baseMapper.selectById(sysCategory.getPid());
            if(parent!=null && !ISysCategoryService.HAS_CHILD.equals(parent.getHasChild())){
                parent.setHasChild(ISysCategoryService.HAS_CHILD);
                baseMapper.updateById(parent);
            }
        }
        baseMapper.updateById(sysCategory);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addSysCategory(SysCategory sysCategory) {
        //修改字典分类  编码为手动输入
        if (StringUtils.isNotBlank(sysCategory.getPid())) {
            SysCategory parent = sysCategoryMapper.selectById(sysCategory.getPid());
            if (parent == null) {
                //父节点不存在 默认为根节点
                throw new JeecgBootException("父节点不存在,请重新添加!");
            } else {
                //校验编码唯一
                SysCategory original = getByCodeAndRootCode(sysCategory.getCode(), parent.getRootCode());
                if (original != null) {
                    throw new JeecgBootException("分类编码已存在,请修改后重试!");
                }
                if (ISysCategoryService.HAS_CHILD.equals(parent.getHasChild())) {
                    parent.setHasChild(ISysCategoryService.HAS_CHILD);
                    sysCategoryMapper.updateById(parent);
                }
                sysCategory.setRootCode(parent.getRootCode());
                String parentIds = parent.getParentIds() == null ? parent.getId() : (parent.getParentIds() + "," + parent.getId());
                sysCategory.setParentIds(parentIds);
            }
        } else {
            //校验编码唯一
            SysCategory original = getByCodeAndRootCode(sysCategory.getCode(), null);
            if (original != null) {
                throw new JeecgBootException("分类编码已存在,请修改后重试!");
            }
            //父节点不存在 默认为根节点
            sysCategory.setPid(ISysCategoryService.ROOT_PID_VALUE);
            sysCategory.setRootCode(sysCategory.getCode());
            sysCategory.setParentIds(null);
        }
        sysCategoryMapper.insert(sysCategory);
    }
    @Override
    public List<TreeSelectModel> queryListByCode(String pcode) throws JeecgBootException{
        String pid = ROOT_PID_VALUE;
        if(oConvertUtils.isNotEmpty(pcode)) {
            List<SysCategory> list = baseMapper.selectList(new LambdaQueryWrapper<SysCategory>().eq(SysCategory::getCode, pcode));
            if(list==null || list.size() ==0) {
                throw new JeecgBootException("该编码【"+pcode+"】不存在,请核实!");
            }
            if(list.size()>1) {
                throw new JeecgBootException("该编码【"+pcode+"】存在多个,请核实!");
            }
            pid = list.get(0).getId();
        }
        return baseMapper.queryListByPid(pid,null);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateSysCategory(SysCategory sysCategory) {
        SysCategory entity = sysCategoryMapper.selectById(sysCategory.getId());
        if (entity == null) {
            throw new JeecgBootException("编辑的数据不存在,请刷新重试!");
        }
        if (oConvertUtils.isEmpty(sysCategory.getPid())) {
            sysCategory.setPid(ISysCategoryService.ROOT_PID_VALUE);
        } else {
            //如果当前节点父ID不为空 则设置父节点的hasChild 为1
            SysCategory parent = sysCategoryMapper.selectById(sysCategory.getPid());
            if (parent != null && !ISysCategoryService.HAS_CHILD.equals(parent.getHasChild())) {
                parent.setHasChild(ISysCategoryService.HAS_CHILD);
                sysCategoryMapper.updateById(parent);
            } else {
                sysCategory.setPid(ISysCategoryService.ROOT_PID_VALUE);
            }
        }
        sysCategoryMapper.updateById(sysCategory);
    }
    @Override
    public List<TreeSelectModel> queryListByPid(String pid) {
        if(oConvertUtils.isEmpty(pid)) {
            pid = ROOT_PID_VALUE;
        }
        return baseMapper.queryListByPid(pid,null);
    }
    @Override
    public List<TreeSelectModel> queryListByCode(String pcode) throws JeecgBootException {
        String pid = ROOT_PID_VALUE;
        if (oConvertUtils.isNotEmpty(pcode)) {
            List<SysCategory> list = baseMapper.selectList(new LambdaQueryWrapper<SysCategory>().eq(SysCategory::getCode, pcode));
            if (list == null || list.size() == 0) {
                throw new JeecgBootException("该编码【" + pcode + "】不存在,请核实!");
            }
            if (list.size() > 1) {
                throw new JeecgBootException("该编码【" + pcode + "】存在多个,请核实!");
            }
            pid = list.get(0).getId();
        }
        return baseMapper.queryListByPid(pid, null);
    }
    @Override
    public List<TreeSelectModel> queryListByPid(String pid, Map<String, String> condition) {
        if(oConvertUtils.isEmpty(pid)) {
            pid = ROOT_PID_VALUE;
        }
        return baseMapper.queryListByPid(pid,condition);
    }
    @Override
    public List<TreeSelectModel> queryListByPid(String pid) {
        if (oConvertUtils.isEmpty(pid)) {
            pid = ROOT_PID_VALUE;
        }
        return baseMapper.queryListByPid(pid, null);
    }
    @Override
    public String queryIdByCode(String code) {
        return baseMapper.queryIdByCode(code);
    }
    @Override
    public List<TreeSelectModel> queryListByPid(String pid, Map<String, String> condition) {
        if (oConvertUtils.isEmpty(pid)) {
            pid = ROOT_PID_VALUE;
        }
        return baseMapper.queryListByPid(pid, condition);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteSysCategory(String ids) {
        String allIds = this.queryTreeChildIds(ids);
        String pids = this.queryTreePids(ids);
        //1.删除时将节点下所有子节点一并删除
        this.baseMapper.deleteBatchIds(Arrays.asList(allIds.split(",")));
        //2.将父节点中已经没有下级的节点,修改为没有子节点
        if(oConvertUtils.isNotEmpty(pids)){
            LambdaUpdateWrapper<SysCategory> updateWrapper = new UpdateWrapper<SysCategory>()
                    .lambda()
                    .in(SysCategory::getId,Arrays.asList(pids.split(",")))
                    .set(SysCategory::getHasChild,"0");
            this.update(updateWrapper);
        }
    }
    @Override
    public String queryIdByCode(String code) {
        return baseMapper.queryIdByCode(code);
    }
    /**
     * 查询节点下所有子节点
     * @param ids
     * @return
     */
    private String queryTreeChildIds(String ids) {
        //获取id数组
        String[] idArr = ids.split(",");
        StringBuffer sb = new StringBuffer();
        for (String pidVal : idArr) {
            if(pidVal != null){
                if(!sb.toString().contains(pidVal)){
                    if(sb.toString().length() > 0){
                        sb.append(",");
                    }
                    sb.append(pidVal);
                    this.getTreeChildIds(pidVal,sb);
                }
            }
        }
        return sb.toString();
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteSysCategory(String ids) {
        String allIds = this.queryTreeChildIds(ids);
        String pids = this.queryTreePids(ids);
        //1.删除时将节点下所有子节点一并删除
        this.baseMapper.deleteBatchIds(Arrays.asList(allIds.split(",")));
        //2.将父节点中已经没有下级的节点,修改为没有子节点
        if (oConvertUtils.isNotEmpty(pids)) {
            LambdaUpdateWrapper<SysCategory> updateWrapper = new UpdateWrapper<SysCategory>()
                    .lambda()
                    .in(SysCategory::getId, Arrays.asList(pids.split(",")))
                    .set(SysCategory::getHasChild, "0");
            this.update(updateWrapper);
        }
    }
    /**
     * 查询需修改标识的父节点ids
     * @param ids
     * @return
     */
    private String queryTreePids(String ids) {
        StringBuffer sb = new StringBuffer();
        //获取id数组
        String[] idArr = ids.split(",");
        for (String id : idArr) {
            if(id != null){
                SysCategory category = this.baseMapper.selectById(id);
                //根据id查询pid值
                String metaPid = category.getPid();
                //查询此节点上一级是否还有其他子节点
                LambdaQueryWrapper<SysCategory> queryWrapper = new LambdaQueryWrapper<>();
                queryWrapper.eq(SysCategory::getPid,metaPid);
                queryWrapper.notIn(SysCategory::getId,Arrays.asList(idArr));
                List<SysCategory> dataList = this.baseMapper.selectList(queryWrapper);
                boolean flag = (dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(metaPid)
    /**
     * 查询节点下所有子节点
     *
     * @param ids
     * @return
     */
    private String queryTreeChildIds(String ids) {
        //获取id数组
        String[] idArr = ids.split(",");
        StringBuffer sb = new StringBuffer();
        for (String pidVal : idArr) {
            if (pidVal != null) {
                if (!sb.toString().contains(pidVal)) {
                    if (sb.toString().length() > 0) {
                        sb.append(",");
                    }
                    sb.append(pidVal);
                    this.getTreeChildIds(pidVal, sb);
                }
            }
        }
        return sb.toString();
    }
    /**
     * 查询需修改标识的父节点ids
     *
     * @param ids
     * @return
     */
    private String queryTreePids(String ids) {
        StringBuffer sb = new StringBuffer();
        //获取id数组
        String[] idArr = ids.split(",");
        for (String id : idArr) {
            if (id != null) {
                SysCategory category = this.baseMapper.selectById(id);
                //根据id查询pid值
                String metaPid = category.getPid();
                //查询此节点上一级是否还有其他子节点
                LambdaQueryWrapper<SysCategory> queryWrapper = new LambdaQueryWrapper<>();
                queryWrapper.eq(SysCategory::getPid, metaPid);
                queryWrapper.notIn(SysCategory::getId, Arrays.asList(idArr));
                List<SysCategory> dataList = this.baseMapper.selectList(queryWrapper);
                boolean flag = (dataList == null || dataList.size() == 0) && !Arrays.asList(idArr).contains(metaPid)
                        && !sb.toString().contains(metaPid);
                if(flag){
                    //如果当前节点原本有子节点 现在木有了,更新状态
                    sb.append(metaPid).append(",");
                }
            }
        }
        if(sb.toString().endsWith(SymbolConstant.COMMA)){
            sb = sb.deleteCharAt(sb.length() - 1);
        }
        return sb.toString();
    }
                if (flag) {
                    //如果当前节点原本有子节点 现在木有了,更新状态
                    sb.append(metaPid).append(",");
                }
            }
        }
        if (sb.toString().endsWith(SymbolConstant.COMMA)) {
            sb = sb.deleteCharAt(sb.length() - 1);
        }
        return sb.toString();
    }
    /**
     * 递归 根据父id获取子节点id
     * @param pidVal
     * @param sb
     * @return
     */
    private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){
        LambdaQueryWrapper<SysCategory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(SysCategory::getPid,pidVal);
        List<SysCategory> dataList = baseMapper.selectList(queryWrapper);
        if(dataList != null && dataList.size()>0){
            for(SysCategory category : dataList) {
                if(!sb.toString().contains(category.getId())){
                    sb.append(",").append(category.getId());
                }
                this.getTreeChildIds(category.getId(), sb);
            }
        }
        return sb;
    }
    /**
     * 递归 根据父id获取子节点id
     *
     * @param pidVal
     * @param sb
     * @return
     */
    private StringBuffer getTreeChildIds(String pidVal, StringBuffer sb) {
        LambdaQueryWrapper<SysCategory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(SysCategory::getPid, pidVal);
        List<SysCategory> dataList = baseMapper.selectList(queryWrapper);
        if (dataList != null && dataList.size() > 0) {
            for (SysCategory category : dataList) {
                if (!sb.toString().contains(category.getId())) {
                    sb.append(",").append(category.getId());
                }
                this.getTreeChildIds(category.getId(), sb);
            }
        }
        return sb;
    }
    @Override
    public List<String> loadDictItem(String ids) {
        return this.loadDictItem(ids, true);
    }
    @Override
    public List<String> loadDictItem(String ids) {
        return this.loadDictItem(ids, true);
    }
    @Override
    public List<String> loadDictItem(String ids, boolean delNotExist) {
        String[] idArray = ids.split(",");
        LambdaQueryWrapper<SysCategory> query = new LambdaQueryWrapper<>();
        query.in(SysCategory::getId, Arrays.asList(idArray));
        // 查询数据
        List<SysCategory> list = super.list(query);
        // 取出name并返回
        List<String> textList;
        // update-begin--author:sunjianlei--date:20210514--for:新增delNotExist参数,设为false不删除数据库里不存在的key ----
        if (delNotExist) {
            textList = list.stream().map(SysCategory::getName).collect(Collectors.toList());
        } else {
            textList = new ArrayList<>();
            for (String id : idArray) {
                List<SysCategory> res = list.stream().filter(i -> id.equals(i.getId())).collect(Collectors.toList());
                textList.add(res.size() > 0 ? res.get(0).getName() : id);
            }
        }
        // update-end--author:sunjianlei--date:20210514--for:新增delNotExist参数,设为false不删除数据库里不存在的key ----
        return textList;
    }
    @Override
    public List<String> loadDictItem(String ids, boolean delNotExist) {
        String[] idArray = ids.split(",");
        LambdaQueryWrapper<SysCategory> query = new LambdaQueryWrapper<>();
        query.in(SysCategory::getId, Arrays.asList(idArray));
        // 查询数据
        List<SysCategory> list = super.list(query);
        // 取出name并返回
        List<String> textList;
        // update-begin--author:sunjianlei--date:20210514--for:新增delNotExist参数,设为false不删除数据库里不存在的key ----
        if (delNotExist) {
            textList = list.stream().map(SysCategory::getName).collect(Collectors.toList());
        } else {
            textList = new ArrayList<>();
            for (String id : idArray) {
                List<SysCategory> res = list.stream().filter(i -> id.equals(i.getId())).collect(Collectors.toList());
                textList.add(res.size() > 0 ? res.get(0).getName() : id);
            }
        }
        // update-end--author:sunjianlei--date:20210514--for:新增delNotExist参数,设为false不删除数据库里不存在的key ----
        return textList;
    }
    @Override
    public List<SysCategory> listByParams(SysCategory query) {
        QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>(query);
        if (query != null) {
            if (StringUtils.isNotBlank(query.getName())) {
                queryWrapper.like("t.name", query.getName());
            }
            if (StringUtils.isNotBlank(query.getCode())) {
                queryWrapper.like("t.code", query.getCode());
            }
        }
        queryWrapper.orderByDesc("t.id");
        return sysCategoryMapper.listByParams(queryWrapper);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deepAdd(SysCategory sysCategory, List<String> errorMessage) {
        String parenCode = (StringUtils.isBlank(sysCategory.getParentCode()) ? "0" : sysCategory.getParentCode());
        if (ROOT_PID_VALUE.equals(parenCode)) {
            sysCategory.setPid(ROOT_PID_VALUE);
            sysCategory.setRootCode(sysCategory.getCode());
            sysCategory.setParentIds(null);
            //根节点
            SysCategory entity = this.getByCodeAndRootCode(sysCategory.getCode(), null);
            if (entity != null) {
                sysCategory.setId(entity.getId());
                sysCategoryMapper.updateById(sysCategory);
            } else {
                sysCategoryMapper.insert(sysCategory);
            }
        } else {
            //获取上级节点
            String pid = sysCategory.getPid();
            SysCategory parent = this.getById(pid);
            if (parent == null) {
                String rootCode = sysCategory.getRootCode();
                parent = this.getByCodeAndRootCode(parenCode, rootCode);
            }
            if (parent != null) {
                sysCategory.setPid(parent.getId());
                sysCategory.setRootCode(parent.getRootCode());
                String parentIds = (parent.getParentIds() == null ? parent.getId() : (parent.getParentIds() + "," + parent.getId()));
                sysCategory.setParentIds(parentIds);
                if (!ISysCategoryService.HAS_CHILD.equals(parent.getHasChild())) {
                    //更新根节点
                    parent.setHasChild(HAS_CHILD);
                    sysCategoryMapper.updateById(parent);
                }
                SysCategory entity = this.getByCodeAndRootCode(sysCategory.getCode(), parent.getRootCode());
                if (entity != null) {
                    sysCategory.setId(entity.getId());
                    sysCategoryMapper.updateById(sysCategory);
                } else {
                    sysCategoryMapper.insert(sysCategory);
                }
            } else {
                errorMessage.add(String.format("编码[%s]的父节点没有找到,", sysCategory.getCode()));
                return;
            }
        }
        if (CollectionUtil.isNotEmpty(sysCategory.getChildren())) {
            sysCategory.getChildren().forEach(child -> {
                child.setPid(sysCategory.getId());
                this.deepAdd(child, errorMessage);
            });
        }
    }
    /**
     * 查询编码是否已存在
     *
     * @param code     分类编码
     * @param rootCode 根节点编码 为空,添加根节点, 不为空,添加子节点
     * @return
     */
    @Override
    public SysCategory getByCodeAndRootCode(String code, String rootCode) {
        LambdaQueryWrapper<SysCategory> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotBlank(rootCode)) {
            queryWrapper.eq(SysCategory::getRootCode, rootCode);
        }
        queryWrapper.eq(SysCategory::getCode, code);
        return sysCategoryMapper.selectOne(queryWrapper);
    }
}