commit

api-common/src/main/java/api/common/pojo/enums/SceneEvaluationEnum.java

@@ -21,25 +21,25 @@ public enum SceneEvaluationEnum {
         this.levelValue = levelValue;
     }
 
-    public static SceneEvaluationEnum matchLevelEnumByLevelValue(String levelValue) {
+    public static String matchLevelEnumByLevelValue(String levelValue) {
         if (Objects.isNull(levelValue)) {
             return null;
         }
         for (SceneEvaluationEnum enums : SceneEvaluationEnum.values()) {
             if (enums.getLevelValue().equals(levelValue)) {
-                return enums;
+                return enums.getLevel();
             }
         }
         return null;
     }
 
-    public static SceneEvaluationEnum matchLevelEnumByLevel(String level) {
+    public static String matchLevelEnumByLevel(String level) {
         if (Objects.isNull(level)) {
             return null;
         }
         for (SceneEvaluationEnum enums : SceneEvaluationEnum.values()) {
             if (enums.getLevel().equals(level)) {
-                return enums;
+                return enums.getLevelValue();
             }
         }
         return null;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java

@@ -552,7 +552,6 @@ public class TaskDomainService {
         if (StringUtils.equals(sceneEvaluationComputeParam.getComputeType(), DictConstants.COMPLEXITY)) {
             String complexity = rootNode.path("复杂度").asText();
             String complexityLevel = rootNode.path("复杂度等级").asText();
-            SceneEvaluationEnum sceneEvaluationEnum = matchLevelEnumByLevel(complexityLevel);
             SceneComplexityPO sceneComplexityPO = new SceneComplexityPO();
             sceneComplexityPO.setSceneId(sceneEvaluationComputeParam.getSceneId());
             sceneComplexityPO.setComplexityId(StringUtil.getRandomUUID());
@@ -560,7 +559,7 @@ public class TaskDomainService {
             sceneComplexityPO.setRuleId(ruleId);
             sceneComplexityPO.setTaskId(sceneEvaluationComputeParam.getTaskId());
             sceneComplexityPO.setComplexity(complexity);
-            sceneComplexityPO.setComplexityLevel(sceneEvaluationEnum.getLevelValue());
+            sceneComplexityPO.setComplexityLevel(matchLevelEnumByLevel(complexityLevel));
             sceneComplexityPO.setIsDeleted(DictConstants.IS_NOT_DELETED);
             sceneComplexityPO.setCreateUserId(null);
             sceneComplexityPO.setCreateTime(TimeUtil.getNowForMysql());
@@ -568,7 +567,6 @@ public class TaskDomainService {
         } else {
             String risk = rootNode.path("危险度").asText();
             String riskLevel = rootNode.path("危险度等级").asText();
-            SceneEvaluationEnum sceneEvaluationEnum = matchLevelEnumByLevel(riskLevel);
             SceneRiskPO sceneRiskPO = new SceneRiskPO();
             sceneRiskPO.setSceneId(sceneEvaluationComputeParam.getSceneId());
             sceneRiskPO.setRuleId(StringUtil.getRandomUUID());
@@ -576,7 +574,7 @@ public class TaskDomainService {
             sceneRiskPO.setRuleId(ruleId);
             sceneRiskPO.setTaskId(sceneEvaluationComputeParam.getTaskId());
             sceneRiskPO.setRisk(risk);
-            sceneRiskPO.setRiskLevel(sceneEvaluationEnum.getLevelValue());
+            sceneRiskPO.setRiskLevel(matchLevelEnumByLevel(riskLevel));
             sceneRiskPO.setIsDeleted(DictConstants.IS_NOT_DELETED);
             sceneRiskPO.setCreateUserId(null);
             sceneRiskPO.setCreateTime(TimeUtil.getNowForMysql());

simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/scene_library/score_rule/ScoreRuleController.java

@@ -261,10 +261,7 @@ public class ScoreRuleController {
         }
         PageUtil.setPageInfo(params);
         List<SceneRiskPO> list = sceneEvaluationRuleService.querySceneEvaluationRiskDetail(params);
-        list.forEach(po -> {
-            SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getRiskLevel());
-            po.setRiskLevel(sceneEvaluationEnum.getLevel());
-        });
+        list.forEach(po -> po.setRiskLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getRiskLevel())));
         PageInfo<SceneRiskPO> sceneRiskPOPageInfo = new PageInfo<>(list);
         List<SceneRiskVO> list1 = new ArrayList<>();
         // po 转 vo
@@ -288,10 +285,7 @@ public class ScoreRuleController {
         }
         PageUtil.setPageInfo(params);
         List<SceneComplexityPO> list = sceneEvaluationRuleService.querySceneEvaluationComplexityDetail(params);
-        list.forEach(po -> {
-            SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getComplexityLevel());
-            po.setComplexityLevel(sceneEvaluationEnum.getLevel());
-        });
+        list.forEach(po -> po.setComplexityLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getComplexityLevel())));
         PageInfo<SceneComplexityPO> sceneComplexityPOPageInfo = new PageInfo<>(list);
         List<SceneComplexityVO> list1 = new ArrayList<>();
         // po 转 vo
@@ -314,10 +308,7 @@ public class ScoreRuleController {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "请输入 sceneId");
         }
         List<SceneRiskPO> list = sceneEvaluationRuleService.querySceneEvaluationRiskDetail(params);
-        list.forEach(po -> {
-            SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getRiskLevel());
-            po.setRiskLevel(sceneEvaluationEnum.getLevel());
-        });
+        list.forEach(po -> po.setRiskLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getRiskLevel())));
         List<SceneRiskVO> list1 = new ArrayList<>();
         // po 转 vo
         for (SceneRiskPO po : list) {
@@ -337,10 +328,7 @@ public class ScoreRuleController {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "请输入 sceneId");
         }
         List<SceneComplexityPO> list = sceneEvaluationRuleService.querySceneEvaluationComplexityDetail(params);
-        list.forEach(po -> {
-            SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getComplexityLevel());
-            po.setComplexityLevel(sceneEvaluationEnum.getLevel());
-        });
+        list.forEach(po -> po.setComplexityLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getComplexityLevel())));
         List<SceneComplexityVO> list1 = new ArrayList<>();
         // po 转 vo
         for (SceneComplexityPO po : list) {

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

@@ -3172,15 +3172,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 List<String> sceneIds = sceneScoreLi.stream().map(SceneScListVo::getSceneId).collect(Collectors.toList());
                 // 查询复杂度和危险度
                 List<SceneComplexityPO> sceneComplexityPOS = sceneComplexityMapper.selectSceneComplexityEvaluationForExport(param.getProjectId(), sceneIds);
-                sceneComplexityPOS.forEach(sceneComplexityPO -> {
-                    SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(sceneComplexityPO.getComplexityLevel());
-                    sceneComplexityPO.setComplexityLevel(sceneEvaluationEnum.getLevel());
-                });
+                sceneComplexityPOS.forEach(sceneComplexityPO -> sceneComplexityPO.setComplexityLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(sceneComplexityPO.getComplexityLevel())));
                 List<SceneRiskPO> sceneRiskPOS = sceneRiskMapper.selectSceneRiskEvaluationForExport(param.getProjectId(), sceneIds);
-                sceneRiskPOS.forEach(sceneRiskPO -> {
-                    SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(sceneRiskPO.getRiskLevel());
-                    sceneRiskPO.setRiskLevel(sceneEvaluationEnum.getLevel());
-                });
+                sceneRiskPOS.forEach(sceneRiskPO -> sceneRiskPO.setRiskLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(sceneRiskPO.getRiskLevel())));
                 if (CollectionUtil.isNotEmpty(sceneComplexityPOS) || CollectionUtil.isNotEmpty(sceneRiskPOS)) {
                     addElement(document, "场景评价", null, bf3, 15, false, 30, true);
                     addElement(document, "       场景测试包共包含" + totalSceneNum + "个场景.", null, bf3, 15, false, 30, false);

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneEvaluationRuleService.java

@@ -200,29 +200,21 @@ public class SceneEvaluationRuleService {
         SceneComplexityPO sceneComplexityPO = new SceneComplexityPO();
         sceneComplexityPO.setMinComplexity(param.getMinComplexity());
         sceneComplexityPO.setMaxComplexity(param.getMaxComplexity());
-        SceneEvaluationEnum comEnums = SceneEvaluationEnum.matchLevelEnumByLevel(param.getComplexityLevel());
-        sceneComplexityPO.setComplexityLevel(comEnums.getLevelValue());
+        sceneComplexityPO.setComplexityLevel(SceneEvaluationEnum.matchLevelEnumByLevel(param.getComplexityLevel()));
         sceneComplexityPO.setSceneIdList(param.getSceneIdList());
         // 查询复杂度的符合条件的第一条数据
         List<SceneComplexityPO> sceneReferenceLibCSPOS = sceneComplexityMapper.selectSceneIdsByEvaluation(sceneComplexityPO);
-        sceneReferenceLibCSPOS.forEach(po -> {
-            SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getComplexityLevel());
-            po.setComplexityLevel(sceneEvaluationEnum.getLevel());
-        });
+        sceneReferenceLibCSPOS.forEach(po -> po.setComplexityLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getComplexityLevel())));
 
         Map<String, SceneComplexityPO> complexityPOMap = sceneReferenceLibCSPOS.stream().collect(Collectors.toMap(SceneComplexityPO::getSceneId, Function.identity()));
         SceneRiskPO sceneRiskPO = new SceneRiskPO();
         sceneRiskPO.setMaxRisk(param.getMaxRisk());
         sceneRiskPO.setMinRisk(param.getMinRisk());
-        SceneEvaluationEnum riskEnums = SceneEvaluationEnum.matchLevelEnumByLevel(param.getRiskLevel());
-        sceneRiskPO.setRiskLevel(riskEnums.getLevelValue());
+        sceneRiskPO.setRiskLevel(SceneEvaluationEnum.matchLevelEnumByLevel(param.getRiskLevel()));
         sceneRiskPO.setSceneIdList(param.getSceneIdList());
         // 查询复杂度的符合条件的第一条数据
         List<SceneRiskPO> sceneReferenceLibCRPOS = sceneRiskMapper.selectSceneIdsByEvaluation(sceneRiskPO);
-        sceneReferenceLibCRPOS.forEach(po -> {
-            SceneEvaluationEnum sceneEvaluationEnum = SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getRiskLevel());
-            po.setRiskLevel(sceneEvaluationEnum.getLevel());
-        });
+        sceneReferenceLibCRPOS.forEach(po -> po.setRiskLevel(SceneEvaluationEnum.matchLevelEnumByLevelValue(po.getRiskLevel())));
         Map<String, SceneRiskPO> riskPOMap = sceneReferenceLibCRPOS.stream().collect(Collectors.toMap(SceneRiskPO::getSceneId, Function.identity()));
         return SceneEvaluationOperatePO.builder().sceneComplexityPOMap(complexityPOMap).sceneRiskPOMap(riskPOMap).build();
     }
@@ -345,7 +337,6 @@ public class SceneEvaluationRuleService {
         if (StringUtils.equals(sceneEvaluationComputeParam.getComputeType(), DictConstants.COMPLEXITY)) {
             String complexity = rootNode.path("复杂度").asText();
             String complexityLevel = rootNode.path("复杂度等级").asText();
-            SceneEvaluationEnum sceneEvaluationEnum = matchLevelEnumByLevel(complexityLevel);
             SceneComplexityPO sceneComplexityPO = new SceneComplexityPO();
             sceneComplexityPO.setSceneId(sceneEvaluationComputeParam.getSceneId());
             sceneComplexityPO.setComplexityId(StringUtil.getRandomUUID());
@@ -353,7 +344,7 @@ public class SceneEvaluationRuleService {
             sceneComplexityPO.setRuleId(ruleId);
             sceneComplexityPO.setTaskId(sceneEvaluationComputeParam.getTaskId());
             sceneComplexityPO.setComplexity(complexity);
-            sceneComplexityPO.setComplexityLevel(sceneEvaluationEnum.getLevelValue());
+            sceneComplexityPO.setComplexityLevel(matchLevelEnumByLevel(complexityLevel));
             sceneComplexityPO.setIsDeleted(DictConstants.IS_NOT_DELETED);
             sceneComplexityPO.setCreateUserId(AuthUtil.getCurrentUserId());
             sceneComplexityPO.setCreateTime(TimeUtil.getNowForMysql());
@@ -361,7 +352,6 @@ public class SceneEvaluationRuleService {
         } else {
             String risk = rootNode.path("危险度").asText();
             String riskLevel = rootNode.path("危险度等级").asText();
-            SceneEvaluationEnum sceneEvaluationEnum = matchLevelEnumByLevel(riskLevel);
             SceneRiskPO sceneRiskPO = new SceneRiskPO();
             sceneRiskPO.setSceneId(sceneEvaluationComputeParam.getSceneId());
             sceneRiskPO.setRuleId(StringUtil.getRandomUUID());
@@ -369,7 +359,7 @@ public class SceneEvaluationRuleService {
             sceneRiskPO.setRuleId(ruleId);
             sceneRiskPO.setTaskId(sceneEvaluationComputeParam.getTaskId());
             sceneRiskPO.setRisk(risk);
-            sceneRiskPO.setRiskLevel(sceneEvaluationEnum.getLevelValue());
+            sceneRiskPO.setRiskLevel(matchLevelEnumByLevel(riskLevel));
             sceneRiskPO.setIsDeleted(DictConstants.IS_NOT_DELETED);
             sceneRiskPO.setCreateUserId(AuthUtil.getCurrentUserId());
             sceneRiskPO.setCreateTime(TimeUtil.getNowForMysql());