diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 54bd0568..f3665a44 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -1,10 +1,7 @@ package com.jero.modules.system.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -135,6 +132,49 @@ public class SysDictItemController { return Result.OK(jsonArray != null ? jsonArray : new JSONArray()); } + @ApiOperation(value = "选择框查询字典内容树形列表") + @GetMapping("/treeListOption") + public Result treeListOption(SysDictItem sysDictItem, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); + List sysDictItems = sysDictItemService.list(queryWrapper); + //当查询结果中有数据的父级不存在时,赋值父级id为"0" + List idList = sysDictItems.stream().map(SysDictItem::getId).collect(Collectors.toList()); + idList.add("0"); + //赋值pId + sysDictItems.forEach(i ->{ + String parentId = i.getParentId(); + if (idList.contains(parentId)) { + i.setPId(parentId); + }else { + i.setPId("0"); + } + }); + //配置 + TreeNodeConfig treeNodeConfig = new TreeNodeConfig(); + // 自定义属性名 都要默认值的 + treeNodeConfig.setWeightKey("sortOrder"); + treeNodeConfig.setIdKey("id"); + treeNodeConfig.setParentIdKey("pId"); + // 最大递归深度 + treeNodeConfig.setDeep(-1); + //转换器 + List> treeNodes = TreeUtil.build(sysDictItems, "0", treeNodeConfig, + (treeNode, tree) -> { + String id = treeNode.getId(); + tree.setId(id); + tree.setParentId(treeNode.getPId()); + tree.setWeight(treeNode.getSortOrder()); + tree.setName(treeNode.getItemText()); + tree.putExtra("key", id); + tree.putExtra("value", id); + tree.putExtra("title", treeNode.getItemText()); + }); + + JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(treeNodes,SerializerFeature.WriteMapNullValue)); + return Result.OK(jsonArray != null ? jsonArray : new JSONArray()); + } + /** * @功能:新增 * @return diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java index cfdffb58..c25b3017 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) @ApiModel(value="多选标准弹框查询", description="多选标准弹框查询") public class ManyStandardSelectionBoxVO { - @ApiModelProperty(value = "来源(1国内标准、2海外标准、3企业标准)") + @ApiModelProperty(value = "来源(1国标、2外标、3企标)") private java.lang.String source; @ApiModelProperty(value = "标准号/标准名称") private java.lang.String standardNumberOrName; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java index e878cc87..d83b3ad2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNodeRelation.java @@ -47,11 +47,11 @@ public class LawsNodeRelation implements Serializable { @ApiModelProperty(value = "节点code") private java.lang.String nodeCode; /**唯一关联标识(id或者编号)*/ - @Excel(name = "唯一关联标识(id或者编号)", width = 15) - @ApiModelProperty(value = "唯一关联标识(id或者编号)") + @Excel(name = "唯一关联标识(编号)", width = 15) + @ApiModelProperty(value = "唯一关联标识(编号)") private java.lang.String uniqueRelationFlag; - /**所属模块编码*/ + /**所属模块编码(1国标、2外标、3企标)*/ @Excel(name = "所属模块编码", width = 15) - @ApiModelProperty(value = "所属模块编码") + @ApiModelProperty(value = "所属模块编码(1国标、2外标、3企标)") private java.lang.String moduleCode; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java index a5c63180..7e73d8e5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java @@ -2,9 +2,6 @@ package com.jero.modules.laws.standard.service; import com.jero.modules.laws.standard.entity.LawsNodeRelation; import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; /** * @Description: 树型节点关联 @@ -15,62 +12,9 @@ import java.util.List; public interface ILawsNodeRelationService extends IService { /** - * 分页查询 - * - * @param lawsNodeRelation - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(LawsNodeRelation lawsNodeRelation, Integer pageNo, Integer pageSize, HttpServletRequest req); + * @Author: liao + * @Date: 2023/9/13 10:52 + * @Description: 配置标准 + **/ - /** - * 列表查询 - * - * @param lawsNodeRelation - * @param req - * @return - */ - List queryList(LawsNodeRelation lawsNodeRelation, HttpServletRequest req); - - /** - * 保存 - * - * @param lawsNodeRelation - * @return - */ - void add(LawsNodeRelation lawsNodeRelation); - - /** - * 更新 - * - * @param lawsNodeRelation - * @return - */ - void editById(LawsNodeRelation lawsNodeRelation); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - LawsNodeRelation queryById(String id); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java index 241c229f..9fd3a256 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java @@ -1,18 +1,12 @@ package com.jero.modules.laws.standard.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.modules.laws.standard.entity.LawsNodeRelation; import com.jero.modules.laws.standard.mapper.LawsNodeRelationMapper; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /** @@ -25,88 +19,4 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @Transactional(rollbackFor = JeroBootException.class) public class LawsNodeRelationServiceImpl extends ServiceImpl implements ILawsNodeRelationService { - - /** - * 分页查询 - * - * @param lawsNodeRelation - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(LawsNodeRelation lawsNodeRelation, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsNodeRelation, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param lawsNodeRelation - * @param req - * @return - */ - @Override - public List queryList(LawsNodeRelation lawsNodeRelation, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(lawsNodeRelation, req.getParameterMap())); - } - - /** - * 保存 - * - * @param lawsNodeRelation - * @return - */ - @Override - public void add(LawsNodeRelation lawsNodeRelation) { - save(lawsNodeRelation); - } - - /** - * 更新 - * - * @param lawsNodeRelation - * @return - */ - @Override - public void editById(LawsNodeRelation lawsNodeRelation) { - saveOrUpdate(lawsNodeRelation); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public LawsNodeRelation queryById(String id) { - return getById(id); - } }