李春阳 1 jaar geleden
bovenliggende
commit
bf7edc6abb

+ 3 - 0
api-common/src/main/java/api/common/pojo/po/scene/SceneRiskPO.java

@@ -19,8 +19,11 @@ public class SceneRiskPO implements Serializable {
     private String sceneId;
     private String sceneType;
     private String ruleId;
+    private String ruleName;
     private String algorithmId;
+    private String algorithmName;
     private String vehicleId;
+    private String vehicleName;
     private String taskId;
     private String risk;
     private String riskLevel;

+ 2 - 2
api-common/src/main/java/api/common/pojo/vo/scene/SceneRiskVO.java

@@ -23,6 +23,6 @@ public class SceneRiskVO implements Serializable {
     private String vehicleId;
     private String vehicleName;
     private String taskId;
-    private Integer risk;
-    private Integer riskLevel;
+    private String risk;
+    private String riskLevel;
 }

+ 1 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SceneRiskMapper.java

@@ -1,6 +1,5 @@
 package com.css.simulation.resource.server.infra.db.mysql.mapper;
 
-import api.common.pojo.po.scene.SceneComplexityPO;
 import api.common.pojo.po.scene.SceneRiskPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,7 +18,7 @@ public interface SceneRiskMapper {
 
     @Select("select sr.risk_id, sr.scene_id, sr.scene_type,sr.rule_id ,ser.rule_name, sr.task_id ,sr.risk, sr.risk_level, mv.vehicle_name, a.algorithm_name \n" +
             "from scene_risk sr LEFT JOIN scene_evaluation_rule ser  ON ser.rule_id = sr.rule_id \n" +
-            "INNER JOIN algorithm a  ON sr.algorithm_id = a.id INNER JOIN model_vehicle mv ON mv.id = sr.vehicleId \n" +
+            "LEFT JOIN algorithm a  ON sr.algorithm_id = a.id LEFT JOIN model_vehicle mv ON mv.id = sr.vehicle_id  \n" +
             "where sr.scene_id = #{sceneId} order by sr.create_time desc" )
     List<SceneRiskPO> querySceneEvaluationRiskDetail(@Param("sceneId") String sceneId);