commit

api-common/src/main/java/api/common/pojo/vo/project/SimulationManualProjectSingleVo.java

@@ -50,12 +50,12 @@ public class SimulationManualProjectSingleVo {
     //场景测试包数组（公私有）
     private String[] sceneArrayS;
     // 复杂度规则
-    private String complexityEvaluationRuleName;
+    private String complexityEvaluationRuleId;
     // 危险度
-    private String riskEvaluationRuleName;
+    private String riskEvaluationRuleId;
     // 暴露率
-    private String exposureRateEvaluationRuleName;
+    private String exposureRateEvaluationRuleId;
     // 覆盖率
-    private String coverageRateEvaluationRuleName;
+    private String coverageRateEvaluationRuleId;
 
 }

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

@@ -20,7 +20,6 @@ import api.common.pojo.po.model.ConfigSensorPO;
 import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.po.project.*;
 import api.common.pojo.po.scene.SceneComplexityPO;
-import api.common.pojo.po.scene.SceneEvaluationRulePO;
 import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.SceneRiskPO;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
@@ -230,23 +229,6 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         SimulationManualProjectSingleVo vo = new SimulationManualProjectSingleVo();
         convertPoToVo(po, vo);
-        if (StringUtil.isNotEmpty(po.getComplexityEvaluationRuleId())) {
-            SceneEvaluationRulePO sceneComRule = sceneEvaluationRuleMapper.querySceneEvaluationPyById(po.getComplexityEvaluationRuleId());
-            vo.setComplexityEvaluationRuleName(sceneComRule == null ? null : sceneComRule.getRuleName());
-        }
-        if (StringUtil.isNotEmpty(po.getRiskEvaluationRuleId())) {
-            SceneEvaluationRulePO sceneRiskRule = sceneEvaluationRuleMapper.querySceneEvaluationPyById(po.getRiskEvaluationRuleId());
-            vo.setRiskEvaluationRuleName(sceneRiskRule == null ? null : sceneRiskRule.getRuleName());
-        }
-        if (StringUtil.isNotEmpty(po.getCoverageRateEvaluationRuleId())) {
-            SceneEvaluationRulePO sceneCoverRule = sceneEvaluationRuleMapper.querySceneEvaluationPyById(po.getCoverageRateEvaluationRuleId());
-            vo.setCoverageRateEvaluationRuleName(sceneCoverRule == null ? null : sceneCoverRule.getRuleName());
-        }
-        if (StringUtil.isNotEmpty(po.getExposureRateEvaluationRuleId())) {
-            SceneEvaluationRulePO sceneExposureRule = sceneEvaluationRuleMapper.querySceneEvaluationPyById(po.getExposureRateEvaluationRuleId());
-            vo.setExposureRateEvaluationRuleName(sceneExposureRule == null ? null : sceneExposureRule.getRuleName());
-        }
-
         if (ObjectUtil.isNotNull(po.getAlgorithmArray())) {
             vo.setAlgorithmArrayS(po.getAlgorithmArray().split(","));
         }