Merge branch '20240309-saq-fix' of https://gitee.com/lingxinmeng/simulation-cloud into lcytest

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

@@ -52,8 +52,6 @@ public class TaskDomainService {
     private String pyPath;
     @Value("${scheduler.linux-path.temp}")
     private String linuxTempPath;
-    @Value("${scheduler.scene-evaluation.script}")
-    private String sceneEvaluationScript;
     @Resource
     private StringRedisTemplate stringRedisTemplate;
     @Resource

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

@@ -880,15 +880,15 @@ public class SceneAccidentService {
 
                             // 计算复杂度
                             if (!StringUtils.isEmpty(params.getSceneEvaluationRuleId())) {
-                                String tempSceneId = scenes.get(0).getAccidentId();
                                 SceneEvaluationComputeParam sceneEvaluationComputeParam = new SceneEvaluationComputeParam();
-                                sceneEvaluationComputeParam.setSceneId(isupdate.equals("0") ? tempSceneId : sceneAccidentPO.getAccidentId());
+                                sceneEvaluationComputeParam.setSceneId(isupdate.equals("0") ? sceneAccidentPO.getAccidentId() : scenes.get(0).getAccidentId());
                                 sceneEvaluationComputeParam.setSceneXOSCPath(sceneAccidentPO.getXmlAddress());
                                 sceneEvaluationComputeParam.setSceneXODRPath(sceneAccidentPO.getXodrAddress());
                                 sceneEvaluationComputeParam.setSceneType(DictConstants.SCENE_ACCIDENT);
                                 sceneEvaluationComputeParam.setTaskId(taskId);
                                 sceneEvaluationComputeParam.setComputeType(DictConstants.COMPLEXITY);
-                                if (isupdate.equals("0")) {
+                                if (isupdate.equals("1")) {
+                                    String tempSceneId = scenes.get(0).getAccidentId();
                                     sceneEvaluationComputeParam.setCopySceneId(scenes.stream().map(SceneAccidentPO::getAccidentId).filter(sceneId -> !StringUtils.equals(tempSceneId, sceneId)).collect(Collectors.toList()));
                                 }
                                 paramList.add(sceneEvaluationComputeParam);

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

@@ -48,9 +48,6 @@ public class SceneEvaluationRuleService {
     @Value("${server.linux-path.temp}")
     private String linuxTempPath;
 
-    @Value("${server.scene-evaluation.script}")
-    private String sceneEvaluationScript;
-
     @Resource
     private ScenePackageMapper scenePackageMapper;
 

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

@@ -704,15 +704,15 @@ public class SceneNaturalService {
 
                             // 计算复杂度
                             if (!StringUtils.isEmpty(parms.getSceneEvaluationRuleId())) {
-                                String tempSceneId = scenes.get(0).getNaturalId();
                                 SceneEvaluationComputeParam sceneEvaluationComputeParam = new SceneEvaluationComputeParam();
-                                sceneEvaluationComputeParam.setSceneId(update ? tempSceneId : sceneNaturalPO.getNaturalId());
+                                sceneEvaluationComputeParam.setSceneId(update ? scenes.get(0).getNaturalId() : sceneNaturalPO.getNaturalId());
                                 sceneEvaluationComputeParam.setSceneXOSCPath(sceneNaturalPO.getXoscAddress());
                                 sceneEvaluationComputeParam.setSceneXODRPath(sceneNaturalPO.getXodrAddress());
                                 sceneEvaluationComputeParam.setSceneType(DictConstants.SCENE_NATURAL);
                                 sceneEvaluationComputeParam.setTaskId(taskId);
                                 sceneEvaluationComputeParam.setComputeType(DictConstants.COMPLEXITY);
                                 if (update) {
+                                    String tempSceneId = scenes.get(0).getNaturalId();
                                     sceneEvaluationComputeParam.setCopySceneId(scenes.stream().map(SceneNaturalPO::getNaturalId).filter(sceneId -> !StringUtils.equals(tempSceneId, sceneId)).collect(Collectors.toList()));
                                 }
                                 paramList.add(sceneEvaluationComputeParam);

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

@@ -332,15 +332,15 @@ public class SceneReferenceLibService {
                             }
                             successNum += 1;
                             if (!StringUtils.isEmpty(params.getSceneEvaluationRuleId())) {
-                                String tempSceneId = scenes.get(0).getSceneId();
                                 SceneEvaluationComputeParam sceneEvaluationComputeParam = new SceneEvaluationComputeParam();
-                                sceneEvaluationComputeParam.setSceneId(isUpdate ? tempSceneId : sceneReferenceLibPO.getSceneId());
+                                sceneEvaluationComputeParam.setSceneId(isUpdate ? scenes.get(0).getSceneId() : sceneReferenceLibPO.getSceneId());
                                 sceneEvaluationComputeParam.setSceneXOSCPath(sceneReferenceLibPO.getXmlAddress());
                                 sceneEvaluationComputeParam.setSceneXODRPath(sceneReferenceLibPO.getXodrAddress());
                                 sceneEvaluationComputeParam.setSceneType(DictConstants.SCENE_REFERENCE_LIB);
                                 sceneEvaluationComputeParam.setTaskId(taskId);
                                 sceneEvaluationComputeParam.setComputeType(DictConstants.COMPLEXITY);
                                 if (isUpdate) {
+                                    String tempSceneId = scenes.get(0).getSceneId();
                                     sceneEvaluationComputeParam.setCopySceneId(scenes.stream().map(SceneReferenceLibPO::getSceneId).filter(sceneId -> !StringUtils.equals(tempSceneId, sceneId)).collect(Collectors.toList()));
                                 }
                                 paramList.add(sceneEvaluationComputeParam);

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

@@ -435,15 +435,15 @@ public class SceneStandardsService {
 
                             // 计算复杂度
                             if (!StringUtils.isEmpty(parms.getSceneEvaluationRuleId())) {
-                                String tempSceneId = scenes.get(0).getRegulationsId();
                                 SceneEvaluationComputeParam sceneEvaluationComputeParam = new SceneEvaluationComputeParam();
-                                sceneEvaluationComputeParam.setSceneId(isupdate.equals("0") ? tempSceneId : standardsRegulationsPO.getRegulationsId());
+                                sceneEvaluationComputeParam.setSceneId(isupdate.equals("0") ? standardsRegulationsPO.getRegulationsId() : scenes.get(0).getRegulationsId());
                                 sceneEvaluationComputeParam.setSceneXOSCPath(standardsRegulationsPO.getXmlAddress());
                                 sceneEvaluationComputeParam.setSceneXODRPath(standardsRegulationsPO.getXodrAddress());
                                 sceneEvaluationComputeParam.setSceneType(DictConstants.SCENE_STANDARD);
                                 sceneEvaluationComputeParam.setTaskId(taskId);
                                 sceneEvaluationComputeParam.setComputeType(DictConstants.COMPLEXITY);
-                                if (isupdate.equals("0")) {
+                                if (isupdate.equals("1")) {
+                                    String tempSceneId = scenes.get(0).getRegulationsId();
                                     sceneEvaluationComputeParam.setCopySceneId(scenes.stream().map(StandardsRegulationsPO::getRegulationsId).filter(sceneId -> !StringUtils.equals(tempSceneId, sceneId)).collect(Collectors.toList()));
                                 }
                                 log.info("添加计算复杂度数据：" + sceneEvaluationComputeParam);