commit

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

@@ -8,6 +8,7 @@ import java.util.Objects;
 public enum SceneEvaluationEnum {
 
     S_LEVEL("S", "90"),
+    AA_LEVEL("AA", "85"),
     A_LEVEL("A", "80"),
     B_LEVEL("B", "70"),
     C_LEVEL("C", "60");

api-common/src/main/java/api/common/util/FileUtil.java

@@ -986,6 +986,24 @@ public class FileUtil {
     }
 
 
+    public static void deleteFolder(String folderPath) {
+        File folder = new File(folderPath);
+        if (folder.exists()) {
+            File[] files = folder.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        deleteFolder(file.getPath());
+                    } else {
+                        file.delete();
+                    }
+                }
+            }
+            folder.delete();
+        }
+    }
+
+
     // -------------------------------- S --------------------------------
 
 //    public static String splicingPath(String... paths) {

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

@@ -340,7 +340,7 @@ public class SceneReferenceLibService {
                                 try {
                                     boolean sceneEvaluationResult = sceneEvaluationRuleService.computeSceneReference(params, sceneEvaluationComputeParam);
                                     if (isUpdate && sceneEvaluationResult) {
-                                        sceneEvaluationRuleService.copySceneComplexityResult(taskId, tempSceneId, scenes.stream().map(SceneReferenceLibPO::getSceneId).collect(Collectors.toList()));
+                                        sceneEvaluationRuleService.copySceneComplexityResult(taskId, tempSceneId, scenes.stream().map(SceneReferenceLibPO::getSceneId).filter(sceneId -> !StringUtils.equals(tempSceneId, sceneId)).collect(Collectors.toList()));
                                     }
                                 } catch (Exception e) {
                                     log.error("计算复杂度失败", e);
@@ -353,7 +353,7 @@ public class SceneReferenceLibService {
                         }
                     }
                     // 删除临时文件
-                    FileUtil.rm(linuxTempPath + "scene/evaluation/" + taskId + "/");   // 删除临时文件
+                    FileUtil.deleteFolder(linuxTempPath + "scene/evaluation/" + taskId);   // 删除临时文件
                 }
             }
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_4);

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneComplexityMapper.java

@@ -20,7 +20,7 @@ public interface SceneComplexityMapper {
 
     void saveSceneComplexity(SceneComplexityPO params);
 
-    void saveSceneComplexityS(@Param("list") List<SceneComplexityPO> params);
+    void saveSceneComplexityS(List<SceneComplexityPO> list);
 
     @Select("SELECT * FROM scene_complexity WHERE scene_id = #{sceneId} AND task_id = #{taskId}")
     List<SceneComplexityPO> selectSceneComplexityEvaluation(@Param("taskId") String taskId, @Param("sceneId") String sceneId);

simulation-resource-server/src/main/resources/mysql/mapper/SceneComplexityMapper.xml

@@ -70,20 +70,20 @@
                 #{createUserId,jdbcType=VARCHAR}, #{createTime})
     </insert>
 
-    <insert id="saveSceneComplexityS" parameterType="api.common.pojo.po.scene.SceneComplexityPO">
+    <insert id="saveSceneComplexityS">
         insert into simulation.scene_complexity
         (complexity_id, scene_id, scene_type, rule_id,
         task_id, complexity, complexity_level,
         is_deleted, create_user_id, create_time
         )
         values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (#{complexityId,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, #{sceneType,jdbcType=VARCHAR},
-            #{ruleId,jdbcType=VARCHAR},
-            #{taskId,jdbcType=VARCHAR}, #{complexity,jdbcType=VARCHAR},
-            #{complexityLevel,jdbcType=VARCHAR},
-            #{isDeleted,jdbcType=VARCHAR},
-            #{createUserId,jdbcType=VARCHAR}, #{createTime})
+        <foreach collection="list" item="item" separator=",">
+            (#{item.complexityId,jdbcType=VARCHAR}, #{item.sceneId,jdbcType=VARCHAR}, #{item.sceneType,jdbcType=VARCHAR},
+            #{item.ruleId,jdbcType=VARCHAR},
+            #{item.taskId,jdbcType=VARCHAR}, #{item.complexity,jdbcType=VARCHAR},
+            #{item.complexityLevel,jdbcType=VARCHAR},
+            #{item.isDeleted,jdbcType=VARCHAR},
+            #{item.createUserId,jdbcType=VARCHAR}, #{item.createTime})
         </foreach>
     </insert>