Merge remote-tracking branch 'origin/master'

simulation-resource-server/src/main/java/com/css/simulation/resource/project/constants/ProjectConstants.java

@@ -17,6 +17,9 @@ public class ProjectConstants {
     //任务运行结果状态
     public static final String TASK_RESULT_STATE = "taskResultState";
 
+    //特殊分隔符
+    public static final String SEPARATOR = "&%&%&";
+
 
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -1514,9 +1514,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         for(SublistScoreVo sp : lastSubList){
             setParentSub(sp, null, pos);
             String sublistName = sp.getSublistName();
-            sublistName += ","+sp.getReturnSceneId()+","+sp.getSceneType()+","+sp.getSceneScore()+","+sp.getTargetEvaluate()+","+sp.getScoreExplain();
+            sublistName += ProjectConstants.SEPARATOR+sp.getReturnSceneId()+ProjectConstants.SEPARATOR+sp.getSceneType()+ProjectConstants.SEPARATOR+
+                    sp.getSceneScore()+ProjectConstants.SEPARATOR+sp.getTargetEvaluate()+ProjectConstants.SEPARATOR+sp.getScoreExplain();
 
-            String[] split = sublistName.split(",");
+            String[] split = sublistName.split(ProjectConstants.SEPARATOR);
 
             List<String> strings = new LinkedList<>();
             strings.addAll(Arrays.asList(split));
@@ -1627,7 +1628,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if(p1.getParentId().equals(p2.getId())){
 
             //末级指标拼接指标名
-            p3.setSublistName(p2.getSublistName()+","+p3.getSublistName());
+            p3.setSublistName(p2.getSublistName()+ProjectConstants.SEPARATOR+p3.getSublistName());
             //查找上级指标，继续拼接
             setParentSub(p3,p2, pos);
         }
@@ -1660,8 +1661,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 String notStandardSceneNum = po.getNotStandardSceneNum();//未达标场景数量
 
                 if(ObjectUtil.isNotNull(sublistName)){
-                    sublistName += ","+sceneNum+","+notStandardSceneNum+","+LastScore+","+firstScore;
-                    String[] split = sublistName.split(",");
+                    sublistName += ProjectConstants.SEPARATOR+sceneNum+ProjectConstants.SEPARATOR+notStandardSceneNum+ProjectConstants.SEPARATOR+LastScore+ProjectConstants.SEPARATOR+firstScore;
+                    String[] split = sublistName.split(ProjectConstants.SEPARATOR);
 
 
                     List<String> strings = new LinkedList<>();
@@ -1830,7 +1831,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 p3.setFirScore(p2.getFirScore());
             }
             //末级指标拼接指标名
-            p3.setSublistName(p2.getSublistName()+","+p3.getSublistName());
+            p3.setSublistName(p2.getSublistName()+ProjectConstants.SEPARATOR+p3.getSublistName());
             //查找上级指标，继续拼接
             setParent(p3,p2, pos, rootId);
         }

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/DictService.java

@@ -134,4 +134,15 @@ public class DictService {
         return getDictMapsByTypes(dictParam);
     }
 
+    public Map<String,String> getDictMapByType(String param) {
+        DictParam dictParam = new DictParam();
+        dictParam.setDictTypes(param);
+        Map<String, Map<String, String>> dictMaps = getDictMapsByTypes(dictParam);
+        Map<String, String> dictMap = dictMaps.get(param);
+        if(ObjectUtil.isNull(dictMap)){
+            new HashMap<>();
+        }
+        return dictMap;
+    }
+
 }