martin

api-common/src/main/java/api/common/pojo/constants/DictConstants.java

@@ -137,14 +137,14 @@ public class DictConstants {
     public static final String SYSTEM_CLUSTER_ID = "system"; // 超管使用此集群id执行项目
 
     // 评测等级
-    public static final String EVALUATION_LEVEL_G = "G"; // 超管使用此集群id执行项目
-    public static final String EVALUATION_LEVEL_G_DESCRIPTION = "优秀（G）"; // 超管使用此集群id执行项目
-    public static final String EVALUATION_LEVEL_A = "A"; // 超管使用此集群id执行项目
-    public static final String EVALUATION_LEVEL_A_DESCRIPTION = "良好（A）"; // 超管使用此集群id执行项目
-    public static final String EVALUATION_LEVEL_M = "M"; // 超管使用此集群id执行项目
-    public static final String EVALUATION_LEVEL_M_DESCRIPTION = "一般（M）"; // 超管使用此集群id执行项目
-    public static final String EVALUATION_LEVEL_P = "P"; // 超管使用此集群id执行项目
-    public static final String EVALUATION_LEVEL_P_DESCRIPTION = "较差（P）"; // 超管使用此集群id执行项目
+    public static final String EVALUATION_LEVEL_G = "G";
+    public static final String EVALUATION_LEVEL_G_DESCRIPTION = "优秀（G）";
+    public static final String EVALUATION_LEVEL_A = "A";
+    public static final String EVALUATION_LEVEL_A_DESCRIPTION = "良好（A）";
+    public static final String EVALUATION_LEVEL_M = "M";
+    public static final String EVALUATION_LEVEL_M_DESCRIPTION = "一般（M）";
+    public static final String EVALUATION_LEVEL_P = "P";
+    public static final String EVALUATION_LEVEL_P_DESCRIPTION = "较差（P）";
 
 
     public static final String VIDEO_GPU = "0";

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

@@ -802,7 +802,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         //添加开始时间
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if(poParam.getStartTime() != null){
+        if (poParam.getStartTime() != null) {
             projectReportVo.setStartTime(dateFormat.format(poParam.getStartTime()));
         }
 
@@ -2662,7 +2662,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         params.put("createUserId", AuthUtil.getCurrentUserId());
         List<Map<String, Object>> list = simulationProjectTaskMapper.selectRunTaskByState(params);
         // 汉化
-        if(CollectionUtil.isNotEmpty(list)){
+        if (CollectionUtil.isNotEmpty(list)) {
             list.forEach(map -> {
                 if (StateConstant.Aborted.getEnglish().equals(map.get(key2))) {
                     map.put(key2, StateConstant.Aborted.getChinese());
@@ -2693,7 +2693,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             Map<String, Object> newMap = new HashMap<>();
             int numSum = 0;
             final Iterator<Map<String, Object>> iterator = list.iterator();
-            while (iterator.hasNext()){
+            while (iterator.hasNext()) {
                 final Map<String, Object> map = iterator.next();
                 if (StateConstant.Terminated.getChinese().equals(map.get(key2))) {
                     numSum += Integer.parseInt(map.get(key1) + "");
@@ -2730,20 +2730,21 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         Map<String, Object> params = new HashMap<>();
         params.put("createUserId", AuthUtil.getCurrentUserId());
         final List<Map<String, Object>> maps = simulationProjectMapper.selectEvaluationLevel(params);
-        maps.forEach(map -> {
+        final Iterator<Map<String, Object>> iterator = maps.iterator();
+        while (iterator.hasNext()) {
+            final Map<String, Object> map = iterator.next();
             if (StateConstant.G.getEnglish().equals(map.get(key2))) {
                 map.put(key2, StateConstant.G.getChinese());
-            }
-            if (StateConstant.A.getEnglish().equals(map.get(key2))) {
+            } else if (StateConstant.A.getEnglish().equals(map.get(key2))) {
                 map.put(key2, StateConstant.A.getChinese());
-            }
-            if (StateConstant.M.getEnglish().equals(map.get(key2))) {
+            } else if (StateConstant.M.getEnglish().equals(map.get(key2))) {
                 map.put(key2, StateConstant.M.getChinese());
-            }
-            if (StateConstant.P.getEnglish().equals(map.get(key2))) {
+            } else if (StateConstant.P.getEnglish().equals(map.get(key2))) {
                 map.put(key2, StateConstant.P.getChinese());
+            } else {
+                iterator.remove();
             }
-        });
+        }
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, maps);
     }
 
@@ -2953,9 +2954,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                     }
                 }
                 slsi[size - 7] = slv.getSceneNum();
-                slsi[size - 6] =slv.getErrorSceneNum();
-                slsi[size - 5] =slv.getNotScoredSceneNum();
-                slsi[size - 4] =slv.getNotStandardSceneNum();
+                slsi[size - 6] = slv.getErrorSceneNum();
+                slsi[size - 5] = slv.getNotScoredSceneNum();
+                slsi[size - 4] = slv.getNotStandardSceneNum();
                 slsi[size - 3] = slv.getStandardSceneNum();
                 slsi[size - 2] = slv.getLastScore();
                 slsi[size - 1] = slv.getFirstScore();
@@ -3019,41 +3020,41 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             //末级指标
             //先对末级指标进行分组
             LinkedHashMap<String, List<SceneScListVo>> map1 = new LinkedHashMap<>();
-            for(SceneScListVo sc : sceneScoreLi){
+            for (SceneScListVo sc : sceneScoreLi) {
                 String lastZbName = "";
                 //最多支持到6级指标
                 lastZbName = sc.getSublistName1();
-                if(StringUtil.isNotEmpty(sc.getSublistName2())){
+                if (StringUtil.isNotEmpty(sc.getSublistName2())) {
                     lastZbName = sc.getSublistName2();
                 }
-                if(StringUtil.isNotEmpty(sc.getSublistName3())){
+                if (StringUtil.isNotEmpty(sc.getSublistName3())) {
                     lastZbName = sc.getSublistName3();
                 }
-                if(StringUtil.isNotEmpty(sc.getSublistName4())){
+                if (StringUtil.isNotEmpty(sc.getSublistName4())) {
                     lastZbName = sc.getSublistName4();
                 }
-                if(StringUtil.isNotEmpty(sc.getSublistName5())){
+                if (StringUtil.isNotEmpty(sc.getSublistName5())) {
                     lastZbName = sc.getSublistName5();
                 }
-                if(StringUtil.isNotEmpty(sc.getSublistName6())){
+                if (StringUtil.isNotEmpty(sc.getSublistName6())) {
                     lastZbName = sc.getSublistName6();
                 }
 
                 List<SceneScListVo> listVos = map1.get(lastZbName);
-                if(listVos == null){
+                if (listVos == null) {
                     listVos = new ArrayList<>();
                     listVos.add(sc);
                     map1.put(lastZbName, listVos);
-                }else{
+                } else {
                     listVos.add(sc);
                 }
             }
-            StringBuffer deFenShuoMing = new StringBuffer("       "+vo.getAlgorithmName());
-            for(String m : map1.keySet()){
+            StringBuffer deFenShuoMing = new StringBuffer("       " + vo.getAlgorithmName());
+            for (String m : map1.keySet()) {
                 List<SceneScListVo> sceneScListVos = map1.get(m);
                 int size2 = sceneScListVos.size();
                 int xy100b = 0;
-                for(SceneScListVo sc1 : sceneScListVos){
+                for (SceneScListVo sc1 : sceneScListVos) {
                     String sceneScore = sc1.getSceneScore();
                     BigDecimal score = new BigDecimal("0");
                     if (sceneScore != null && !"".equals(sceneScore)) {
@@ -3068,18 +3069,18 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                     //小于100
                     if (r == -1) {
                         xy100b++;
-                        deFenShuoMing.append("在"+m+"指标中的"+sc1.getSceneId()+"中，测试得分为"+sceneScore+"；");
+                        deFenShuoMing.append("在" + m + "指标中的" + sc1.getSceneId() + "中，测试得分为" + sceneScore + "；");
                     }
 
                 }
-                if(xy100b == 0){
-                    deFenShuoMing.append("在"+m+"指标中的"+sceneScListVos.size()+"个场景均表现优秀，测试得分100分。");
-                }else{
-                    int num = size2-xy100b;
-                    if(num != 0){
-                        deFenShuoMing.append("其他"+num+"个场景表现良好，测试得分100分。");
-                    }else{
-                        deFenShuoMing = new StringBuffer(deFenShuoMing.substring(0, deFenShuoMing.lastIndexOf("；"))+"。");
+                if (xy100b == 0) {
+                    deFenShuoMing.append("在" + m + "指标中的" + sceneScListVos.size() + "个场景均表现优秀，测试得分100分。");
+                } else {
+                    int num = size2 - xy100b;
+                    if (num != 0) {
+                        deFenShuoMing.append("其他" + num + "个场景表现良好，测试得分100分。");
+                    } else {
+                        deFenShuoMing = new StringBuffer(deFenShuoMing.substring(0, deFenShuoMing.lastIndexOf("；")) + "。");
                     }
                 }
             }

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

@@ -53,7 +53,7 @@ public class ScenePackageService {
         po.setShare("0");
         // 查询个人私有唯一
         ScenePackageNewVO scenePackageNewVO = scenePackageMapper.querySelfOnly(scenePackageSublistVO.getSublistName(), AuthUtil.getCurrentUserId());
-        if (Objects.nonNull(scenePackageNewVO)) {
+        if (Objects.isNull(scenePackageNewVO)) {
             po.setWeight(scenePackageSublistVO.getWeight());
             po.setRemarks(scenePackageSublistVO.getRemarks());
             po.setSceneNum(scenePackageSublistVO.getSceneNum());