Authored by hugufei

update csrecallconfigcommon.json

@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
4 <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.CsRecallConfigCommon"> 4 <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.CsRecallConfigCommon">
5 <id column="id" property="id" jdbcType="INTEGER"/> 5 <id column="id" property="id" jdbcType="INTEGER"/>
6 <result column="config_page" property="configPage" jdbcType="INTEGER"/> 6 <result column="config_page" property="configPage" jdbcType="INTEGER"/>
  7 + <result column="order_type" property="orderType" jdbcType="INTEGER"/>
  8 + <result column="ab_type" property="abType" jdbcType="INTEGER"/>
7 <result column="config_type" property="configType" jdbcType="VARCHAR"/> 9 <result column="config_type" property="configType" jdbcType="VARCHAR"/>
8 <result column="description" property="description" jdbcType="VARCHAR"/> 10 <result column="description" property="description" jdbcType="VARCHAR"/>
9 <result column="size" property="size" jdbcType="INTEGER"/> 11 <result column="size" property="size" jdbcType="INTEGER"/>
@@ -11,37 +13,38 @@ @@ -11,37 +13,38 @@
11 <result column="interval" property="interval" jdbcType="INTEGER"/> 13 <result column="interval" property="interval" jdbcType="INTEGER"/>
12 <result column="interval_limit" property="intervalLimit" jdbcType="VARCHAR"/> 14 <result column="interval_limit" property="intervalLimit" jdbcType="VARCHAR"/>
13 <result column="insert_order" property="insertOrder" jdbcType="INTEGER"/> 15 <result column="insert_order" property="insertOrder" jdbcType="INTEGER"/>
14 - <result column="ab_type" property="abType" jdbcType="INTEGER"/>  
15 <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/> 16 <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
16 </resultMap> 17 </resultMap>
17 18
18 <sql id="Base_Column_List"> 19 <sql id="Base_Column_List">
19 - id, config_page, config_type, description, `size`, size_limit, `interval`, interval_limit, insert_order, ab_type, update_time 20 + id, config_page, order_type, ab_type, config_type, description, `size`, size_limit, `interval`, interval_limit, insert_order , update_time
20 </sql> 21 </sql>
21 22
22 <insert id="insert" parameterType="com.yoho.search.dal.model.CsRecallConfigCommon" timeout="20000"> 23 <insert id="insert" parameterType="com.yoho.search.dal.model.CsRecallConfigCommon" timeout="20000">
23 insert ignore into cs_recall_config_common ( 24 insert ignore into cs_recall_config_common (
24 id, 25 id,
25 config_page, 26 config_page,
  27 + order_type,
  28 + ab_type,
26 config_type, 29 config_type,
27 description, 30 description,
28 `size`, 31 `size`,
29 size_limit, 32 size_limit,
30 `interval`, 33 `interval`,
31 interval_limit, 34 interval_limit,
32 - insert_order,  
33 - ab_type ) 35 + insert_order)
34 values ( 36 values (
35 #{id,jdbcType=INTEGER}, 37 #{id,jdbcType=INTEGER},
36 #{configPage,jdbcType=INTEGER}, 38 #{configPage,jdbcType=INTEGER},
  39 + #{orderType,jdbcType=INTEGER},
  40 + #{abType,jdbcType=INTEGER},
37 #{configType,jdbcType=VARCHAR}, 41 #{configType,jdbcType=VARCHAR},
38 #{description,jdbcType=VARCHAR}, 42 #{description,jdbcType=VARCHAR},
39 #{size,jdbcType=INTEGER}, 43 #{size,jdbcType=INTEGER},
40 #{sizeLimit,jdbcType=VARCHAR}, 44 #{sizeLimit,jdbcType=VARCHAR},
41 #{interval,jdbcType=INTEGER}, 45 #{interval,jdbcType=INTEGER},
42 #{intervalLimit,jdbcType=VARCHAR}, 46 #{intervalLimit,jdbcType=VARCHAR},
43 - #{insertOrder,jdbcType=INTEGER},  
44 - #{abType,jdbcType=INTEGER} 47 + #{insertOrder,jdbcType=INTEGER}
45 ) 48 )
46 </insert> 49 </insert>
47 50
@@ -51,6 +54,12 @@ @@ -51,6 +54,12 @@
51 <if test="configPage != null"> 54 <if test="configPage != null">
52 config_page = #{configPage,jdbcType=INTEGER}, 55 config_page = #{configPage,jdbcType=INTEGER},
53 </if> 56 </if>
  57 + <if test="orderType != null">
  58 + order_type = #{orderType,jdbcType=INTEGER},
  59 + </if>
  60 + <if test="abType != null">
  61 + ab_type = #{abType,jdbcType=INTEGER},
  62 + </if>
54 <if test="configType != null"> 63 <if test="configType != null">
55 config_type = #{configType,jdbcType=VARCHAR}, 64 config_type = #{configType,jdbcType=VARCHAR},
56 </if> 65 </if>
@@ -70,10 +79,7 @@ @@ -70,10 +79,7 @@
70 interval_limit = #{intervalLimit,jdbcType=VARCHAR}, 79 interval_limit = #{intervalLimit,jdbcType=VARCHAR},
71 </if> 80 </if>
72 <if test="insertOrder != null"> 81 <if test="insertOrder != null">
73 - insert_order = #{insertOrder,jdbcType=VARCHAR},  
74 - </if>  
75 - <if test="abType != null">  
76 - ab_type = #{abType,jdbcType=VARCHAR}, 82 + insert_order = #{insertOrder,jdbcType=INTEGER},
77 </if> 83 </if>
78 </set> 84 </set>
79 where id = #{id,jdbcType=INTEGER} 85 where id = #{id,jdbcType=INTEGER}
@@ -10,11 +10,17 @@ @@ -10,11 +10,17 @@
10 "id": { 10 "id": {
11 "type": "integer" 11 "type": "integer"
12 }, 12 },
  13 + "configPage": {
  14 + "type": "integer"
  15 + },
  16 + "orderType": {
  17 + "type": "integer"
  18 + },
13 "configType": { 19 "configType": {
14 "type": "keyword" 20 "type": "keyword"
15 }, 21 },
16 - "configPage": {  
17 - "type": "integer" 22 + "description": {
  23 + "type": "keyword"
18 }, 24 },
19 "size": { 25 "size": {
20 "type": "integer" 26 "type": "integer"
@@ -28,15 +34,9 @@ @@ -28,15 +34,9 @@
28 "intervalLimit": { 34 "intervalLimit": {
29 "type": "keyword" 35 "type": "keyword"
30 }, 36 },
31 - "description": {  
32 - "type": "keyword"  
33 - },  
34 "insertOrder": { 37 "insertOrder": {
35 "type": "integer" 38 "type": "integer"
36 }, 39 },
37 - "abType": {  
38 - "type": "integer"  
39 - },  
40 "updateTime": { 40 "updateTime": {
41 "type": "date" 41 "type": "date"
42 } 42 }