change csrecallconfig table

@@ -5,7 +5,6 @@
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="config_type" property="configType" jdbcType="VARCHAR"/>
         <result column="config_page" property="configPage" jdbcType="INTEGER"/>
-        <result column="config_status" property="configStatus" jdbcType="INTEGER"/>
         <result column="size" property="size" jdbcType="INTEGER"/>
         <result column="size_limit" property="sizeLimit" jdbcType="VARCHAR"/>
         <result column="interval" property="interval" jdbcType="INTEGER"/>
@@ -15,12 +14,12 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, config_type, config_page, config_status,`size`, size_limit, `interval`, interval_limit, description, update_time
+        id, config_type, config_page,`size`, size_limit, `interval`, interval_limit, description, update_time
     </sql>
 
     <insert id="insert" parameterType="com.yoho.search.dal.model.CsRecallConfigCommon" timeout="20000">
-        insert ignore into cs_recall_config_common (id,config_type, config_page,config_status, `size`, size_limit, `interval`, interval_limit, description)
-        values (#{id,jdbcType=INTEGER},#{configType,jdbcType=INTEGER}, #{configPage,jdbcType=INTEGER}, #{configStatus,jdbcType=INTEGER}, #{size,jdbcType=INTEGER},#{sizeLimit,jdbcType=INTEGER}, #{interval,jdbcType=INTEGER}, #{intervalLimit,jdbcType=INTEGER}, #{description,jdbcType=INTEGER})
+        insert ignore into cs_recall_config_common (id,config_type, config_page, `size`, size_limit, `interval`, interval_limit, description)
+        values (#{id,jdbcType=INTEGER},#{configType,jdbcType=INTEGER}, #{configPage,jdbcType=INTEGER}, #{size,jdbcType=INTEGER},#{sizeLimit,jdbcType=INTEGER}, #{interval,jdbcType=INTEGER}, #{intervalLimit,jdbcType=INTEGER}, #{description,jdbcType=INTEGER})
     </insert>
 
     <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.CsRecallConfigCommon" timeout="20000">
@@ -32,9 +31,6 @@
             <if test="configPage != null">
                 config_page = #{configPage,jdbcType=INTEGER},
             </if>
-            <if test="configStatus != null">
-                config_status = #{configStatus,jdbcType=INTEGER},
-            </if>
             <if test="size != null">
                 `size` = #{size,jdbcType=INTEGER},
             </if>

@@ -3,7 +3,8 @@
 <mapper namespace="com.yoho.search.dal.CsRecallConfigProductMapper">
     <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.CsRecallConfigProduct">
         <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="config_type" property="configType" jdbcType="INTEGER"/>
+        <result column="config_page" property="configPage" jdbcType="INTEGER"/>
+        <result column="config_type" property="configType" jdbcType="VARCHAR"/>
         <result column="config_type_id" property="configTypeId" jdbcType="INTEGER"/>
         <result column="config_status" property="configStatus" jdbcType="INTEGER"/>
         <result column="new_shelve" property="newShelve" jdbcType="INTEGER"/>
@@ -16,19 +17,22 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, config_type,config_type_id,config_status,new_shelve,promotion,reduce_price,ctr_value,heat_value,random,update_time
+        id, config_page, config_type,config_type_id,config_status,new_shelve,promotion,reduce_price,ctr_value,heat_value,random,update_time
     </sql>
 
     <insert id="insert" parameterType="com.yoho.search.dal.model.CsRecallConfigProduct" timeout="20000">
-        insert ignore into cs_recall_config_product (id,config_type, config_type_id,config_status,new_shelve,promotion,reduce_price,ctr_value,heat_value,random)
-        values (#{id,jdbcType=INTEGER},#{configType,jdbcType=INTEGER}, #{configTypeId,jdbcType=INTEGER}, #{configStatus,jdbcType=INTEGER}, #{newShelve,jdbcType=INTEGER},#{promotion,jdbcType=INTEGER}, #{reducePrice,jdbcType=INTEGER}, #{ctrValue,jdbcType=INTEGER}, #{heatValue,jdbcType=INTEGER}, #{random,jdbcType=INTEGER})
+        insert ignore into cs_recall_config_product (id,config_page,config_type, config_type_id,config_status,new_shelve,promotion,reduce_price,ctr_value,heat_value,random)
+        values (#{id,jdbcType=INTEGER},#{configPage,jdbcType=INTEGER},#{configType,jdbcType=VARCHAR}, #{configTypeId,jdbcType=INTEGER}, #{configStatus,jdbcType=INTEGER}, #{newShelve,jdbcType=INTEGER},#{promotion,jdbcType=INTEGER}, #{reducePrice,jdbcType=INTEGER}, #{ctrValue,jdbcType=INTEGER}, #{heatValue,jdbcType=INTEGER}, #{random,jdbcType=INTEGER})
     </insert>
 
     <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.CsRecallConfigProduct" timeout="20000">
         update cs_recall_config_product
         <set>
+            <if test="configPage != null">
+                config_page = #{configPage,jdbcType=INTEGER},
+            </if>
             <if test="configType != null">
-                config_type = #{configType,jdbcType=INTEGER},
+                config_type = #{configType,jdbcType=VARCHAR},
             </if>
             <if test="configTypeId != null">
                 config_type_id = #{configTypeId,jdbcType=INTEGER},

@@ -16,9 +16,6 @@
       "configPage": {
         "type": "integer"
       },
-      "configStatus": {
-        "type": "integer"
-      },
       "size": {
         "type": "integer"
       },

@@ -10,9 +10,12 @@
       "id": {
         "type": "integer"
       },
-      "configType": {
+      "configPage": {
         "type": "integer"
       },
+      "configType": {
+        "type": "keyword"
+      },
       "configTypeId": {
         "type": "integer"
       },