commit

api-common/src/main/java/api/common/pojo/po/scene/SceneComplexityPO.java

@@ -19,6 +19,7 @@ public class SceneComplexityPO implements Serializable {
     private String sceneId;
     private String sceneType;
     private String ruleId;
+    private String ruleName;
     private String taskId;
     private Integer complexity;
     private Integer complexityLevel;

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

@@ -3,14 +3,18 @@ package com.css.simulation.resource.server.app.service;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.scene.SceneEvaluationRuleParam;
+import api.common.pojo.po.scene.SceneComplexityPO;
 import api.common.pojo.po.scene.SceneEvaluationRulePO;
+import api.common.pojo.po.scene.SceneRiskPO;
 import api.common.util.LogUtil;
 import api.common.util.PythonUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.alibaba.druid.util.StringUtils;
+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;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.SceneRiskMapper;
 import com.css.simulation.resource.server.infra.feign.service.FileDownService;
 import com.css.simulation.resource.server.infra.util.AuthUtil;
 import lombok.SneakyThrows;
@@ -33,6 +37,12 @@ public class SceneEvaluationRuleService {
     @Resource
     private SceneEvaluationRuleMapper sceneEvaluationRuleMapper;
 
+    @Resource
+    private SceneComplexityMapper sceneComplexityMapper;
+
+    @Resource
+    private SceneRiskMapper sceneRiskMapper;
+
     @Resource
     private FileDownService fileDownService;
 
@@ -156,5 +166,14 @@ public class SceneEvaluationRuleService {
         LogUtil.update();
     }
 
+    @SneakyThrows
+    public List<SceneComplexityPO> querySceneEvaluationComplexityDetail(String sceneId) {
+        return sceneComplexityMapper.querySceneEvaluationComplexityDetail(sceneId);
+    }
+
+    @SneakyThrows
+    public List<SceneRiskPO> querySceneEvaluationRiskDetail(String sceneId) {
+        return sceneRiskMapper.querySceneEvaluationRiskDetail(sceneId);
+    }
 
 }

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

@@ -2,6 +2,8 @@ package com.css.simulation.resource.server.infra.db.mysql.mapper;
 
 import api.common.pojo.po.scene.SceneComplexityPO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -11,4 +13,9 @@ public interface SceneComplexityMapper {
 
     List<SceneComplexityPO> selectSceneIdsByEvaluation(SceneComplexityPO sceneComplexityPO);
 
+    @Select("select scene_id, scene_type,rule_id ,rule_name, task_id ,complexity, complexity_level\n" +
+            "from scene_complexity\n" +
+            "where scene_id = #{sceneId} order by create_time desc" )
+    List<SceneComplexityPO> querySceneEvaluationComplexityDetail(@Param("sceneId") String sceneId);
+
 }

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

@@ -2,6 +2,8 @@ package com.css.simulation.resource.server.infra.db.mysql.mapper;
 
 import api.common.pojo.po.scene.SceneRiskPO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -11,4 +13,9 @@ public interface SceneRiskMapper {
 
     List<SceneRiskPO> selectSceneIdsByEvaluation(SceneRiskPO sceneRiskPO);
 
+    @Select("select scene_id, scene_type,rule_id ,rule_name, task_id ,risk, risk_level\n" +
+            "from scene_risk\n" +
+            "where scene_id = #{sceneId} order by create_time desc" )
+    List<SceneRiskPO> querySceneEvaluationRiskDetail(@Param("sceneId") String sceneId);
+
 }

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

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.css.simulation.resource.server.infra.db.mysql.mapper.SceneStandardsRegulationsMapper">
-    <select id="selectSceneIdsByEvaluation" resultType="java.lang.String">
-        select accident_id
-        from scene_accident
-        where is_deleted = '0'
-        and scene_name in
-        <foreach item="item" collection="list" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-    </select>
-
     <select id="selectSceneIdsByEvaluation" parameterType="api.common.pojo.po.scene.SceneComplexityPO"
             resultType="api.common.pojo.po.scene.SceneComplexityPO">
         SELECT