评分规则个人私有唯一

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

@@ -82,7 +82,7 @@ public class ScoringRulesController {
         //1 检查是否存在同名平分规则
         ScoringRulesPO tmPo = scoringRulesService.queryScoringRulesByRuleName(vo);
         if (ObjectUtil.isNotNull(tmPo)) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称 ruleName 已存在，请重新命名。");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则 " + tmPo.getRuleName() + " 已存在，请重新命名。");
         }
         //2 校验 python 语法错误
         String pylint = PythonUtil.pylint(scoringRulesPO.getRuleDetails(),

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

@@ -3,7 +3,9 @@ package com.css.simulation.resource.scene.mapper;
 import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.po.scene.ScoringRulesPO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
+
 import java.util.List;
 
 
@@ -15,6 +17,8 @@ public interface ScoringRulesMapper {
 
     ScoringRulesPO queryScoringRulesByRuleName(ScoringRulesParam params);
 
+    ScoringRulesPO querySelfOnly(@Param("ruleName")String ruleName,@Param("createUserId")String createUserId);
+
     List<ScoringRulesPO> queryScoringRulesList(ScoringRulesParam params);
     Integer queryCsbById(ScoringRulesParam params);
     ScoringRulesPO queryScoringRules(ScoringRulesParam params);

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

@@ -54,7 +54,7 @@ public class ScenePackageService {
             // 个人私有唯一
             ScenePackageNewVO scenePackageNewVO = scenePackageMapper.querySelfOnly(vo.getSublistName(), AuthUtil.getCurrentUserId());
             if (ObjectUtil.isNotNull(scenePackageNewVO)) {
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "私有测试包 " + po.getPackageName() + " 已存在。");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "私有测试包 " + po.getPackageName() + " 已存在，请重新命名。");
             }
             po.setWeight(vo.getWeight());
             po.setRemarks(vo.getRemarks());

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

@@ -68,9 +68,6 @@ public class ScoringRulesService {
 
     @SneakyThrows
     public ScoringRulesPO queryScoringRulesByRuleName(ScoringRulesParam params) {
-   /*     if (params.getShare().equals("0")) {
-            params.setCreateUserId(AuthUtil.getCurrentUserId());
-        }*/
         return scoringRulesMapper.queryScoringRulesByRuleName(params);
     }
 

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

@@ -4,12 +4,13 @@
 
     <insert id="saveScoringRules" parameterType="api.common.pojo.po.scene.ScoringRulesPO">
         insert into simulation.scoring_rules
-        (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},#{rulesCode,jdbcType=VARCHAR},#{ruleName,jdbcType=VARCHAR},#{ruleDescription,jdbcType=VARCHAR},#{ruleDetails},
-         #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
-        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR})
+        (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}, #{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>
 
 
@@ -83,10 +84,19 @@
             <if test="share != null and share != ''">
                 and share=#{share,jdbcType=VARCHAR}
             </if>
-
         </where>
     </select>
 
+    <select id="querySelfOnly" 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'
+          and share = '0'
+          and rule_name = #{ruleName}
+          and create_user_id = #{createUserId}
+    </select>
+
 
     <update id="updateScoringRules" parameterType="api.common.pojo.po.scene.ScoringRulesPO">
         update simulation.scoring_rules
@@ -138,15 +148,12 @@
     </update>
 
 
-
     <select id="queryCsbById" parameterType="api.common.pojo.param.scene.ScoringRulesParam"
             resultType="java.lang.Integer">
-        select
-        COUNT(sublist_id)
+        select COUNT(sublist_id)
         from simulation.scene_package_sublist
-        where
-            is_deleted = '0'
-                and package_and_rules = #{rulesId,jdbcType=VARCHAR}
+        where is_deleted = '0'
+          and package_and_rules = #{rulesId,jdbcType=VARCHAR}
     </select>
 
 </mapper>