commit

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

@@ -208,9 +208,8 @@ public class ScoreRuleController {
      * 查询复杂度脚本
      */
     @PostMapping("/querySceneComplexityScript")
-    public ResponseBodyVO<List<SceneEvaluationRuleVO>> querySceneComplexityScript(@RequestBody ScoringRulesParam params) {
-//        List<ScoringRulesPO> list = scoringRulesService.querySceneEvaluationRuleList(params);
-        List<SceneEvaluationRulePO> list = new ArrayList<>();
+    public ResponseBodyVO<List<SceneEvaluationRuleVO>> querySceneComplexityScript() {
+        List<SceneEvaluationRulePO> list = scoringRulesService.querySceneComplexityScript();
         List<SceneEvaluationRuleVO> list1 = new ArrayList<>();
         //po转vo
         for (SceneEvaluationRulePO po : list) {
@@ -230,7 +229,7 @@ public class ScoreRuleController {
         if (!DictConstants.ROLE_CODE_ADMIN.equals(roleCode) && !DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "非管理员禁止删除");
         }
-//        scoringRulesService.deleteSceneEvaluationRule(params);
+        scoringRulesService.deleteSceneEvaluationRule(params);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 

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

@@ -222,6 +222,18 @@ public class ScoringRulesService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
+    @SneakyThrows
+    public void deleteSceneEvaluationRule(SceneEvaluationRulePO params) {
+        params.setIsDeleted("1");
+        params.setModifyTime(TimeUtil.getNowForMysql());
+        params.setModifyUserId(AuthUtil.getCurrentUserId());
+//        scoringRulesMapper.updateScoringRules(params);
+        //同步把使用该评分规则的测试包设为禁用
+//        scenePackageMapper.updateIsUnavailable3(params);
+        LogUtil.delete();
+    }
+
+
     /**
      * 查询场景评价规则列表
      */
@@ -230,6 +242,14 @@ public class ScoringRulesService {
         return sceneEvaluationRuleMapper.querySceneEvaluationRuleList(params);
     }
 
+    /**
+     * 查询复杂度脚本
+     */
+    @SneakyThrows
+    public List<SceneEvaluationRulePO> querySceneComplexityScript() {
+        return sceneEvaluationRuleMapper.querySceneComplexityScript();
+    }
+
 
     @SneakyThrows
     public void saveSceneEvaluationRule(SceneEvaluationRulePO params) {

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

@@ -30,4 +30,10 @@ 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 = '1' AND rule_type = '1'  \n")
+    List<SceneEvaluationRulePO> querySceneComplexityScript();
+
 }