yoho-search / yoho-search-consumer · Commits

Go to a project

Authored by 胡古飞
Commit 604d25839862ee15131b4bcb906fb5ba975a8a5d 2 parents d4cdc1f7 35460161

Merge branch 'master' into 5.6-global

Inline Side-by-side
Showing 3 changed files with 27 additions and 116 deletions
... ... @@ -10,14 +10,10 @@ public interface RobotQuestionMapper {
int insert(RobotQuestion record);
int insertSelective(RobotQuestion record);
RobotQuestion selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(RobotQuestion record);
int updateByPrimaryKey(RobotQuestion record);
int count();
List<RobotQuestion> getPageLists(@Param(value = "offset") Integer offset, @Param(value = "pageSize") Integer pageSize);
... ...
... ... @@ -3,7 +3,9 @@
<mapper namespace="com.yoho.search.dal.RobotQuestionMapper">
<resultMap id="BaseResultMap" type="com.yoho.search.dal.model.RobotQuestion">
<id column="id" property="id" jdbcType="INTEGER"/>
<result column="sort_id" property="sortId" jdbcType="INTEGER"/>
<result column="max_sort_id" property="maxSortId" jdbcType="INTEGER" />
<result column="middle_sort_id" property="middleSortId" jdbcType="INTEGER" />
<result column="small_sort_id" property="smallSortId" jdbcType="INTEGER" />
<result column="question" property="question" jdbcType="VARCHAR"/>
<result column="pid" property="pid" jdbcType="INTEGER"/>
<result column="create_time" property="createTime" jdbcType="INTEGER"/>
... ... @@ -17,7 +19,7 @@
<result column="keywords" property="keywords" jdbcType="LONGVARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id, sort_id, question, pid, create_time, is_disable, effect_time, update_pid, update_time,
id, max_sort_id, middle_sort_id, small_sort_id, question, pid, create_time, is_disable, effect_time, update_pid, update_time,
question_seq, click_times,answer,keywords
</sql>
<select id="count" resultType="java.lang.Integer" timeout="20000">
... ... @@ -39,108 +41,31 @@
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.yoho.search.dal.model.RobotQuestion">
insert into robot_question (id, sort_id, question,
pid, create_time, is_disable,
effect_time, update_pid, update_time,
insert into robot_question (id, max_sort_id, middle_sort_id,
small_sort_id, question,
pid, create_time, is_disable,
effect_time, update_pid, update_time,
question_seq, click_times, answer,keywords
)
values (#{id,jdbcType=INTEGER}, #{sortId,jdbcType=INTEGER}, #{question,jdbcType=VARCHAR},
#{pid,jdbcType=INTEGER}, #{createTime,jdbcType=INTEGER}, #{isDisable,jdbcType=INTEGER},
#{effectTime,jdbcType=INTEGER}, #{updatePid,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER},
values (#{id,jdbcType=INTEGER}, #{maxSortId,jdbcType=INTEGER}, #{middleSortId,jdbcType=INTEGER},
#{smallSortId,jdbcType=INTEGER}, #{question,jdbcType=VARCHAR},
#{pid,jdbcType=INTEGER}, #{createTime,jdbcType=INTEGER}, #{isDisable,jdbcType=INTEGER},
#{effectTime,jdbcType=INTEGER}, #{updatePid,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER},
#{questionSeq,jdbcType=INTEGER}, #{clickTimes,jdbcType=INTEGER}, #{answer,jdbcType=LONGVARCHAR},
#{keywords,jdbcType=LONGVARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.yoho.search.dal.model.RobotQuestion">
insert into robot_question
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="sortId != null">
sort_id,
</if>
<if test="question != null">
question,
</if>
<if test="pid != null">
pid,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="isDisable != null">
is_disable,
</if>
<if test="effectTime != null">
effect_time,
</if>
<if test="updatePid != null">
update_pid,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="questionSeq != null">
question_seq,
</if>
<if test="clickTimes != null">
click_times,
</if>
<if test="answer != null">
answer,
</if>
<if test="keywords != null">
keywords,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="sortId != null">
#{sortId,jdbcType=INTEGER},
</if>
<if test="question != null">
#{question,jdbcType=VARCHAR},
</if>
<if test="pid != null">
#{pid,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=INTEGER},
</if>
<if test="isDisable != null">
#{isDisable,jdbcType=INTEGER},
</if>
<if test="effectTime != null">
#{effectTime,jdbcType=INTEGER},
</if>
<if test="updatePid != null">
#{updatePid,jdbcType=INTEGER},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=INTEGER},
</if>
<if test="questionSeq != null">
#{questionSeq,jdbcType=INTEGER},
</if>
<if test="clickTimes != null">
#{clickTimes,jdbcType=INTEGER},
</if>
<if test="answer != null">
#{answer,jdbcType=LONGVARCHAR},
</if>
<if test="keywords != null">
#{keywords,jdbcType=LONGVARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.RobotQuestion">
update robot_question
<set>
<if test="sortId != null">
sort_id = #{sortId,jdbcType=INTEGER},
<if test="maxSortId != null" >
max_sort_id = #{maxSortId,jdbcType=INTEGER},
</if>
<if test="middleSortId != null" >
middle_sort_id = #{middleSortId,jdbcType=INTEGER},
</if>
<if test="smallSortId != null" >
small_sort_id = #{smallSortId,jdbcType=INTEGER},
</if>
<if test="question != null">
question = #{question,jdbcType=VARCHAR},
... ... @@ -178,20 +103,4 @@
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.RobotQuestion">
update robot_question
set sort_id = #{sortId,jdbcType=INTEGER},
question = #{question,jdbcType=VARCHAR},
pid = #{pid,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=INTEGER},
is_disable = #{isDisable,jdbcType=INTEGER},
effect_time = #{effectTime,jdbcType=INTEGER},
update_pid = #{updatePid,jdbcType=INTEGER},
update_time = #{updateTime,jdbcType=INTEGER},
question_seq = #{questionSeq,jdbcType=INTEGER},
click_times = #{clickTimes,jdbcType=INTEGER},
answer = #{answer,jdbcType=LONGVARCHAR},
keywords = #{keywords,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
... ...
... ... @@ -10,7 +10,13 @@
"id": {
"type": "integer"
},
"sortId": {
"maxSortId": {
"type": "integer"
},
"middleSortId": {
"type": "integer"
},
"smallSortId": {
"type": "integer"
},
"question": {
... ...