场景库模块代码

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

@@ -16,8 +16,10 @@ import java.io.Serializable;
 public class ScenePackageParam extends PageVO implements Serializable {
 
     private String packageId  ;//主键Id
+    private String packageCode  ;//测试包指标Id
     private String packageName ; //指标名称
     private String share ; //是否分析  1为分享
     public String yearMax;//结束时间
     public String yearMin;//开始时间
+    public String createUserId;//创建人Id
 }

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

@@ -16,6 +16,7 @@ import java.io.Serializable;
 public class ScoringRulesParam extends PageVO implements Serializable {
 
     private String rulesId  ;//打分规则Id
+    private String rulesCode  ;//打分规则code
     private String ruleName ; //规则名称
     private String ruleDescription ; //打分规则描述
     private String share ; //是否分析  1为分享

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

@@ -16,6 +16,7 @@ import java.sql.Timestamp;
 public class ScenePackagePO implements Serializable {
 
     private String packageId  ;//主键Id
+    private String packageCode  ;//测试包指标Id
     private String packageName ; //指标名称
     private String weight;//权重
     private String rulesName ; //规则名称

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

@@ -16,6 +16,7 @@ import java.sql.Timestamp;
 public class ScoringRulesPO implements Serializable {
 
     private String rulesId  ;//打分规则Id
+    private String rulesCode  ;//打分规则code
     private String ruleName ; //规则名称
     private String ruleDescription ; //打分规则描述
     private String ruleDetails;//打分规则详情

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

@@ -18,6 +18,7 @@ import java.util.List;
 public class ScenePackageNewVO  implements Serializable {
 
     private String packageId  ;//主键Id
+    private String packageCode  ;//测试包指标Id
     private String packageName ; //指标名称
     private String weight;//权重
     private Integer sceneNum;//场景数量

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

@@ -24,7 +24,7 @@ public class ScenePackageSublistVO implements Serializable {
     private String sceneTrafficIds;//关联交通事故场景ids
     private String sceneStatueIds;//关联标准法规ids
     private String sceneGeneralizationIds;//关联泛化场景ids
-    private Integer sceneNum;//场景数量
+    private Integer sceneNum=0;//场景数量
     private String parentId;//父节点id
     private String rootId;//根id
     private int packageLevel;//级别

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

@@ -18,6 +18,7 @@ public class ScenePackageVO extends PageVO implements Serializable {
 
     private String packageId  ;//主键Id
     private String packageName ; //指标名称
+    private String packageCode  ;//测试包指标Id
     private Integer sceneNum;//场景数量
     private String share ; //是否分析  1为分享
     /**

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

@@ -17,6 +17,7 @@ import java.sql.Timestamp;
 public class ScoringRulesVO extends PageVO implements Serializable {
 
     private String rulesId  ;//打分规则Id
+    private String rulesCode  ;//打分规则code
     private String ruleName ; //规则名称
     private String ruleDescription ; //打分规则描述
     private String share ; //是否分析  1为分享

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -49,11 +49,11 @@ public class ScenePackageController {
     @PostMapping("/saveScenePackage")
     @ResponseBody
     public ResponseBodyVO<String> saveScoringRules(@RequestBody ScenePackageNewParam parms) {
-        scenePackageService.saveScenePackage(parms);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+
+        return scenePackageService.saveScenePackage(parms);
     }
 
-    //修改打分规则
+    //修改
     @PostMapping("/updateScenePackage")
     @ResponseBody
     public ResponseBodyVO<String> updateScenePackage(@RequestBody ScenePackageNewParam params)  {
@@ -81,8 +81,8 @@ public class ScenePackageController {
         if(ObjectUtil.isNull(parms.getPackageId())){
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"参数PackageId不能为空，请检查");
         }
-         scenePackageService.instShareList(parms);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+
+        return scenePackageService.instShareList(parms);
     }
     //测试包删除
     @PostMapping("/deleteList")

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScoringRulesController.java

@@ -56,26 +56,26 @@ public class ScoringRulesController {
     //查唯一
     @PostMapping("/queryScoringRulesCount")
     @ResponseBody
-    public ResponseBodyVO<Integer> queryScoringRulesCount(@RequestBody ScoringRulesParam parms)  {
+    public ResponseBodyVO<List<ScoringRulesPO>> queryScoringRulesCount(@RequestBody ScoringRulesParam parms)  {
         if(ObjectUtil.isNull(parms.getRuleName())){
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"参数RulesName不能为空，请检查");
         }
-        Integer po=scoringRulesService.queryScoringRulesCount(parms);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,po);
+        List<ScoringRulesPO> list=scoringRulesService.queryScoringRulesByRuleName(parms);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,list);
 
     }
     //新增打分规则
     @PostMapping("/saveScoringRules")
     @ResponseBody
     public ResponseBodyVO<String> saveScoringRules(@RequestBody ScoringRulesPO parms) {
+        ScoringRulesParam vo=new ScoringRulesParam();
+        BeanUtils.copyProperties(parms,vo);
+        vo.setShare("0");
+        List<ScoringRulesPO> list=scoringRulesService.queryScoringRulesByRuleName(vo);
+        if(list!=null && list.size()>0){
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"规则名称ruleName已存在，请重新命名");
+        }
         if(ObjectUtil.isNull(parms.getRulesId())){
-            ScoringRulesParam vo=new ScoringRulesParam();
-            BeanUtils.copyProperties(parms,vo);
-            vo.setShare("0");
-            Integer po=scoringRulesService.queryScoringRulesCount(vo);
-            if(po>0){
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"规则名称ruleName已存在，请重新命名");
-            }
             scoringRulesService.saveScoringRules(parms);
         }else{
             scoringRulesService.updateScoringRules(parms);
@@ -92,6 +92,11 @@ public class ScoringRulesController {
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"参数RulesId不能为空，请检查");
         }
         ScoringRulesPO po=scoringRulesService.queryScoringRules(params);
+        params.setShare("1");
+        List<ScoringRulesPO> list=scoringRulesService.queryScoringRulesByRuleName(params);
+        if(list!=null && list.size()>0){
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"规则名称ruleName已存在，请重新命名");
+        }
         po.setShare("1");
         scoringRulesService.saveScoringRules(po);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageMapper.java

@@ -26,4 +26,7 @@ public interface ScenePackageMapper {
    //单独给查询一个测试包的列表用
    ScenePackageNewVO queryScenePackageBySublist(String packageId);
 
+   //测试包名查唯一
+   List<ScenePackageNewVO> queryByPackageName(ScenePackagePO params);
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageSublistMapper.java

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.scene.mapper;
 
 import api.common.pojo.po.scene.ScenePackageSublistPO;
+import api.common.pojo.vo.scene.ScenePackageNewVO;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,7 @@ public interface ScenePackageSublistMapper {
 
    List<ScenePackageSublistVO> queryScenePackageSublistList(ScenePackageSublistPO params);
 
+   //指标名查唯一
+   List<ScenePackageSublistVO> queryBySublistName(ScenePackageSublistPO params);
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScoringRulesMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 public interface ScoringRulesMapper {
 
    void saveScoringRules(ScoringRulesPO params);
-   int queryScoringRulesCount(ScoringRulesParam params);
+   List<ScoringRulesPO> queryScoringRulesByRuleName(ScoringRulesParam params);
 
    List<ScoringRulesPO> queryScoringRulesList(ScoringRulesParam params);
    ScoringRulesPO queryScoringRules(ScoringRulesParam params);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -1,8 +1,8 @@
 package com.css.simulation.resource.scene.service;
 
+import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.ScenePackageNewParam;
 import api.common.pojo.param.scene.ScenePackageParam;
-import api.common.pojo.param.scene.ScenePackageSublistParam;
 import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.vo.scene.ScenePackageNewVO;
@@ -40,25 +40,27 @@ public class ScenePackageService {
      * 测试包数据录入大保存：
      */
     @SneakyThrows
-    public void saveScenePackage(ScenePackageNewParam params){
+    public ResponseBodyVO<String> saveScenePackage(ScenePackageNewParam params){
         ScenePackagePO po=new ScenePackagePO();
         BeanUtils.copyProperties(params,po);
-        /*po.setPackageName(params.getPackageName());
-        po.setWeight(params.getWeight());
-        po.setShare(params.getShare());
-        po.setRemarks(params.getRemarks());*/
+        po.setCreateUserId(AuthUtil.getCurrentUserId());
+        po.setShare("0");
+        List<ScenePackageNewVO> listName=scenePackageMapper.queryByPackageName(po);
+        if(listName!=null && listName.size()>0){
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"测试包名称packName="+po.getPackageName()+"已存在，请重新命名");
+        }
         po.setCreateTime(TimeUtil.getNowForMysql());
         po.setModifyTime(TimeUtil.getNowForMysql());
-        po.setCreateUserId(AuthUtil.getCurrentUserId());
+        po.setPackageCode(StringUtil.getRandomCode());
         String uuId=StringUtil.getRandomUUID();
         po.setPackageId(uuId);
         po.setIsDeleted("0");
-        po.setShare("0");
         scenePackageMapper.saveScenePackage(po);
         List<ScenePackageSublistVO> list=params.getList();
         List<ScenePackageSublistPO>  poList=new ArrayList<>();
         List<ScenePackageSublistPO> treeList =instShareListTree(list,uuId,uuId,poList,"0");
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
     //查询测试包主表列表
     @SneakyThrows
@@ -146,23 +148,30 @@ public class ScenePackageService {
 
 //分享
     @SneakyThrows
-    public void instShareList(ScenePackageParam params){
+    public ResponseBodyVO<String> instShareList(ScenePackageParam params){
         //查询测试包主表
         ScenePackagePO scenePackagePO=scenePackageMapper.queryScenePackage(params);
         ScenePackagePO po=new ScenePackagePO();
+        po.setShare("1");
+
+        List<ScenePackageNewVO> listName=scenePackageMapper.queryByPackageName(po);
+        if(listName!=null && listName.size()>0){
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE,"公有列表名称packName="+po.getPackageName()+"的测试包已存在，请检查");
+        }
         BeanUtils.copyProperties(scenePackagePO,po);
         po.setCreateTime(TimeUtil.getNowForMysql());
         po.setModifyTime(TimeUtil.getNowForMysql());
         po.setCreateUserId(AuthUtil.getCurrentUserId());
+        po.setPackageCode(StringUtil.getRandomCode());
         String uuId=StringUtil.getRandomUUID();
         po.setPackageId(uuId);
         po.setIsDeleted("0");
-        po.setShare("1");
         scenePackageMapper.saveScenePackage(po);
         List<ScenePackageSublistPO>  poList=new ArrayList<>();
         List<ScenePackageSublistVO> listSublist =selectScenePackageSubListTree(null,true,params.getPackageId());
         List<ScenePackageSublistPO> treeList =instShareListTree(listSublist,uuId,uuId,poList,"1");
        scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
     /**
      * 根据级联结果转化为单级list
@@ -171,9 +180,11 @@ public class ScenePackageService {
      * @return
      */
     public List<ScenePackageSublistPO> instShareListTree(List<ScenePackageSublistVO> parentVoList,
-                                                                    String scenePackageId,String rootId,List<ScenePackageSublistPO>  poList,String share){
+                                                                    String scenePackageId,String rootId,List<ScenePackageSublistPO>  poList
+                                                                ,String share){
         {
             //获取子节点集合
+
                 for (int i=0;i< parentVoList.size() ;i++) {
                 ScenePackageSublistPO params=new ScenePackageSublistPO();
                 BeanUtils.copyProperties(parentVoList.get(i),params);
@@ -197,8 +208,13 @@ public class ScenePackageService {
                 i--;
             }
         }
+
         return poList;
     }
 
+    //测试包名查唯一
+    public List<ScenePackageNewVO> queryByPackageName(ScenePackagePO params){
+        return   scenePackageMapper.queryByPackageName(params);
+    }
 
 }

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

@@ -30,6 +30,7 @@ public class ScoringRulesService {
         params.setCreateTime(TimeUtil.getNowForMysql());
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setRulesId(StringUtil.getRandomUUID());
+        params.setRulesCode(StringUtil.getRandomCode());
         params.setCreateUserId(AuthUtil.getCurrentUserId());
         params.setIsDeleted("0");
         scoringRulesMapper.saveScoringRules(params);
@@ -48,8 +49,11 @@ public class ScoringRulesService {
         return Po;
     }
     @SneakyThrows
-    public   int queryScoringRulesCount(ScoringRulesParam params) {
-        return scoringRulesMapper.queryScoringRulesCount(params);
+    public  List<ScoringRulesPO> queryScoringRulesByRuleName(ScoringRulesParam params) {
+        if(params.getShare().equals("0")){
+            params.setCreateUserId(AuthUtil.getCurrentUserId());
+        }
+        return scoringRulesMapper.queryScoringRulesByRuleName(params);
     }
     @SneakyThrows
     public   void updateScoringRules(ScoringRulesPO params) {

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageMapper.xml

@@ -5,11 +5,11 @@
 
     <insert id="saveScenePackage" parameterType="api.common.pojo.po.scene.ScenePackagePO">
         insert into simulation.scene_package
-        (package_id,package_name,weight,
+        (package_id,package_code,package_name,weight,
         package_and_rules,scene_num,remarks,
         create_user_id,create_time,modify_user_id,modify_time,
          is_deleted,share)
-        values (#{packageId,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},
+        values (#{packageId,jdbcType=VARCHAR},#{packageCode,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{weight,jdbcType=VARCHAR},
         #{packageAndRules,jdbcType=VARCHAR},#{sceneNum},#{remarks,jdbcType=VARCHAR},
          #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
         #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR})
@@ -18,7 +18,7 @@
 
     <select id="queryScenePackageList" parameterType="api.common.pojo.param.scene.ScenePackageParam" resultType="api.common.pojo.po.scene.ScenePackagePO">
         select
-        a.package_id,a.package_name,a.weight,
+        a.package_id,a.package_name,a.weight,a.package_code,
         a.package_and_rules,a.scene_num,a.remarks,
         a.create_user_id,a.create_time,a.modify_user_id,a.modify_time,
         a.is_deleted,a.share
@@ -28,6 +28,9 @@
             <if test="packageId != null and packageId != ''">
                 and a.package_id  = #{packageId,jdbcType=VARCHAR}
             </if>
+            <if test="packageCode != null and packageCode != ''">
+                and a.package_code  = #{packageCode,jdbcType=VARCHAR}
+            </if>
             <if test="share != null and share != ''">
                 and a.share  = #{share,jdbcType=VARCHAR}
             </if>
@@ -37,6 +40,10 @@
             <if test="yearMax != null and yearMax != ''">
                 and #{yearMax,jdbcType=VARCHAR} &gt; a.CREATE_TIME and #{yearMin,jdbcType=VARCHAR} &lt; a.CREATE_TIME
             </if>
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            </if>
+
             order by a.create_time desc
         </where>
     </select>
@@ -44,7 +51,7 @@
 
     <select id="queryScenePackage" parameterType="api.common.pojo.param.scene.ScenePackageParam" resultType="api.common.pojo.po.scene.ScenePackagePO">
         select
-        a.package_id,a.package_name,a.weight,
+        a.package_id,a.package_name,a.package_code,a.weight,
         a.package_and_rules,a.scene_num,a.remarks,
         a.create_user_id,a.create_time,a.modify_user_id,a.modify_time,
         a.is_deleted,a.share
@@ -54,19 +61,28 @@
             <if test="packageId != null and packageId != ''">
                 and a.package_id  = #{packageId,jdbcType=VARCHAR}
             </if>
+            <if test="packageCode != null and packageCode != ''">
+                and a.package_code  = #{packageCode,jdbcType=VARCHAR}
+            </if>
             <if test="packageName != null and packageName != ''">
                 and a.package_name like CONCAT('%',#{packageName,jdbcType=VARCHAR},'%')
             </if>
             <if test="yearMax != null and yearMax != ''">
                 and #{yearMax,jdbcType=VARCHAR} &gt; a.CREATE_TIME and #{yearMin,jdbcType=VARCHAR} &lt; a.CREATE_TIME
             </if>
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            </if>
+            <if test="share != null and share != ''">
+                and share=#{share,jdbcType=VARCHAR}
+            </if>
             order by a.create_time desc
         </where>
     </select>
 
     <select id="queryScenePackageBySublist" parameterType="java.lang.String" resultType="api.common.pojo.vo.scene.ScenePackageNewVO">
         select
-        a.package_id ,a.package_name ,a.weight,
+        a.package_id ,a.package_name ,a.weight,a.package_code,
         a.scene_num,a.remarks
         from simulation.scene_package as a
         <where>
@@ -121,4 +137,27 @@
         </set>
         where package_id = #{packageId,jdbcType=VARCHAR}
     </update>
+
+
+    <select id="queryByPackageName" parameterType="api.common.pojo.po.scene.ScenePackagePO" resultType="api.common.pojo.vo.scene.ScenePackageNewVO">
+        select
+        package_id,package_name,package_code
+        from simulation.scene_package
+        <where>
+            is_deleted = '0'
+            <if test="packageId != null and packageId != ''">
+                and package_id  != #{packageId,jdbcType=VARCHAR}
+            </if>
+            <if test="packageName != null and packageName != ''">
+                and package_name =#{packageName,jdbcType=VARCHAR}
+            </if>
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            </if>
+            <if test="share != null and share != ''">
+                and share=#{share,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
+
 </mapper>

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageSublistMapper.xml

@@ -52,7 +52,9 @@
             <if test="sublistName != null and sublistName != ''">
                 and a.sublist_name  = #{sublistName,jdbcType=VARCHAR}
             </if>
-
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            </if>
             <if test="parentId != null and parentId != ''">
                 and a.parent_id = #{parentId}
             </if>
@@ -69,4 +71,25 @@
         set is_deleted='1'
         where root_id = #{rootId,jdbcType=VARCHAR}
     </update>
+
+    <select id="queryBySublistName" parameterType="api.common.pojo.po.scene.ScenePackageSublistPO" resultType="api.common.pojo.vo.scene.ScenePackageNewVO">
+        select sublist_id,sublist_name
+        from simulation.scene_package_sublist
+        <where>
+            is_deleted = '0'
+            <if test="sublistId != null and sublistId != ''">
+                and a.sublist_id  != #{sublistId,jdbcType=VARCHAR}
+            </if>
+            <if test="sublistName != null and sublistName != ''">
+                and a.sublist_name  = #{sublistName,jdbcType=VARCHAR}
+            </if>
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            </if>
+            <if test="share != null and share != ''">
+                and share=#{share,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
+
 </mapper>

simulation-resource-server/src/main/resources/mapper/scene/ScoringRulesMapper.xml

@@ -4,10 +4,10 @@
 
     <insert id="saveScoringRules" parameterType="api.common.pojo.po.scene.ScoringRulesPO">
         insert into simulation.scoring_rules
-        (rules_id,rule_name,rule_description,rule_details,
+        (rules_id,rules_code,rule_name,rule_description,rule_details,
         create_user_id,create_time,modify_user_id,modify_time,
          is_deleted,share)
-        values (#{rulesId,jdbcType=VARCHAR},#{ruleName,jdbcType=VARCHAR},#{ruleDescription,jdbcType=VARCHAR},#{ruleDetails},
+        values (#{rulesId,jdbcType=VARCHAR},#{rulesCode,jdbcType=VARCHAR},#{ruleName,jdbcType=VARCHAR},#{ruleDescription,jdbcType=VARCHAR},#{ruleDetails},
          #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
         #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR})
     </insert>
@@ -15,7 +15,7 @@
 
     <select id="queryScoringRulesList" parameterType="api.common.pojo.param.scene.ScoringRulesParam" resultType="api.common.pojo.po.scene.ScoringRulesPO">
         select
-        rules_id,rule_name,rule_description,rule_details,
+        rules_id,rules_code,rule_name,rule_description,rule_details,
         create_user_id,create_time,modify_user_id,modify_time,
         is_deleted,share
         from simulation.scoring_rules
@@ -24,6 +24,9 @@
             <if test="rulesId != null and rulesId != ''">
                 and rules_id  = #{rulesId,jdbcType=VARCHAR}
             </if>
+            <if test="rulesCode != null and rulesCode != ''">
+                and rules_code  = #{rulesCode,jdbcType=VARCHAR}
+            </if>
             <if test="share != null and share!=''">
                and share = #{share,jdbcType=VARCHAR}
             </if>
@@ -60,11 +63,14 @@
         </where>
     </select>
 
-    <select id="queryScoringRulesCount" parameterType="api.common.pojo.param.scene.ScoringRulesParam" resultType="java.lang.Integer">
-        select  count(rules_id)
+    <select id="queryScoringRulesByRuleName" parameterType="api.common.pojo.param.scene.ScoringRulesParam" resultType="api.common.pojo.po.scene.ScoringRulesPO">
+        select   rules_id,rule_name
         from simulation.scoring_rules
         <where>
             is_deleted = '0'
+            <if test="rulesId != null and rulesId != ''">
+                and rules_id != #{rulesId}
+            </if>
             <if test="ruleName != null and ruleName != ''">
                 and rule_name =#{ruleName}
             </if>