martin

api-common/src/main/java/api/common/util/ObjectUtil.java

@@ -262,29 +262,6 @@ public class ObjectUtil {
         return vehiclePO;
     }
 
-    /**
-     * list转tree结构，
-     *
-     * @param list        List<T>类型数据源
-     * @param rootId      tree的根节点id
-     * @param getId       <T>类型获取id的方法
-     * @param getPid      <T>类型获取父id的方法
-     * @param getChildren <T>类型获取子对象的方法
-     * @param setChildren <T>类型设置子对象的方法
-     * @param <T>         该对象满足父子关系的相关字段：id 和 父id
-     * @param <String>    id的数据类型为String
-     * @return 树形结构的List<T>，多根型
-     */
-    public static <T, String> List<T> listToTree(List<T> list, String rootId, Function<T, String> getId, Function<T, String> getPid, Function<T, List<T>> getChildren, BiConsumer<T, List<T>> setChildren) {
-        List<T> treeList = new ArrayList<T>();
-        for (T node : list) {
-            if (rootId.equals(getPid.apply(node))) {
-                treeList.add(findChildren(node, list, getId, getPid, getChildren, setChildren));
-            }
-        }
-        return treeList;
-    }
-
     /**
      * list转tree递归调用
      */
@@ -301,10 +278,6 @@ public class ObjectUtil {
 
     /**
      * list转tree结构，<T>类型需要在属性上添加注解，标识树形结构：@WId 、@WParentId、 @WChildren;
-     *
-     * @param list
-     * @param <T>
-     * @return
      */
     public static <T> List<T> listToTree(List<T> list) {
         if (isNull(list)) {
@@ -313,6 +286,7 @@ public class ObjectUtil {
         return listToTree(list, "0");
     }
 
+    @SuppressWarnings("all")
     public static <T> List<T> listToTree(List<T> list, String root) {
         try {
             List<T> treeList = new LinkedList<T>();
@@ -360,6 +334,7 @@ public class ObjectUtil {
     /**
      * list转tree递归调用
      */
+    @SuppressWarnings("all")
     private static <T> T findChildren(T parent, List<T> list, Method getId, Method getParentId, Method getChildren, Method setChildren) throws InvocationTargetException, IllegalAccessException {
         for (T node : list) {
             String id = (String) getId.invoke(parent);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScoringRulesService.java

@@ -11,6 +11,7 @@ import com.css.simulation.resource.scene.mapper.ScoringRulesMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.*;
 
@@ -22,6 +23,7 @@ public class ScoringRulesService {
     private ScoringRulesMapper scoringRulesMapper;
     @Resource
     ScenePackageMapper scenePackageMapper;
+
     /**
      * 打分规则数据录入：
      */
@@ -39,16 +41,18 @@ public class ScoringRulesService {
 
     @SneakyThrows
     public List<ScoringRulesPO> queryScoringRulesListCSB(ScoringRulesParam params) {
-        if (params != null && params.getShare() != null && params.getShare().equals("0")) {
-            params.setCreateUserId(AuthUtil.getCurrentUserId());
+        List<ScoringRulesPO> list = new ArrayList<>();
+        if (params != null) {
+            if (params.getShare() != null && params.getShare().equals("0")) {
+                params.setCreateUserId(AuthUtil.getCurrentUserId());
+            }
+            list = scoringRulesMapper.queryScoringRulesList(params);
+            params.setCreateUserId("");
+            params.setShare("1");
+            List<ScoringRulesPO> list1 = scoringRulesMapper.queryScoringRulesList(params);
+            list.addAll(list1);
         }
-        List<ScoringRulesPO> list = scoringRulesMapper.queryScoringRulesList(params);
-
         //查询共有
-        params.setCreateUserId("");
-        params.setShare("1");
-        List<ScoringRulesPO> list1 = scoringRulesMapper.queryScoringRulesList(params);
-        list.addAll(list1);
         return list;
     }
 
@@ -72,8 +76,8 @@ public class ScoringRulesService {
     }
 
     @SneakyThrows
-    public ScoringRulesPO querySelfOnly(String ruleName,String createUserId) {
-        return scoringRulesMapper.querySelfOnly(ruleName,createUserId);
+    public ScoringRulesPO querySelfOnly(String ruleName, String createUserId) {
+        return scoringRulesMapper.querySelfOnly(ruleName, createUserId);
     }
 
     @SneakyThrows
@@ -98,11 +102,11 @@ public class ScoringRulesService {
     @SneakyThrows
     public Integer queryCsbById(ScoringRulesParam params) {
 
-        Integer num = scoringRulesMapper.queryCsbById(params);
-        return num;
+        return scoringRulesMapper.queryCsbById(params);
     }
 
     @SneakyThrows
+    @SuppressWarnings("all")
     public List<Map> queryScoringRulesListCSBNew(ScoringRulesParam params) {
         if (params != null && params.getShare() != null && params.getShare().equals("0")) {
             params.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -121,7 +125,7 @@ public class ScoringRulesService {
         List<Map> colourList = new LinkedList();
         listGy.forEach(vo -> {
             Map colourMap = new HashMap();
-            colourMap.put("code",vo.getRulesId());
+            colourMap.put("code", vo.getRulesId());
             colourMap.put("name", vo.getRuleName());
             colourMap.put("vo", vo);
             colourList.add(colourMap);
@@ -133,12 +137,12 @@ public class ScoringRulesService {
         List<Map> colourList1 = new LinkedList();
         listSy.forEach(vo -> {
             Map colourMap = new HashMap();
-            colourMap.put("code",vo.getRulesId());
+            colourMap.put("code", vo.getRulesId());
             colourMap.put("name", vo.getRuleName());
             colourMap.put("vo", vo);
             colourList1.add(colourMap);
         });
-        typeMap1.put("children",colourList1 );
+        typeMap1.put("children", colourList1);
         treeList.add(typeMap);
         treeList.add(typeMap1);
         return treeList;