1

science-admin/src/main/java/com/yiboshi/science/rest/v1/SystemParameterController.java

@@ -140,32 +140,11 @@ public class SystemParameterController extends BaseController<SystemParameterSer
         return ResponseDataModel.ok(systemParameterService.refreshSystemParameter());
     }
 
-    @ApiOperation(value = "根据参数获取参数列表", httpMethod = "GET", notes = "根据参数获取参数列表")
-    @GetMapping
-    @RequestMapping("/getParameterListBySystemCode")
-    public ResponseDataModel<List<SelectListItem>> getParameterListBySystemCode(String SystemCodeOrName) {
-        List<SelectListItem> list = new ArrayList<>();
-        List<SystemParameter> paraList = systemParameterService.getParameterListBySystemCode(SystemCodeOrName);
-        paraList.forEach((e) -> {
-            SelectListItem selectListItem = new SelectListItem(e.getName(), e.getId(),"",true, true, null);
-            list.add(selectListItem);
-        });
-        return ResponseDataModel.ok(list);
-    }
-
-    @ApiOperation(value = "获取学科代码树列表", httpMethod = "GET", notes = "获取学科代码树列表")
-    @GetMapping
-    @RequestMapping("/getKnowledgeInfoList1")
-    public ResponseDataModel<List<SelectListItem>> getKnowledgeInfoList1() {
-        List<SelectListItem> list = systemParameterService.getKnowledgeInfoList1();
-        return ResponseDataModel.ok(list);
-    }
-
-    @ApiOperation(value = "获取学科代码树列表", httpMethod = "GET", notes = "获取学科代码树列表")
+    @ApiOperation(value = "获取多级列表", httpMethod = "GET", notes = "获取多级列表")
     @GetMapping
-    @RequestMapping("/getKnowledgeInfoList2")
-    public ResponseDataModel<List<SelectListItem>> getKnowledgeInfoList2(Integer typeId) {
-        List<SelectListItem> list = systemParameterService.getKnowledgeInfoList2(typeId);
+    @RequestMapping("/getMultiLevelList")
+    public ResponseDataModel<List<SelectListItem>> getMultiLevelList(Integer typeId) {
+        List<SelectListItem> list = systemParameterService.getMultiLevelList(typeId);
         return ResponseDataModel.ok(list);
     }
 

science-admin/src/main/java/com/yiboshi/science/service/SystemParameterService.java

@@ -97,25 +97,7 @@ public interface SystemParameterService extends BaseService<SystemParameterQuery
 
     String judgmentTitleLevel(String titleId);
 
-    /**
-     * 根据systemCodeOrName获取学科列表
-     * @param SystemCodeOrName
-     * @return
-     */
-    List<SystemParameter> getParameterListBySystemCode(String SystemCodeOrName);
-
-    /**
-     * 获取学科代码树列表1
-     * @return
-     */
-    List<SelectListItem> getKnowledgeInfoList1();
-
-    /**
-     * 获取学科代码树列表1
-     * @return
-     */
-    List<SelectListItem> getKnowledgeInfoList2(Integer typeId);
-
+    List<SelectListItem> getMultiLevelList(Integer typeId);
     /**
      * 专业数组代码列表
      * @return

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemParameterServiceImpl.java

@@ -317,8 +317,7 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
                 redisUtils.del(RedisKey.ParameterList + e.getTypeId());
         });
         redisUtils.del(RedisKey.ParameterList + "all");
-        redisUtils.del(RedisKey.KnowledgeCodeList1);
-        redisUtils.del(RedisKey.KnowledgeCodeList2);
+        redisUtils.del(RedisKey.MultiLevelList);
         redisUtils.del(RedisKey.SpecArrayList);
         redisUtils.del(RedisKey.ProjectKPIList);
         redisUtils.del(RedisKey.ParameterTypeList);
@@ -343,68 +342,20 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
         }
     }
 
-    public List<SystemParameter> getParameterListBySystemCode(String SystemCodeOrName) {
-        List<SystemParameter> list = getListByType(68);
-        List<SystemParameter> findList = list.stream().filter(e -> e.getSystemCode().contains(SystemCodeOrName) || e.getName().contains(SystemCodeOrName)).collect(Collectors.toList());
-        return findList;
-    }
-
-    public List<SelectListItem> getKnowledgeInfoList1() {
-        List<SelectListItem> list = null;
-        Object obj = redisUtils.get(RedisKey.KnowledgeCodeList1);
-        if (null != obj)
-            list = (List<SelectListItem>) redisUtils.get(RedisKey.KnowledgeCodeList1);
-        if (null == list || list.size() == 0) {
-            list = getKnowledgeParameterTreeList1();
-            redisUtils.set(RedisKey.KnowledgeCodeList1, list, 7, TimeUnit.DAYS);
-        }
-        return list;
-    }
-
-    public List<SelectListItem> getKnowledgeInfoList2(Integer typeId) {
-        List<SelectListItem> list = null;
-        Object obj = redisUtils.get(RedisKey.KnowledgeCodeList2 + typeId);
+    public List<SelectListItem> getMultiLevelList(Integer typeId) {
+        List<SelectListItem> list = new ArrayList<>();
+        Object obj = redisUtils.get(RedisKey.MultiLevelList);
         if (null != obj)
-            list = (List<SelectListItem>) redisUtils.get(RedisKey.KnowledgeCodeList2 + typeId);
+            list = (List<SelectListItem>) redisUtils.get(RedisKey.MultiLevelList);
         if (null == list || list.size() == 0) {
-            list = getKnowledgeParameterTreeList2(typeId);
-            redisUtils.set(RedisKey.KnowledgeCodeList2 + typeId, list, 7, TimeUnit.DAYS);
-        }
-        return list;
-    }
-
-    private List<SelectListItem> getKnowledgeParameterTreeList1() {
-        List<SystemParameter> parentList = this.getListByType(68);
-
-        List<SelectListItem> list = new ArrayList<>();
-        List<SystemParameter> FirstList = parentList.stream().filter(e -> e.getSystemCode().equals("C") || e.getSystemCode().equals("G") || e.getSystemCode().equals("H") || e.getSystemCode().equals("F")).collect(Collectors.toList());
-        FirstList.forEach(e -> {
-            SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
-            list.add(treeListItem);
-        });
-
-        list.forEach(e -> {
-            List<SelectListItem> SecondList = AddChildList(parentList, e, 3);
-            e.setChildren(SecondList);
-            SecondList.forEach(f -> {
-                List<SelectListItem> ThirdList = AddChildList(parentList, f, 5);
-                f.setChildren(ThirdList);
-            });
-        });
-
-        return list;
-    }
-
-
-    private List<SelectListItem> getKnowledgeParameterTreeList2(Integer typeId) {
+            list = new ArrayList<>();
             List<SystemParameter> parentList = this.getListByType(typeId);
             List<SystemParameter> FirstList = new ArrayList<>();
-        List<SelectListItem> list = new ArrayList<>();
-        if (typeId.equals(69)) {
             FirstList = parentList.stream().filter(e -> e.getParentId() == null).collect(Collectors.toList());
+            List<SelectListItem> finalList = list;
             FirstList.forEach(e -> {
                 SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
-                list.add(treeListItem);
+                finalList.add(treeListItem);
             });
             list.forEach(e -> {
                 List<SelectListItem> SecondList = addChildList(parentList, e);
@@ -414,34 +365,11 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
                     f.setChildren(ThirdList);
                 });
             });
-        } else {
-            FirstList = parentList.stream().filter(e -> e.getSystemCode().equals("C") || e.getSystemCode().equals("G") || e.getSystemCode().equals("H") || e.getSystemCode().equals("F")).collect(Collectors.toList());
-            FirstList.forEach(e -> {
-                SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
-                list.add(treeListItem);
-            });
-            list.forEach(e -> {
-                List<SelectListItem> SecondList = AddChildList(parentList, e, 3);
-                e.setChildren(SecondList);
-                SecondList.forEach(f -> {
-                    List<SelectListItem> ThirdList = AddChildList(parentList, f, 5);
-                    f.setChildren(ThirdList);
-                });
-            });
+            redisUtils.set(RedisKey.MultiLevelList, list, 7, TimeUnit.DAYS);
         }
         return list;
     }
 
-    private List<SelectListItem> AddChildList(List<SystemParameter> parentList, SelectListItem s, int CodeLenght) {
-        List<SelectListItem> SelectList = new ArrayList<>();
-        List<SystemParameter> itemList = parentList.stream().filter(f -> f.getSystemCode().contains(s.getDescription()) && f.getSystemCode().length() == CodeLenght).collect(Collectors.toList());
-        itemList.forEach(e -> {
-            SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
-            SelectList.add(treeListItem);
-        });
-        return SelectList;
-    }
-
     private List<SelectListItem> addChildList(List<SystemParameter> parentList, SelectListItem s) {
         List<SelectListItem> SelectList = new ArrayList<>();
         List<SystemParameter> itemList = parentList.stream().filter(f -> f.getParentId() != null && f.getParentId().equals(s.getKey())).collect(Collectors.toList());
@@ -452,15 +380,14 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
         return SelectList;
     }
 
-
     public List<SpecDTO> getParameterArray(Integer typeId) {
         List<SpecDTO> list = null;
-        Object obj = redisUtils.get(RedisKey.SpecArrayList + typeId);
+        Object obj = redisUtils.get(RedisKey.SpecArrayList);
         if (null != obj)
-            list = (List<SpecDTO>) redisUtils.get(RedisKey.SpecArrayList + typeId);
+            list = (List<SpecDTO>) redisUtils.get(RedisKey.SpecArrayList);
         if (null == list || list.size() == 0) {
             list = systemParameterDAO.getParameterArray(typeId);
-            redisUtils.set(RedisKey.SpecArrayList + typeId, list, 7, TimeUnit.DAYS);
+            redisUtils.set(RedisKey.SpecArrayList, list, 7, TimeUnit.DAYS);
         }
         return list;
     }

science-admin/src/main/java/com/yiboshi/science/utils/RedisKey.java

@@ -18,10 +18,8 @@ public class RedisKey {
     public final static String RoleList = "role-list";
     //项目KPI绩效指标
     public final static String ProjectKPIList = "project-kpi-list";
-    //学科代码列表1
-    public final static String KnowledgeCodeList1 = "knowledge-code-list1";
-    //学科代码列表2
-    public final static String KnowledgeCodeList2 = "knowledge-code-list2";
+    //多级列表
+    public final static String MultiLevelList = "multi-level-list";
     //专业数组代码列表
     public final static String SpecArrayList = "spec-array-list";
 }