平台规则详情接口添加

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

@@ -18,7 +18,7 @@ public class ConfigRuleDTO implements Serializable{
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 规则类型:应用名称
@@ -38,7 +38,7 @@ public class ConfigRuleDTO implements Serializable{
     /**
      * 分类/场景描述
      */
-    private String desc;
+    private String ruleDesc;
 
     /**
      * 分类/场景备注

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

@@ -24,7 +24,7 @@ public class RuleClassifyDTO implements Serializable{
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 分类类型:icon
@@ -34,7 +34,7 @@ public class RuleClassifyDTO implements Serializable{
     /**
      * 分类/场景描述
      */
-    private String desc;
+    private String ruleDesc;
 
     /**
      * 分类/场景备注

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

@@ -24,12 +24,12 @@ public class RuleClassifySceneDTO implements Serializable{
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 分类/场景描述
      */
-    private String desc;
+    private String ruleDesc;
 
     /**
      * 分类/场景备注

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

@@ -24,7 +24,7 @@ public class RuleDTO implements Serializable{
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 规则类型:应用名称

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

@@ -19,7 +19,7 @@ public class TabConfigRule {
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 规则类型:应用名称
@@ -39,7 +39,7 @@ public class TabConfigRule {
     /**
      * 分类/场景描述
      */
-    private String desc;
+    private String ruleDesc;
 
     /**
      * 分类/场景备注

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

@@ -3,11 +3,11 @@
 <mapper namespace="com.gic.enterprise.dao.mapper.TabConfigRuleMapper">
   <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabConfigRule">
     <id column="rule_id" jdbcType="INTEGER" property="ruleId" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="name" jdbcType="VARCHAR" property="ruleName" />
     <result column="app_name" jdbcType="VARCHAR" property="appName" />
     <result column="app_code" jdbcType="VARCHAR" property="appCode" />
     <result column="classify_icon" jdbcType="VARCHAR" property="classifyIcon" />
-    <result column="desc" jdbcType="VARCHAR" property="desc" />
+    <result column="desc" jdbcType="VARCHAR" property="ruleDesc" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="market_scene" jdbcType="VARCHAR" property="marketScene" />
     <result column="market_object" jdbcType="INTEGER" property="marketObject" />
@@ -19,7 +19,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    rule_id, name, app_name, app_code, classify_icon, desc, remark, market_scene, market_object, 
+    rule_id, rule_name, app_name, app_code, classify_icon, rule_desc, remark, market_scene, market_object,
     parent_rule_id, rule_level, rule_chain, status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -33,14 +33,14 @@
     where rule_id = #{ruleId,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabConfigRule">
-    insert into tab_config_rule (rule_id, name, app_name, 
-      app_code, classify_icon, desc, 
+    insert into tab_config_rule (rule_id, rule_name, app_name,
+      app_code, classify_icon, rule_desc,
       remark, market_scene, market_object, 
       parent_rule_id, rule_level, rule_chain, 
       status, create_time, update_time
       )
-    values (#{ruleId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, 
-      #{appCode,jdbcType=VARCHAR}, #{classifyIcon,jdbcType=VARCHAR}, #{desc,jdbcType=VARCHAR}, 
+    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}, 
       #{parentRuleId,jdbcType=INTEGER}, #{ruleLevel,jdbcType=INTEGER}, #{ruleChain,jdbcType=VARCHAR}, 
       #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
@@ -52,8 +52,8 @@
       <if test="ruleId != null">
         rule_id,
       </if>
-      <if test="name != null">
-        name,
+      <if test="ruleName != null">
+        rule_name,
       </if>
       <if test="appName != null">
         app_name,
@@ -64,8 +64,8 @@
       <if test="classifyIcon != null">
         classify_icon,
       </if>
-      <if test="desc != null">
-        desc,
+      <if test="ruleDesc != null">
+        rule_desc,
       </if>
       <if test="remark != null">
         remark,
@@ -99,8 +99,8 @@
       <if test="ruleId != null">
         #{ruleId,jdbcType=INTEGER},
       </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
+      <if test="ruleName != null">
+        #{ruleName,jdbcType=VARCHAR},
       </if>
       <if test="appName != null">
         #{appName,jdbcType=VARCHAR},
@@ -111,8 +111,8 @@
       <if test="classifyIcon != null">
         #{classifyIcon,jdbcType=VARCHAR},
       </if>
-      <if test="desc != null">
-        #{desc,jdbcType=VARCHAR},
+      <if test="ruleDesc != null">
+        #{ruleDesc,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
@@ -146,8 +146,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabConfigRule">
     update tab_config_rule
     <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
+      <if test="ruleName != null">
+        rule_name = #{ruleName,jdbcType=VARCHAR},
       </if>
       <if test="appName != null">
         app_name = #{appName,jdbcType=VARCHAR},
@@ -158,8 +158,8 @@
       <if test="classifyIcon != null">
         classify_icon = #{classifyIcon,jdbcType=VARCHAR},
       </if>
-      <if test="desc != null">
-        desc = #{desc,jdbcType=VARCHAR},
+      <if test="ruleDesc != null">
+        rule_desc = #{ruleDesc,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
@@ -193,11 +193,11 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabConfigRule">
     update tab_config_rule
-    set name = #{name,jdbcType=VARCHAR},
+    set rule_name = #{ruleName,jdbcType=VARCHAR},
       app_name = #{appName,jdbcType=VARCHAR},
       app_code = #{appCode,jdbcType=VARCHAR},
       classify_icon = #{classifyIcon,jdbcType=VARCHAR},
-      desc = #{desc,jdbcType=VARCHAR},
+      rule_desc = #{ruleDesc,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       market_scene = #{marketScene,jdbcType=VARCHAR},
       market_object = #{marketObject,jdbcType=INTEGER},
@@ -214,7 +214,7 @@
     select count(1) from tab_config_rule
     where status = 1
     and rule_level  = #{ruleLevel}
-    and name = #{name}
+    and rule_name = #{name}
     <if test="ruleLevel == 1">
       <if test="ruleId != null">
         and rule_id &lt;&gt; #{ruleId}
@@ -237,7 +237,7 @@
       and parent_rule_id = #{ruleId}
     </if>
     <if test="search != null and search != '' ">
-      and ( name like concat('%', #{search}, '%') )
+      and ( rule_name like concat('%', #{search}, '%') )
     </if>
     order by create_time desc
   </select>

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

@@ -15,12 +15,12 @@ public class RuleClassifySceneVO implements Serializable{
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 分类/场景描述
      */
-    private String desc;
+    private String ruleDesc;
 
     /**
      * 分类/场景备注

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

@@ -15,7 +15,7 @@ public class RuleClassifyVO implements Serializable{
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 分类类型:icon
@@ -25,7 +25,7 @@ public class RuleClassifyVO implements Serializable{
     /**
      * 分类/场景描述
      */
-    private String desc;
+    private String ruleDesc;
 
     /**
      * 分类/场景备注

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

@@ -14,7 +14,7 @@ public class RuleVO implements Serializable{
     /**
      * 规则/分类/场景名称（场景名称是冗余数据）
      */
-    private String name;
+    private String ruleName;
 
     /**
      * 规则类型:应用名称