文档库--树形数据字典
This commit is contained in:
+15
-15
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
|
||||
public class SysCategoryController {
|
||||
@Autowired
|
||||
private ISysCategoryService sysCategoryService;
|
||||
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
* @param sysCategory
|
||||
@@ -67,7 +67,7 @@ public class SysCategoryController {
|
||||
sysCategory.setPid("0");
|
||||
}
|
||||
Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>();
|
||||
|
||||
|
||||
//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
|
||||
//QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
|
||||
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<SysCategory>();
|
||||
@@ -126,7 +126,7 @@ public class SysCategoryController {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param sysCategory
|
||||
@@ -145,7 +145,7 @@ public class SysCategoryController {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
* @param id
|
||||
@@ -162,10 +162,10 @@ public class SysCategoryController {
|
||||
this.sysCategoryService.deleteSysCategory(id);
|
||||
result.success("删除成功!");
|
||||
}
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
* @param ids
|
||||
@@ -183,7 +183,7 @@ public class SysCategoryController {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
* @param id
|
||||
@@ -285,9 +285,9 @@ public class SysCategoryController {
|
||||
}
|
||||
return Result.error("文件导入失败!");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 加载单个数据 用于回显
|
||||
*/
|
||||
@@ -296,7 +296,7 @@ public class SysCategoryController {
|
||||
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);
|
||||
@@ -317,7 +317,7 @@ public class SysCategoryController {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 加载节点的子数据
|
||||
*/
|
||||
@@ -336,7 +336,7 @@ public class SysCategoryController {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 加载一级节点/如果是同步 则所有数据
|
||||
*/
|
||||
@@ -358,7 +358,7 @@ public class SysCategoryController {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 递归求子节点 同步加载用到
|
||||
*/
|
||||
@@ -518,7 +518,7 @@ public class SysCategoryController {
|
||||
|
||||
@GetMapping("/getSysCategoryTree")
|
||||
public Result getSysCategoryTree() {
|
||||
return sysCategoryService.getSysCategoryTree();
|
||||
return Result.OK(sysCategoryService.getSysCategoryTree());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
@@ -17,6 +17,8 @@ public class SysCategoryTreeVO {
|
||||
|
||||
private String title;
|
||||
|
||||
private String dictId;
|
||||
|
||||
private List<SysCategoryTreeVO> children;
|
||||
|
||||
}
|
||||
|
||||
+5
-5
@@ -1,9 +1,9 @@
|
||||
package com.jero.modules.system.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.modules.system.entity.SysCategory;
|
||||
import com.jero.modules.system.entity.SysCategoryTreeVO;
|
||||
import com.jero.modules.system.model.TreeSelectModel;
|
||||
|
||||
import java.util.List;
|
||||
@@ -21,16 +21,16 @@ public interface ISysCategoryService extends IService<SysCategory> {
|
||||
public static final String ROOT_PID_VALUE = "0";
|
||||
|
||||
void addSysCategory(SysCategory sysCategory);
|
||||
|
||||
|
||||
void updateSysCategory(SysCategory sysCategory);
|
||||
|
||||
|
||||
/**
|
||||
* 根据父级编码加载分类字典的数据
|
||||
* @param pcode
|
||||
* @return
|
||||
*/
|
||||
public List<TreeSelectModel> queryListByCode(String pcode) throws JeroBootException;
|
||||
|
||||
|
||||
/**
|
||||
* 根据pid查询子节点集合
|
||||
* @param pid
|
||||
@@ -70,5 +70,5 @@ public interface ISysCategoryService extends IService<SysCategory> {
|
||||
* 获取树形结构
|
||||
* @return
|
||||
*/
|
||||
Result getSysCategoryTree();
|
||||
List<SysCategoryTreeVO> getSysCategoryTree();
|
||||
}
|
||||
|
||||
+3
-3
@@ -62,7 +62,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
|
||||
sysCategory.setPid(categoryPid);
|
||||
baseMapper.insert(sysCategory);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void updateSysCategory(SysCategory sysCategory) {
|
||||
if(oConvertUtils.isEmpty(sysCategory.getPid())){
|
||||
@@ -221,14 +221,14 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result getSysCategoryTree() {
|
||||
public List<SysCategoryTreeVO> getSysCategoryTree() {
|
||||
try {
|
||||
List<SysCategory> list = super.baseMapper.selectList(new QueryWrapper<>());
|
||||
List<SysCategoryTreeVO> tree = new ArrayList<>();
|
||||
if(CollectionUtils.isNotEmpty(list)){
|
||||
tree = TreeUtils.getSysCategoryTree(list);
|
||||
}
|
||||
return Result.OK(tree);
|
||||
return tree;
|
||||
}catch (Exception ex){
|
||||
log.error("查询树形结构失败: " + ex.getMessage());
|
||||
throw new JeroBootException("查询树形结构失败!");
|
||||
|
||||
+2
@@ -25,6 +25,7 @@ public class TreeUtils {
|
||||
if (TREE_ROOT_CODE.equals(sysCategory.getPid())) {
|
||||
SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO();
|
||||
sysCategoryTreeVO.setId(sysCategory.getId());
|
||||
sysCategoryTreeVO.setDictId(sysCategory.getSysDictId());
|
||||
sysCategoryTreeVO.setTitle(sysCategory.getName());
|
||||
sysCategoryTreeVO.setParentId(sysCategory.getPid());
|
||||
sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList));
|
||||
@@ -39,6 +40,7 @@ public class TreeUtils {
|
||||
for (SysCategory sysCategory : sysCategoryList) {
|
||||
if (id.equals(sysCategory.getPid())) {
|
||||
SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO();
|
||||
sysCategoryTreeVO.setDictId(sysCategory.getSysDictId());
|
||||
sysCategoryTreeVO.setId(sysCategory.getId());
|
||||
sysCategoryTreeVO.setTitle(sysCategory.getName());
|
||||
sysCategoryTreeVO.setParentId(sysCategory.getPid());
|
||||
|
||||
Reference in New Issue
Block a user