规则场景添加一个字段

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/RuleClassifyDTO.java

@@ -19,7 +19,7 @@ public class RuleClassifyDTO implements Serializable{
     private Integer ruleId;
 
     /**
-     * 规则/分类/场景名称（场景名称是冗余数据）
+     * 分类
      */
     private String ruleName;
 
@@ -29,12 +29,12 @@ public class RuleClassifyDTO implements Serializable{
     private String classifyIcon;
 
     /**
-     * 分类/场景描述
+     * 分类描述
      */
     private String ruleDesc;
 
     /**
-     * 分类/场景备注
+     * 分类备注
      */
     private String remark;
 

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/RuleClassifySceneDTO.java

@@ -19,21 +19,26 @@ public class RuleClassifySceneDTO implements Serializable{
     private Integer ruleId;
 
     /**
-     * 规则/分类/场景名称（场景名称是冗余数据）
+     * 场景名称（场景名称是冗余数据）
      */
     private String ruleName;
 
     /**
-     * 分类/场景描述
+     * 场景描述
      */
     private String ruleDesc;
 
     /**
-     * 分类/场景备注
+     * 场景备注
      */
     private String remark;
 
     /**
+     * 场景手动输入名称
+     */
+    private String marketName;
+
+    /**
      * 营销场景ID/code
      */
     private String marketScene;
@@ -180,4 +185,13 @@ public class RuleClassifySceneDTO implements Serializable{
         this.updateTime = updateTime;
         return this;
     }
+
+    public String getMarketName() {
+        return marketName;
+    }
+
+    public RuleClassifySceneDTO setMarketName(String marketName) {
+        this.marketName = marketName;
+        return this;
+    }
 }

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/RuleClassifySceneListDTO.java

@@ -32,6 +32,11 @@ public class RuleClassifySceneListDTO implements Serializable{
     private String remark;
 
     /**
+     * 场景手动输入名称
+     */
+    private String marketName;
+
+    /**
      * 营销场景code
      */
     private String marketScene;
@@ -113,4 +118,13 @@ public class RuleClassifySceneListDTO implements Serializable{
         this.select = select;
         return this;
     }
+
+    public String getMarketName() {
+        return marketName;
+    }
+
+    public RuleClassifySceneListDTO setMarketName(String marketName) {
+        this.marketName = marketName;
+        return this;
+    }
 }

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/rule/RuleDTO.java

@@ -19,7 +19,7 @@ public class RuleDTO implements Serializable{
     private Integer ruleId;
 
     /**
-     * 规则/分类/场景名称（场景名称是冗余数据）
+     * 规则名称
      */
     private String ruleName;
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabConfigRule.java

@@ -42,6 +42,11 @@ public class TabConfigRule {
     private String remark;
 
     /**
+     * 场景手动输入名称
+     */
+    private String marketName;
+
+    /**
      * 营销场景ID/code
      */
     private String marketScene;
@@ -215,4 +220,13 @@ public class TabConfigRule {
         this.updateTime = updateTime;
         return this;
     }
+
+    public String getMarketName() {
+        return marketName;
+    }
+
+    public TabConfigRule setMarketName(String marketName) {
+        this.marketName = marketName;
+        return this;
+    }
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleApiServiceImpl.java

@@ -306,10 +306,11 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
                 if (CollectionUtils.isNotEmpty(sceneList)) {
                     for (TabConfigRule scene : sceneList) {
                         //新增场景
-                        Integer sceneId = configRuleService.saveRuleClassifyScene(new RuleClassifySceneDTO()
-                                .setParentRuleId(classifyId).setMarketObject(scene.getMarketObject())
-                                .setMarketScene(scene.getMarketScene()).setRemark(scene.getRemark())
-                                .setRuleDesc(scene.getRuleDesc()).setRuleLevel(3).setRuleName(scene.getRuleName()));
+                        Integer sceneId = configRuleService
+                                .saveRuleClassifyScene(new RuleClassifySceneDTO().setParentRuleId(classifyId)
+                                        .setMarketObject(scene.getMarketObject()).setMarketScene(scene.getMarketScene())
+                                        .setRemark(scene.getRemark()).setRuleDesc(scene.getRuleDesc()).setRuleLevel(3)
+                                        .setRuleName(scene.getRuleName()).setMarketName(scene.getMarketName()));
                         //更新操作ID链数据
                         configRuleService.update(
                                 new TabConfigRule().setRuleId(sceneId).setRuleChain(classifyChain + sceneId + "_"));
@@ -379,7 +380,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
                     RuleClassifySceneListDTO scene = new RuleClassifySceneListDTO()
                             .setMarketScene(rule.getMarketScene()).setMarketObject(rule.getMarketObject())
                             .setRemark(rule.getRemark()).setRuleDesc(rule.getRuleDesc()).setRuleId(rule.getRuleId())
-                            .setRuleName(rule.getRuleName()).setSelect(select);
+                            .setRuleName(rule.getRuleName()).setSelect(select).setMarketName(rule.getMarketName());
                     //场景
                     String classifyStr = rule.getParentRuleId().toString();
                     List<RuleClassifySceneListDTO> temp;
@@ -491,7 +492,8 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
                             for (RuleClassifyListDTO classifyListDTO : classifyList) {
                                 if (classifyListDTO.getRuleId().intValue() == ruleClassifyId.intValue()) {
                                     if (!classifyListDTO.getSelect()) {
-                                        return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，商户规则未配置该分类");
+                                        return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
+                                                "分类ID错误，商户规则未配置该分类");
                                     }
                                     //勾选中的，即配置可用的
                                     List<RuleClassifySceneListDTO> temp = classifyListDTO.getRuleClassifySceneList();
@@ -617,6 +619,9 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，分类不存在");
         }
+        if (StringUtils.isBlank(dto.getMarketName())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "手动输入名称不能为空");
+        }
         if (record.getRuleLevel() != 2) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，不是分类类型");
         }

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleMapper.xml

@@ -9,6 +9,7 @@
     <result column="classify_icon" jdbcType="VARCHAR" property="classifyIcon" />
     <result column="rule_desc" jdbcType="VARCHAR" property="ruleDesc" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="market_name" jdbcType="VARCHAR" property="marketName" />
     <result column="market_scene" jdbcType="VARCHAR" property="marketScene" />
     <result column="market_object" jdbcType="INTEGER" property="marketObject" />
     <result column="parent_rule_id" jdbcType="INTEGER" property="parentRuleId" />
@@ -19,12 +20,12 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    rule_id, rule_name, app_name, app_code, classify_icon, rule_desc, remark, market_scene, market_object,
+    rule_id, rule_name, app_name, app_code, classify_icon, rule_desc, remark, market_name, market_scene, market_object,
     parent_rule_id, rule_level, rule_chain, status, create_time, update_time
   </sql>
   <sql id="Base_Column_List_alias">
     ${alias}.rule_id, ${alias}.rule_name, ${alias}.app_name, ${alias}.app_code, ${alias}.classify_icon,
-    ${alias}.rule_desc, ${alias}.remark, ${alias}.market_scene, ${alias}.market_object,
+    ${alias}.rule_desc, ${alias}.remark, ${alias}.market_name, ${alias}.market_scene, ${alias}.market_object,
     ${alias}.parent_rule_id, ${alias}.rule_level, ${alias}.rule_chain, ${alias}.status, ${alias}.create_time, ${alias}.update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -40,13 +41,13 @@
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabConfigRule">
     insert into tab_config_rule (rule_id, rule_name, app_name,
       app_code, classify_icon, rule_desc,
-      remark, market_scene, market_object, 
+      remark, market_name, market_scene, market_object,
       parent_rule_id, rule_level, rule_chain, 
       status, create_time, update_time
       )
     values (#{ruleId,jdbcType=INTEGER}, #{ruleName,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR},
       #{appCode,jdbcType=VARCHAR}, #{classifyIcon,jdbcType=VARCHAR}, #{ruleDesc,jdbcType=VARCHAR},
-      #{remark,jdbcType=VARCHAR}, #{marketScene,jdbcType=VARCHAR}, #{marketObject,jdbcType=INTEGER}, 
+      #{remark,jdbcType=VARCHAR}, #{marketName,jdbcType=VARCHAR}, #{marketScene,jdbcType=VARCHAR}, #{marketObject,jdbcType=INTEGER},
       #{parentRuleId,jdbcType=INTEGER}, #{ruleLevel,jdbcType=INTEGER}, #{ruleChain,jdbcType=VARCHAR}, 
       #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
@@ -75,6 +76,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="marketName != null">
+        market_name,
+      </if>
       <if test="marketScene != null">
         market_scene,
       </if>
@@ -122,6 +126,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="marketName != null">
+        #{marketName,jdbcType=VARCHAR},
+      </if>
       <if test="marketScene != null">
         #{marketScene,jdbcType=VARCHAR},
       </if>
@@ -169,6 +176,9 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="marketName != null">
+        market_name = #{marketName,jdbcType=VARCHAR},
+      </if>
       <if test="marketScene != null">
         market_scene = #{marketScene,jdbcType=VARCHAR},
       </if>
@@ -204,6 +214,7 @@
       classify_icon = #{classifyIcon,jdbcType=VARCHAR},
       rule_desc = #{ruleDesc,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
+      market_name = #{marketName,jdbcType=VARCHAR},
       market_scene = #{marketScene,jdbcType=VARCHAR},
       market_object = #{marketObject,jdbcType=INTEGER},
       parent_rule_id = #{parentRuleId,jdbcType=INTEGER},

gic-platform-operation-web/src/main/java/com/gic/operation/web/vo/configrule/RuleClassifySceneVO.java

@@ -25,6 +25,11 @@ public class RuleClassifySceneVO implements Serializable{
     private String remark;
 
     /**
+     * 场景手动输入名称
+     */
+    private String marketName;
+
+    /**
      * 营销场景ID/code
      */
     private String marketScene;
@@ -87,4 +92,13 @@ public class RuleClassifySceneVO implements Serializable{
         this.marketObject = marketObject;
         return this;
     }
+
+    public String getMarketName() {
+        return marketName;
+    }
+
+    public RuleClassifySceneVO setMarketName(String marketName) {
+        this.marketName = marketName;
+        return this;
+    }
 }