李春阳 1 год назад
Родитель
Сommit
193146354f

+ 1 - 1
api-common/src/main/java/api/common/pojo/enums/SceneEvaluationLevel.java

@@ -10,7 +10,7 @@ import java.util.List;
 public class SceneEvaluationLevel {
 
     // 由小到大
-    private final static List<String> EVALUATION_LEVEL = new ArrayList<>(Arrays.asList("C", "B", "A", "AA", "S"));
+    private final static List<String> EVALUATION_LEVEL = new ArrayList<>(Arrays.asList("D", "C", "B", "A", "AA", "S"));
 
     public static List<String> getEvaluationLevelList(String level) {
         List<String> selectEvaluationLevels = new ArrayList<>();

+ 23 - 0
api-common/src/main/java/api/common/pojo/vo/project/SimulationManualProjectEvaluationVO.java

@@ -0,0 +1,23 @@
+package api.common.pojo.vo.project;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SimulationManualProjectEvaluationVO {
+    private String complexityEvaluationStatus;
+    private String complexityEvaluationErrorMsg;
+    private String complexityStartEvaluationTime;
+    private String complexityEndEvaluationTime;
+    private String riskEvaluationStatus;
+    private String riskEvaluationErrorMsg;
+    private String riskStartEvaluationTime;
+    private String riskEndEvaluationTime;
+}

+ 1 - 0
api-common/src/main/java/api/common/pojo/vo/project/SimulationManualProjectVO.java

@@ -37,4 +37,5 @@ public class SimulationManualProjectVO {
     private String isChoiceGpu;
     private String details;
     private String evaluationJsonMsg;
+    private SimulationManualProjectEvaluationVO simulationManualProjectEvaluation;
 }

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

@@ -225,6 +225,15 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         for (SimulationManualProjectVO simulationManualProjectVo : pageInfo.getList()) {
             convertPoToVo(simulationManualProjectVo, false); // 同时将算法 id 转换成算法名称
+            if (StringUtil.isNotEmpty(simulationManualProjectVo.getEvaluationJsonMsg())) {
+                try {
+                    SimulationManualProjectEvaluationVO simulationManualProjectEvaluationVO =
+                            JsonUtil.jsonToBean(simulationManualProjectVo.getEvaluationJsonMsg(), SimulationManualProjectEvaluationVO.class);
+                    simulationManualProjectVo.setSimulationManualProjectEvaluation(simulationManualProjectEvaluationVO);
+                } catch (Exception e) {
+                    log.error("获取场景评价状态异常 {}", simulationManualProjectVo.getEvaluationJsonMsg(), e);
+                }
+            }
         }
 
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);