commit

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

@@ -10,6 +10,7 @@ import api.common.pojo.po.scene.SceneEvaluationRulePO;
 import api.common.pojo.po.scene.SceneRiskPO;
 import api.common.util.*;
 import com.alibaba.druid.util.StringUtils;
+import com.css.simulation.resource.server.infra.db.entity.SceneEvaluationResultEntity;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneComplexityMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneEvaluationRuleMapper;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.ScenePackageMapper;
@@ -273,7 +274,7 @@ public class SceneEvaluationRuleService {
 
         String sceneEvaluationCommand = "python3 " + pyMainPath + " " + (evaluationDirectoryOfUser + sceneId);
         String sceneEvaluationResult;
-//        ScoreEntity evaluationScore = null;
+        SceneEvaluationResultEntity evaluationScore = null;
         log.info("开始执行场景评价命令：" + sceneEvaluationCommand);
         Runtime r = Runtime.getRuntime();
         Process p = null;
@@ -296,11 +297,15 @@ public class SceneEvaluationRuleService {
         sceneEvaluationResult = sb.toString();
         log.info("场景" + sceneId + " 的场景评价结束，结果为：" + sceneEvaluationResult);
         String replace = StringUtil.replace(sceneEvaluationResult, "'", "\"");
-//        try {
-//            evaluationScore = JsonUtil.jsonToBean(replace, ScoreEntity.class);
-//        } catch (Exception e) { // 打分失败
-//            log.debug("场景" + sceneId + " 的场景评价失败：", e);
-//        }
+        try {
+            evaluationScore = JsonUtil.jsonToBean(replace, SceneEvaluationResultEntity.class);
+        } catch (Exception e) {
+            log.debug("场景" + sceneId + " 的场景评价失败：", e);
+            return;
+        }
+
+
+
     }
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/entity/SceneEvaluationResultEntity.java

@@ -0,0 +1,17 @@
+package com.css.simulation.resource.server.infra.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneEvaluationResultEntity {
+    private String risk;
+    private String risk_level;
+    private String complexity;
+    private String complexity_level;
+}