commit

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

@@ -407,7 +407,7 @@ public class SceneEvaluationRuleService {
             }
         }
         // 删除临时文件
-        FileUtil.deleteFolder(linuxTempPath + "scene/evaluation/" + sceneEvaluationComputeParams.get(0).getTaskId());   // 删除临时文件
+//        FileUtil.deleteFolder(linuxTempPath + "scene/evaluation/" + sceneEvaluationComputeParams.get(0).getTaskId());   // 删除临时文件
         return true;
     }
 

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

@@ -318,6 +318,7 @@ public class SceneStandardsService {
      * 获取标准法规场景数据：
      */
     public SceneImportPO importMinio(SceneImportParam parms) {
+        log.info("接到场景上传请求：" + parms);
         SceneImportPO sceneImportPO = new SceneImportPO();
         sceneImportPO.setId(parms.getId());
         try {
@@ -445,6 +446,7 @@ public class SceneStandardsService {
                                 if (isupdate.equals("0")) {
                                     sceneEvaluationComputeParam.setCopySceneId(scenes.stream().map(StandardsRegulationsPO::getRegulationsId).filter(sceneId -> !StringUtils.equals(tempSceneId, sceneId)).collect(Collectors.toList()));
                                 }
+                                log.info("添加计算复杂度数据：" + sceneEvaluationComputeParam);
                                 paramList.add(sceneEvaluationComputeParam);
                             }
                         } catch (Exception e) {
@@ -454,7 +456,9 @@ public class SceneStandardsService {
                         }
                     }
                     try {
-                        sceneEvaluationRuleService.computeSceneReference(parms, paramList);
+                        if (!StringUtils.isEmpty(parms.getSceneEvaluationRuleId())) {
+                            sceneEvaluationRuleService.computeSceneReference(parms, paramList);
+                        }
                     } catch (Exception e) {
                         log.error("计算复杂度失败", e);
                     }