commit

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/runnable/SceneEvaluationComputeRunnable.java

@@ -29,6 +29,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -79,7 +80,9 @@ public class SceneEvaluationComputeRunnable implements Runnable {
         }
         log.info("场景评价规则为：" + sceneEvaluationRulePO);
         // 1 判断有没有用户目录，没有则复制
-        String evaluationDirectoryOfUser = sceneEvaluationComputeParam.getLinuxTempPath() + "scene/evaluation/" + sceneEvaluationComputeParam.getTaskId() + "/";
+        String tempPath = StringUtil.getRandomUUID();
+        log.info("项目 id ：" + sceneEvaluationComputeParam.getTaskId() + " 的临时路径为：" + tempPath);
+        String evaluationDirectoryOfUser = sceneEvaluationComputeParam.getLinuxTempPath() + "scene/evaluation/" + tempPath + "/";
         String scriptsPath = evaluationDirectoryOfUser + "scripts";
         if (!new File(evaluationDirectoryOfUser).exists()) {
             // 1 将场景评价规则脚本保存到 script 目录
@@ -299,10 +302,11 @@ public class SceneEvaluationComputeRunnable implements Runnable {
         sceneEvaluationStatusPO.setEvaluationErrorMsg("");
         updateStatus(sceneEvaluationStatusMapper, sceneEvaluationStatusPO);
         // 删除临时文件
-        FileUtil.deleteFolder(sceneEvaluationComputeParam.getLinuxTempPath() + "scene/evaluation/" + sceneEvaluationComputeParam.getTaskId());   // 删除临时文件
+        FileUtil.deleteFolder(sceneEvaluationComputeParam.getLinuxTempPath() + "scene/evaluation/" + tempPath);   // 删除临时文件
     }
 
     private void updateStatus(SceneEvaluationStatusMapper sceneEvaluationStatusMapper, SceneEvaluationStatusPO sceneEvaluationStatusPO) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (StringUtils.equals(sceneEvaluationComputeParam.getComputeType(), DictConstants.COMPLEXITY)) {
             if (DictConstants.SCENE_IMPORT_EVALUATION_TYPE.equals(sceneEvaluationComputeParam.getType())) {
                 sceneEvaluationStatusMapper.updateImportEvaluationStatus(sceneEvaluationStatusPO);
@@ -315,8 +319,8 @@ public class SceneEvaluationComputeRunnable implements Runnable {
                     JSONObject evaluationJsonObj = JSONObject.parseObject(projectEntity.getEvaluationJsonMsg());
                     evaluationJsonObj.put("complexityEvaluationStatus", sceneEvaluationStatusPO.getEvaluationStatus());
                     evaluationJsonObj.put("complexityEvaluationErrorMsg", sceneEvaluationStatusPO.getEvaluationErrorMsg());
-                    evaluationJsonObj.put("complexityStartEvaluationTime", sceneEvaluationStatusPO.getStartEvaluationTime());
-                    evaluationJsonObj.put("complexityEndEvaluationTime", sceneEvaluationStatusPO.getEndEvaluationTime());
+                    evaluationJsonObj.put("complexityStartEvaluationTime", sdf.format(sceneEvaluationStatusPO.getStartEvaluationTime()));
+                    evaluationJsonObj.put("complexityEndEvaluationTime", sdf.format(sceneEvaluationStatusPO.getEndEvaluationTime()));
                     sceneEvaluationStatusMapper.updateManualProjectEvaluationStatus(sceneEvaluationStatusPO.getId(), evaluationJsonObj.toString());
                 }
             }
@@ -327,8 +331,8 @@ public class SceneEvaluationComputeRunnable implements Runnable {
                 JSONObject evaluationJsonObj = JSONObject.parseObject(projectEntity.getEvaluationJsonMsg());
                 evaluationJsonObj.put("riskEvaluationStatus", sceneEvaluationStatusPO.getEvaluationStatus());
                 evaluationJsonObj.put("riskEvaluationErrorMsg", sceneEvaluationStatusPO.getEvaluationErrorMsg());
-                evaluationJsonObj.put("riskStartEvaluationTime", sceneEvaluationStatusPO.getStartEvaluationTime());
-                evaluationJsonObj.put("riskEndEvaluationTime", sceneEvaluationStatusPO.getEndEvaluationTime());
+                evaluationJsonObj.put("riskStartEvaluationTime", sdf.format(sceneEvaluationStatusPO.getStartEvaluationTime()));
+                evaluationJsonObj.put("riskEndEvaluationTime", sdf.format(sceneEvaluationStatusPO.getEndEvaluationTime()));
                 sceneEvaluationStatusMapper.updateManualProjectEvaluationStatus(sceneEvaluationStatusPO.getId(), evaluationJsonObj.toString());
             }
         }

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

@@ -309,7 +309,7 @@ public class ScoreRuleController {
     }
 
     /**
-     * 查询复杂度详情
+     * 查询危险度详情
      */
     @PostMapping("/querySceneEvaluationRiskDetailNoPage")
     public ResponseBodyVO<List<SceneRiskVO>> querySceneEvaluationRiskDetailNoPage(@RequestBody SceneEvaluationDetailParam params) {
@@ -328,7 +328,7 @@ public class ScoreRuleController {
     }
 
     /**
-     * 查询危险度详情
+     * 查询复杂度详情
      */
     @PostMapping("/querySceneEvaluationComplexityDetailNoPage")
     public ResponseBodyVO<List<SceneComplexityVO>> querySceneEvaluationComplexityDetailNoPage(@RequestBody SceneEvaluationDetailParam params) {

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

@@ -357,7 +357,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             jsonObject.put("complexityEvaluationStatus", DictConstants.SCENE_EVALUATION_STATUS_0);
         }
         if (StringUtil.isNotEmpty(simulationManualProjectPO.getRiskEvaluationRuleId())) {
-            jsonObject.put("riskEvaluationRuleStatus", DictConstants.SCENE_EVALUATION_STATUS_0);
+            jsonObject.put("riskEvaluationStatus", DictConstants.SCENE_EVALUATION_STATUS_0);
         }
         if (StringUtil.isNotEmpty(simulationManualProjectPO.getExposureRateEvaluationRuleId())) {
             jsonObject.put("exposureRateEvaluationStatus", DictConstants.SCENE_EVALUATION_STATUS_0);