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

67736 中英文切换技术领域数据查询。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-03 14:40:01 +08:00
parent f6d24aba56
commit 9c4de2acc9
6 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+8 -8
View File
@@ -581,17 +581,17 @@ public class SysCategoryController {
* @return
*/
@GetMapping("/getSysCategoryTree")
public Result getSysCategoryTree() {
return Result.OK(sysCategoryService.getSysCategoryTree(null));
public Result getSysCategoryTree(@RequestParam Map<String,Object> params) {
return Result.OK(sysCategoryService.getSysCategoryTree(null,params));
}
/**
* 只查询交付物类型的树形数据字典
* @return
*/
@GetMapping("/getDeliverableTree")
public Result getDeliverableTree() {
public Result getDeliverableTree(@RequestParam Map<String,Object> 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<String,Object> 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<String,Object> params) {
String flag = "ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2";
return Result.OK(sysCategoryService.getSysCategoryTree(flag));
return Result.OK(sysCategoryService.getSysCategoryTree(flag,params));
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
+1 -1
View File
@@ -67,7 +67,7 @@ public interface ISysCategoryService extends IService<SysCategory> {
* 获取树形结构
* @return
*/
List<SysCategoryTreeVO> getSysCategoryTree(String flag);
List<SysCategoryTreeVO> getSysCategoryTree(String flag,Map<String,Object> params);
/**
* 获取树形结构，中英文可切换
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+6 -2
View File
@@ -267,7 +267,11 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
}
@Override
public List<SysCategoryTreeVO> getSysCategoryTree(String flag) {
public List<SysCategoryTreeVO> getSysCategoryTree(String flag,Map<String,Object> 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<SysCategoryMapper, SysCa
}
List<SysCategoryTreeVO> tree = new ArrayList<>();
if(CollectionUtils.isNotEmpty(list)){
tree = TreeUtils.getSysCategoryTree(list);
tree = TreeUtils.getSysCategoryTree(list,cut);
}
return tree;
}catch (Exception ex){
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java
+20 -7
View File
@@ -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<SysCategoryTreeVO> getSysCategoryTree(List<SysCategory> sysCategoryList) {
public static List<SysCategoryTreeVO> getSysCategoryTree(List<SysCategory> sysCategoryList, String cut) {
List<SysCategoryTreeVO> 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<SysCategoryTreeVO> getSysCategoryTreeChild(String id, List<SysCategory> sysCategoryList) {
private static List<SysCategoryTreeVO> getSysCategoryTreeChild(String id, List<SysCategory> sysCategoryList,String cut) {
List<SysCategoryTreeVO> 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);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+13 -4
View File
@@ -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<BussDocumentLi
}
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
Map<String,Object> params = new HashedMap();
params.put("cut",cut);
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params);
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
if(CutEnum.CN.getValue().equals(cut)){
@@ -529,7 +532,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList());
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
Map<String,Object> params = new HashedMap();
params.put("cut",cut);
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params);
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
Map<String, Object> map = new HashMap<>();
@@ -673,7 +678,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
Map<String,Object> params = new HashedMap();
params.put("cut",cut);
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params);
// List<Map<String, Object>> result = new ArrayList<>();
// for (OnlCgformArea onlCgformAreaTemp : areaList) {
// String areaName = "";
@@ -766,7 +773,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
Map<String,Object> params = new HashedMap();
params.put("cut",cut);
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params);
List<Map<String, Object>> result = new ArrayList<>();
for (OnlCgformArea onlCgformAreaTemp : areaList) {
String areaName = "";
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+4 -1
View File
@@ -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<FileSplitItemsEOMap
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList());
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null); // 查询所有 并以树结构返回
Map<String,Object> params = new HashedMap();
params.put("cut",cut);
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); // 查询所有 并以树结构返回
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
Map<String, Object> map = new HashMap<>();