From 9c4de2acc94cebc00b54c6a334cb9fdaa4c1ab9b Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 14:40:01 +0800 Subject: [PATCH] =?UTF-8?q?67736=20=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=8A=80=E6=9C=AF=E9=A2=86=E5=9F=9F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCategoryController.java | 16 +++++------ .../system/service/ISysCategoryService.java | 2 +- .../service/impl/SysCategoryServiceImpl.java | 8 ++++-- .../jero/modules/system/util/TreeUtils.java | 27 ++++++++++++++----- .../BussDocumentLibraryEOServiceImpl.java | 17 +++++++++--- .../impl/FileSplitItemsEOServiceImpl.java | 5 +++- 6 files changed, 52 insertions(+), 23 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index bcba55d30..bb040d777 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -581,17 +581,17 @@ public class SysCategoryController { * @return */ @GetMapping("/getSysCategoryTree") - public Result getSysCategoryTree() { - return Result.OK(sysCategoryService.getSysCategoryTree(null)); + public Result getSysCategoryTree(@RequestParam Map params) { + return Result.OK(sysCategoryService.getSysCategoryTree(null,params)); } /** * 只查询交付物类型的树形数据字典 * @return */ @GetMapping("/getDeliverableTree") - public Result getDeliverableTree() { + public Result getDeliverableTree(@RequestParam Map params) { String flag = "deliverable_template"; - return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + return Result.OK(sysCategoryService.getSysCategoryTree(flag,params)); } /** @@ -599,9 +599,9 @@ public class SysCategoryController { * @return */ @GetMapping("/getEvaluationMethodTree") - public Result getevaluationMethodTree() { + public Result getevaluationMethodTree(@RequestParam Map params) { String flag = "evaluation_method"; - return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + return Result.OK(sysCategoryService.getSysCategoryTree(flag,params)); } /** @@ -609,8 +609,8 @@ public class SysCategoryController { * @return */ @GetMapping("/getCertificationDeliverableTree") - public Result getCertificationDeliverableTree() { + public Result getCertificationDeliverableTree(@RequestParam Map params) { String flag = "ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2"; - return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + return Result.OK(sysCategoryService.getSysCategoryTree(flag,params)); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 4f6a0d863..fa5a31c59 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -67,7 +67,7 @@ public interface ISysCategoryService extends IService { * 获取树形结构 * @return */ - List getSysCategoryTree(String flag); + List getSysCategoryTree(String flag,Map params); /** * 获取树形结构，中英文可切换 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 3e51539c0..d25f88f18 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -267,7 +267,11 @@ public class SysCategoryServiceImpl extends ServiceImpl getSysCategoryTree(String flag) { + public List getSysCategoryTree(String flag,Map params) { + String cut = CutEnum.CN.getValue(); + if(params != null){ + cut = ObjectUtil.isNotEmpty(params.get("cut")) ? (String) params.get("cut") : CutEnum.CN.getValue(); + } try { //只查询技术领域的technology_territory String dictId = ""; @@ -288,7 +292,7 @@ public class SysCategoryServiceImpl extends ServiceImpl tree = new ArrayList<>(); if(CollectionUtils.isNotEmpty(list)){ - tree = TreeUtils.getSysCategoryTree(list); + tree = TreeUtils.getSysCategoryTree(list,cut); } return tree; }catch (Exception ex){ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java index 1102b9124..a71340a51 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Component; import java.util.LinkedList; import java.util.List; +import java.util.Map; /** *生成树形结构工具类 @@ -20,7 +21,7 @@ public class TreeUtils { */ private static final String TREE_ROOT_CODE = "0"; - public static List getSysCategoryTree(List sysCategoryList) { + public static List getSysCategoryTree(List sysCategoryList, String cut) { List sysCategoryTreeVOList = new LinkedList(); for (SysCategory sysCategory : sysCategoryList) { if (TREE_ROOT_CODE.equals(sysCategory.getPid())) { @@ -29,9 +30,15 @@ public class TreeUtils { sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setValue(sysCategory.getId()); sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); - sysCategoryTreeVO.setTitle(sysCategory.getName()); + String title = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + title = sysCategory.getName(); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + title = sysCategory.getEnName(); + } + sysCategoryTreeVO.setTitle(title); sysCategoryTreeVO.setParentId(sysCategory.getPid()); - sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); + sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList,cut)); sysCategoryTreeVOList.add(sysCategoryTreeVO); } } @@ -53,14 +60,14 @@ public class TreeUtils { sysCategoryTreeVO.setTitle(sysCategory.getEnName()); } sysCategoryTreeVO.setParentId(sysCategory.getPid()); - sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); + sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList,cut)); sysCategoryTreeVOList.add(sysCategoryTreeVO); } } return sysCategoryTreeVOList; } - private static List getSysCategoryTreeChild(String id, List sysCategoryList) { + private static List getSysCategoryTreeChild(String id, List sysCategoryList,String cut) { List childrenList = new LinkedList(); for (SysCategory sysCategory : sysCategoryList) { if (id.equals(sysCategory.getPid())) { @@ -69,9 +76,15 @@ public class TreeUtils { sysCategoryTreeVO.setId(sysCategory.getId()); sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setValue(sysCategory.getId()); - sysCategoryTreeVO.setTitle(sysCategory.getName()); + String title = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + title = sysCategory.getName(); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + title = sysCategory.getEnName(); + } + sysCategoryTreeVO.setTitle(title); sysCategoryTreeVO.setParentId(sysCategory.getPid()); - sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); + sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList,cut)); childrenList.add(sysCategoryTreeVO); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 03805e41e..70fb733e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -79,6 +79,7 @@ import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl; import lombok.SneakyThrows; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -474,7 +475,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { if(CutEnum.CN.getValue().equals(cut)){ @@ -529,7 +532,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList()); } //树形数据字典 - List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); @@ -673,7 +678,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); // List> result = new ArrayList<>(); // for (OnlCgformArea onlCgformAreaTemp : areaList) { // String areaName = ""; @@ -766,7 +773,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); List> result = new ArrayList<>(); for (OnlCgformArea onlCgformAreaTemp : areaList) { String areaName = ""; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index c69175bd9..b01182986 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -55,6 +55,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.UserUtils; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; @@ -2957,7 +2958,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); } //树形数据字典 - List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); // 查询所有 并以树结构返回 + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); // 查询所有 并以树结构返回 List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>();