commit

api-common/src/main/java/api/common/pojo/param/scene/SceneAccidentParam.java

@@ -45,5 +45,17 @@ public class SceneAccidentParam extends PageVO implements Serializable {
     private String[] ids ; //回显数组
     private String[] allSceneNames ; //场景名集合
     private String share;
+    // 复杂度下限
+    private String minComplexity;
+    // 复杂度上限
+    private String maxComplexity;
+    // 危险度下限
+    private String minRisk;
+    // 危险度上限
+    private String maxRisk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 
 }

api-common/src/main/java/api/common/pojo/param/scene/SceneEvaluationForListParam.java

@@ -4,6 +4,7 @@ import api.common.pojo.common.PageVO;
 import lombok.*;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 查询各种场景的列表页时的场景评价传参
@@ -14,16 +15,18 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 public class SceneEvaluationForListParam extends PageVO implements Serializable {
+    // 场景 id 列表
+    private List<String> sceneIdList;
     // 复杂度下限
-    private Integer minComplexity;
+    private String minComplexity;
     // 复杂度上限
-    private Integer maxComplexity;
+    private String maxComplexity;
     // 危险度下限
-    private Integer minRisk;
+    private String minRisk;
     // 危险度上限
-    private Integer maxRisk;
+    private String maxRisk;
     // 复杂度等级
-    private Integer complexityLevel;
+    private String complexityLevel;
     // 危险度等级
-    private Integer riskLevel;
+    private String riskLevel;
 }

api-common/src/main/java/api/common/pojo/param/scene/SceneEvaluationScriptParam.java

@@ -0,0 +1,22 @@
+package api.common.pojo.param.scene;
+
+import lombok.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 场景评价规则
+ *
+ * @author lcy
+ */
+@EqualsAndHashCode()
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneEvaluationScriptParam implements Serializable {
+
+    // 场景评价类型列表
+    private List<String> sceneEvaluationType;
+}

api-common/src/main/java/api/common/pojo/param/scene/SceneGeneralTemplateParam.java

@@ -33,5 +33,17 @@ public class SceneGeneralTemplateParam extends PageVO implements Serializable {
 
     private List<String> fhNameList;// 用于批量删除的名称列表
     private String scenarioResume;//场景简述
+    // 复杂度下限
+    private String minComplexity;
+    // 复杂度上限
+    private String maxComplexity;
+    // 危险度下限
+    private String minRisk;
+    // 危险度上限
+    private String maxRisk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 
 }

api-common/src/main/java/api/common/pojo/param/scene/SceneNaturalNewParam.java

@@ -37,4 +37,16 @@ public class SceneNaturalNewParam extends PageVO implements Serializable {
     private String[] allSceneNames;         //场景名集合
     private String userId;                  //用户id
     private String share;
+    // 复杂度下限
+    private String minComplexity;
+    // 复杂度上限
+    private String maxComplexity;
+    // 危险度下限
+    private String minRisk;
+    // 危险度上限
+    private String maxRisk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 }

api-common/src/main/java/api/common/pojo/param/scene/SceneReferenceLibParam.java

@@ -39,17 +39,17 @@ public class SceneReferenceLibParam extends PageVO implements Serializable {
     // 场景描述
     private String sceneDescription;
     // 复杂度下限
-    private Integer minComplexity;
+    private String minComplexity;
     // 复杂度上限
-    private Integer maxComplexity;
+    private String maxComplexity;
     // 危险度下限
-    private Integer minRisk;
+    private String minRisk;
     // 危险度上限
-    private Integer maxRisk;
+    private String maxRisk;
     // 复杂度等级
-    private Integer complexityLevel;
+    private String complexityLevel;
     // 危险度等级
-    private Integer riskLevel;
+    private String riskLevel;
     // 标签
     private String label;
     // 供场景上传任务删除使用

api-common/src/main/java/api/common/pojo/param/scene/SceneReferenceLibSelectParam.java

@@ -39,17 +39,17 @@ public class SceneReferenceLibSelectParam extends PageVO implements Serializable
     // 场景描述
     private String sceneDescription;
     // 复杂度下限
-    private Integer minComplexity;
+    private String minComplexity;
     // 复杂度上限
-    private Integer maxComplexity;
+    private String maxComplexity;
     // 危险度下限
-    private Integer minRisk;
+    private String minRisk;
     // 危险度上限
-    private Integer maxRisk;
+    private String maxRisk;
     // 复杂度等级
-    private Integer complexityLevel;
+    private String complexityLevel;
     // 危险度等级
-    private Integer riskLevel;
+    private String riskLevel;
     // 标签
     private String label;
     // 是否联表查询(复杂度，危险度表)

api-common/src/main/java/api/common/pojo/param/scene/StandardsRegulationsParam.java

@@ -39,4 +39,16 @@ public class StandardsRegulationsParam extends PageVO implements Serializable {
     private String userId;
 
     private String[] allSceneNames; //场景名集合
+    // 复杂度下限
+    private String minComplexity;
+    // 复杂度上限
+    private String maxComplexity;
+    // 危险度下限
+    private String minRisk;
+    // 危险度上限
+    private String maxRisk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 }

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

@@ -21,10 +21,10 @@ public class SceneComplexityPO implements Serializable {
     private String ruleId;
     private String ruleName;
     private String taskId;
-    private Integer complexity;
-    private Integer complexityLevel;
+    private String complexity;
+    private String complexityLevel;
     // 复杂度下限
-    private Integer minComplexity;
+    private String minComplexity;
     // 复杂度上限
-    private Integer maxComplexity;
+    private String maxComplexity;
 }

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

@@ -3,6 +3,7 @@ package api.common.pojo.po.scene;
 import lombok.*;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 复杂度数据
@@ -20,8 +21,9 @@ public class SceneRiskPO implements Serializable {
     private String algorithmId;
     private String vehicleId;
     private String taskId;
-    private Integer risk;
-    private Integer riskLevel;
-    private Integer minRisk;
-    private Integer maxRisk;
+    private String risk;
+    private String riskLevel;
+    private String minRisk;
+    private String maxRisk;
+    private List<String> sceneIdList;
 }

api-common/src/main/java/api/common/pojo/vo/scene/SceneAccidentVO.java

@@ -29,5 +29,13 @@ public class SceneAccidentVO extends PageVO implements Serializable {
     private String sceneTime ; //场景时间
     private String sceneWeather ; //天气
     private String maxTime ; //该场景仿真最大时长
+    // 复杂度
+    private String complexity;
+    // 危险度
+    private String risk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 
 }

api-common/src/main/java/api/common/pojo/vo/scene/SceneComplexityVO.java

@@ -13,12 +13,12 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 public class SceneComplexityVO implements Serializable {
-    private String riskId;
+    private String complexityId;
     private String sceneId;
     private String sceneType;
     private String ruleId;
     private String taskId;
     private String ruleName;
-    private Integer complexity;
-    private Integer complexityLevel;
+    private String complexity;
+    private String complexityLevel;
 }

api-common/src/main/java/api/common/pojo/vo/scene/SceneNaturalVO.java

@@ -63,6 +63,13 @@ public class SceneNaturalVO extends PageVO implements Serializable {
 
     private String label;//标签
     private String maxTime ; //该场景仿真最大时长
-
+    // 复杂度
+    private String complexity;
+    // 危险度
+    private String risk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 
 }

api-common/src/main/java/api/common/pojo/vo/scene/SceneReferenceLibVO.java

@@ -45,5 +45,13 @@ public class SceneReferenceLibVO extends PageVO implements Serializable {
     private String videoPreview;
     // 该场景仿真最大时长
     private String maxTime;
+    // 复杂度
+    private String complexity;
+    // 危险度
+    private String risk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 
 }

api-common/src/main/java/api/common/pojo/vo/scene/StandardsRegulationsVO.java

@@ -24,4 +24,12 @@ public class StandardsRegulationsVO extends PageVO implements Serializable {
     private String videoPreview;//视频预览地址
     private String label;//标签
     private String maxTime ; //该场景仿真最大时长
+    // 复杂度
+    private String complexity;
+    // 危险度
+    private String risk;
+    // 复杂度等级
+    private String complexityLevel;
+    // 危险度等级
+    private String riskLevel;
 }

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

@@ -5,6 +5,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.scene.SceneEvaluationDetailParam;
 import api.common.pojo.param.scene.SceneEvaluationRuleParam;
+import api.common.pojo.param.scene.SceneEvaluationScriptParam;
 import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.po.scene.SceneComplexityPO;
 import api.common.pojo.po.scene.SceneEvaluationRulePO;
@@ -14,6 +15,7 @@ import api.common.pojo.vo.scene.SceneComplexityVO;
 import api.common.pojo.vo.scene.SceneEvaluationRuleVO;
 import api.common.pojo.vo.scene.SceneRiskVO;
 import api.common.pojo.vo.scene.ScoringRulesVO;
+import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.PythonUtil;
 import api.common.util.StringUtil;
@@ -30,6 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -216,17 +219,22 @@ public class ScoreRuleController {
     /**
      * 查询复杂度脚本
      */
-    @GetMapping("/querySceneComplexityScript")
-    public ResponseBodyVO<List<SceneEvaluationRuleVO>> querySceneComplexityScript() {
-        List<SceneEvaluationRulePO> list = sceneEvaluationRuleService.querySceneComplexityScript();
-        List<SceneEvaluationRuleVO> list1 = new ArrayList<>();
+    @PostMapping("/queryEvaluationScript")
+    public ResponseBodyVO<Map<String, List<SceneEvaluationRuleVO>>> queryEvaluationScript(@RequestBody SceneEvaluationScriptParam sceneEvaluationScriptParam) {
+        if (sceneEvaluationScriptParam.getSceneEvaluationType() == null || CollectionUtil.isEmpty(sceneEvaluationScriptParam.getSceneEvaluationType())) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "请输入脚本类型");
+        }
+        List<SceneEvaluationRulePO> list = sceneEvaluationRuleService.queryEvaluationScript(sceneEvaluationScriptParam);
+        Map<String, List<SceneEvaluationRuleVO>> stringSceneEvaluationRuleVOMap = new HashMap<>();
+
         // po 转 vo
         for (SceneEvaluationRulePO po : list) {
+            stringSceneEvaluationRuleVOMap.computeIfAbsent(po.getRuleType(), k -> new ArrayList<>());
             SceneEvaluationRuleVO vo = new SceneEvaluationRuleVO();
             BeanUtils.copyProperties(po, vo);
-            list1.add(vo);
+            stringSceneEvaluationRuleVOMap.get(po.getRuleType()).add(vo);
         }
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list1);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, stringSceneEvaluationRuleVOMap);
     }
 
     /**

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

@@ -227,6 +227,7 @@ public class SceneAccidentService {
         // 添加复杂度 危险度数据
         SceneEvaluationForListParam sceneEvaluationForListParam = new SceneEvaluationForListParam();
         BeanUtils.copyProperties(params, sceneEvaluationForListParam);
+        sceneEvaluationForListParam.setSceneIdList(list.stream().map(SceneAccidentPO::getAccidentId).collect(Collectors.toList()));
         SceneEvaluationOperatePO sceneEvaluationOperatePO = sceneEvaluationRuleService.getSceneEvaluationFirst(sceneEvaluationForListParam);
         Map<String, SceneComplexityPO> complexityPOMap = sceneEvaluationOperatePO.getSceneComplexityPOMap();
         Map<String, SceneRiskPO> riskPOMap = sceneEvaluationOperatePO.getSceneRiskPOMap();

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

@@ -5,6 +5,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.scene.SceneEvaluationDetailParam;
 import api.common.pojo.param.scene.SceneEvaluationForListParam;
 import api.common.pojo.param.scene.SceneEvaluationRuleParam;
+import api.common.pojo.param.scene.SceneEvaluationScriptParam;
 import api.common.pojo.po.scene.SceneComplexityPO;
 import api.common.pojo.po.scene.SceneEvaluationOperatePO;
 import api.common.pojo.po.scene.SceneEvaluationRulePO;
@@ -134,8 +135,8 @@ public class SceneEvaluationRuleService {
      * 查询复杂度脚本
      */
     @SneakyThrows
-    public List<SceneEvaluationRulePO> querySceneComplexityScript() {
-        return sceneEvaluationRuleMapper.querySceneComplexityScript();
+    public List<SceneEvaluationRulePO> queryEvaluationScript(SceneEvaluationScriptParam sceneEvaluationScriptParam) {
+        return sceneEvaluationRuleMapper.queryEvaluationScript(sceneEvaluationScriptParam);
     }
 
     /**
@@ -187,6 +188,7 @@ public class SceneEvaluationRuleService {
         sceneComplexityPO.setMinComplexity(param.getMinComplexity());
         sceneComplexityPO.setMaxComplexity(param.getMaxComplexity());
         sceneComplexityPO.setComplexityLevel(param.getComplexityLevel());
+        sceneComplexityPO.setSceneIdList(param.getSceneIdList());
         // 查询复杂度的符合条件的第一条数据
         List<SceneComplexityPO> sceneReferenceLibCSPOS = sceneComplexityMapper.selectSceneIdsByEvaluation(sceneComplexityPO);
         Map<String, SceneComplexityPO> complexityPOMap = sceneReferenceLibCSPOS.stream().collect(Collectors.toMap(SceneComplexityPO::getSceneId, Function.identity()));
@@ -194,6 +196,7 @@ public class SceneEvaluationRuleService {
         sceneRiskPO.setMaxRisk(param.getMaxRisk());
         sceneRiskPO.setMinRisk(param.getMinRisk());
         sceneRiskPO.setRiskLevel(param.getRiskLevel());
+        sceneRiskPO.setSceneIdList(param.getSceneIdList());
         // 查询复杂度的符合条件的第一条数据
         List<SceneRiskPO> sceneReferenceLibCRPOS = sceneRiskMapper.selectSceneIdsByEvaluation(sceneRiskPO);
         Map<String, SceneRiskPO> riskPOMap = sceneReferenceLibCRPOS.stream().collect(Collectors.toMap(SceneRiskPO::getSceneId, Function.identity()));

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

@@ -276,6 +276,7 @@ public class SceneGeneralTemplateService {
         // 添加复杂度 危险度数据
         SceneEvaluationForListParam sceneEvaluationForListParam = new SceneEvaluationForListParam();
         BeanUtils.copyProperties(po, sceneEvaluationForListParam);
+        sceneEvaluationForListParam.setSceneIdList(list.stream().map(SceneGeneralTemplatePO::getSceneId).collect(Collectors.toList()));
         SceneEvaluationOperatePO sceneEvaluationOperatePO = sceneEvaluationRuleService.getSceneEvaluationFirst(sceneEvaluationForListParam);
         Map<String, SceneComplexityPO> complexityPOMap = sceneEvaluationOperatePO.getSceneComplexityPOMap();
         Map<String, SceneRiskPO> riskPOMap = sceneEvaluationOperatePO.getSceneRiskPOMap();

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

@@ -305,6 +305,7 @@ public class SceneNaturalService {
         // 添加复杂度 危险度数据
         SceneEvaluationForListParam sceneEvaluationForListParam = new SceneEvaluationForListParam();
         BeanUtils.copyProperties(params, sceneEvaluationForListParam);
+        sceneEvaluationForListParam.setSceneIdList(list.stream().map(SceneNaturalPO::getNaturalId).collect(Collectors.toList()));
         SceneEvaluationOperatePO sceneEvaluationOperatePO = sceneEvaluationRuleService.getSceneEvaluationFirst(sceneEvaluationForListParam);
         Map<String, SceneComplexityPO> complexityPOMap = sceneEvaluationOperatePO.getSceneComplexityPOMap();
         Map<String, SceneRiskPO> riskPOMap = sceneEvaluationOperatePO.getSceneRiskPOMap();

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

@@ -125,6 +125,7 @@ public class SceneReferenceLibService {
 
         SceneEvaluationForListParam sceneEvaluationForListParam = new SceneEvaluationForListParam();
         BeanUtils.copyProperties(params, sceneEvaluationForListParam);
+        sceneEvaluationForListParam.setSceneIdList(sceneReferenceLibPOS.stream().map(SceneReferenceLibPO::getSceneId).collect(Collectors.toList()));
         SceneEvaluationOperatePO sceneEvaluationOperatePO = sceneEvaluationRuleService.getSceneEvaluationFirst(sceneEvaluationForListParam);
         Map<String, SceneComplexityPO> complexityPOMap = sceneEvaluationOperatePO.getSceneComplexityPOMap();
         Map<String, SceneRiskPO> riskPOMap = sceneEvaluationOperatePO.getSceneRiskPOMap();

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

@@ -147,6 +147,7 @@ public class SceneStandardsService {
         // 添加复杂度 危险度数据
         SceneEvaluationForListParam sceneEvaluationForListParam = new SceneEvaluationForListParam();
         BeanUtils.copyProperties(params, sceneEvaluationForListParam);
+        sceneEvaluationForListParam.setSceneIdList(list.stream().map(StandardsRegulationsPO::getRegulationsId).collect(Collectors.toList()));
         SceneEvaluationOperatePO sceneEvaluationOperatePO = sceneEvaluationRuleService.getSceneEvaluationFirst(sceneEvaluationForListParam);
         Map<String, SceneComplexityPO> complexityPOMap = sceneEvaluationOperatePO.getSceneComplexityPOMap();
         Map<String, SceneRiskPO> riskPOMap = sceneEvaluationOperatePO.getSceneRiskPOMap();

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

@@ -13,9 +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" )
+    @Select("select sc.scene_id, sc.scene_type,sc.rule_id ,ser.rule_name, sc.task_id ,sc.complexity, sc.complexity_level\n" +
+            "from scene_complexity sc LEFT JOIN scene_evaluation_rule ser  ON ser.rule_id = sc.rule_id \n" +
+            "where sc.scene_id = #{sceneId} order by sc.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/SceneEvaluationRuleMapper.java

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.server.infra.db.mysql.mapper;
 
 import api.common.pojo.param.scene.SceneEvaluationRuleParam;
+import api.common.pojo.param.scene.SceneEvaluationScriptParam;
 import api.common.pojo.po.scene.SceneEvaluationRulePO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -30,11 +31,7 @@ public interface SceneEvaluationRuleMapper {
             "</script>")
     int querySceneEvaluationRuleOnly(@Param("ruleName") String ruleName, @Param("ruleId") String ruleId);
 
-
-    @Select("select rule_id, rule_name, script_name\n" +
-            "from scene_evaluation_rule\n" +
-            "where is_deleted = '0' AND rule_type = '1'  \n")
-    List<SceneEvaluationRulePO> querySceneComplexityScript();
+    List<SceneEvaluationRulePO> queryEvaluationScript(SceneEvaluationScriptParam sceneEvaluationScriptParam);
 
     @Select("select rule_id, rule_name, rule_type,script_name, script_path\n" +
             "from scene_evaluation_rule\n" +

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

@@ -13,9 +13,10 @@ 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" )
+
+    @Select("select sr.scene_id, sr.scene_type,sr.rule_id ,ser.rule_name, sr.task_id ,sr.risk, sr.risk_level\n" +
+            "from scene_risk sr LEFT JOIN scene_evaluation_rule ser  ON ser.rule_id = sr.rule_id \n" +
+            "where sr.scene_id = #{sceneId} order by sr.create_time desc" )
     List<SceneRiskPO> querySceneEvaluationRiskDetail(@Param("sceneId") String sceneId);
 
 }

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

@@ -16,15 +16,15 @@
         simulation.scene_reference_lib srl
         LEFT JOIN scene_complexity sc ON srl.scene_id = sc.scene_id
         <where>
-            is_deleted = '0'
+            srl.is_deleted = '0'
             <if test="minComplexity != null and minComplexity != ''">
-                AND complexity >= #{minComplexity}
+                AND sc.complexity+0 >= #{minComplexity}
             </if>
             <if test="maxComplexity != null and maxComplexity != ''">
-                AND complexity &lt;=  #{maxComplexity}
+                AND sc.complexity+0 &lt;=  #{maxComplexity}
             </if>
             <if test="complexityLevel != null and complexityLevel != ''">
-                AND complexity_level >=  #{complexityLevel}
+                AND sc.complexity_level+0 >=  #{complexityLevel}
             </if>
             <if test="sceneIdList != null and sceneIdList.size()>0">
                 AND srl.scene_id IN
@@ -35,7 +35,7 @@
             </if>
         </where>
         ORDER BY
-        sc.create_time DESC
+        sc.create_time DESC LIMIT 1
         ) srlsc GROUP BY scene_id;
     </select>
 

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

@@ -73,5 +73,21 @@
         </where>
 
     </select>
-
+    <select id="queryEvaluationScript" parameterType="api.common.pojo.param.scene.SceneEvaluationScriptParam"
+            resultType="api.common.pojo.po.scene.SceneEvaluationRulePO">
+        select
+        rule_id,rule_name,rule_type,script_name, is_deleted
+        from simulation.scene_evaluation_rule
+        <where>
+            is_deleted = '0'
+            <if test="sceneEvaluationType != null and sceneEvaluationType.size()>0">
+                AND rule_type IN
+                <foreach collection="sceneEvaluationType" item="item" index="index"
+                         separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            order by modify_time desc
+        </where>
+    </select>
 </mapper>

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

@@ -9,22 +9,22 @@
         (
         SELECT
         srl.scene_id scene_id,
-        sc.complexity complexity,
-        sc.complexity_level complexity_level,
-        sc.create_time create_time
+        sr.risk risk,
+        sr.risk_level risk_level,
+        sr.create_time create_time
         FROM
         simulation.scene_reference_lib srl
-        LEFT JOIN scene_risk sc ON srl.scene_id = sc.scene_id
+        LEFT JOIN scene_risk sr ON srl.scene_id = sr.scene_id
         <where>
-            is_deleted = '0'
+            srl.is_deleted = '0'
             <if test="minRisk != null and minRisk != ''">
-                AND risk >= #{minRisk}
+                AND sr.risk+0 >= #{minRisk}
             </if>
             <if test="maxRisk != null and maxRisk != ''">
-                AND risk &lt;=  #{maxRisk}
+                AND sr.risk+0 &lt;=  #{maxRisk}
             </if>
             <if test="riskLevel != null and riskLevel != ''">
-                AND risk_level >=  #{riskLevel}
+                AND sr.risk_level+0 >=  #{riskLevel}
             </if>
             <if test="sceneIdList != null and sceneIdList.size()>0">
                 AND srl.scene_id IN
@@ -35,7 +35,7 @@
             </if>
         </where>
         ORDER BY
-        sc.create_time DESC
+        sr.create_time DESC LIMIT 1
         ) srlsc GROUP BY scene_id;
     </select>