冲突

Administrator

2018-11-21 231884cf4bcaf173dae4ebbae8851bbbc46737a4

冲突

 fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenIOSMapper.xml

@@ -10,21 +10,29 @@
        <result column="version" property="version" jdbcType="INTEGER" />
        <result column="createtime" property="createTime" jdbcType="TIMESTAMP" />
        <result column="updatetime" property="updateTime" jdbcType="TIMESTAMP" />
        <result column="device_token_md5" property="deviceTokenMd5"
            jdbcType="VARCHAR" />
    </resultMap>
    <sql id="Base_Column_List">id,uid,device_token,device,createtime,updatetime,version</sql>
    <sql id="Base_Column_List">id,uid,device_token,device,createtime,updatetime,version,device_token_md5
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_uid_devicetoken_ios where id = #{id,jdbcType=BIGINT}
    </select>


    <select id="selectByDevice" resultMap="BaseResultMap"
        parameterType="java.lang.String">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_uid_devicetoken_ios where device = #{0} limit 1
    </select>

    <select id="selectByDeviceToken" resultMap="BaseResultMap"
        parameterType="java.lang.String">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_uid_devicetoken_ios where device_token = #{0} limit 1
    </select>


@@ -34,33 +42,23 @@
        <include refid="Base_Column_List" />
        from yeshi_ec_uid_devicetoken_ios where uid = #{0}
    </select>


    <select id="selectList" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_uid_devicetoken_ios limit #{start},#{count}
    </select>


    <select id="selectCount" resultType="java.lang.Long">
        select
        count(id)
        from
    <select id="selectCount" resultType="java.lang.Long">select count(id) from
        yeshi_ec_uid_devicetoken_ios
    </select>




    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_uid_devicetoken_ios where id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS"
        useGeneratedKeys="true" keyProperty="id">insert into
        yeshi_ec_uid_devicetoken_ios
        (id,uid,device_token,device,createtime,updatetime,`version`) values
        (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{deviceToken,jdbcType=VARCHAR},#{device,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{version,jdbcType=INTEGER})
        (id,uid,device_token,device,createtime,updatetime,`version`,device_token_md5,version)
        values
        (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{deviceToken,jdbcType=VARCHAR},#{device,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{version,jdbcType=INTEGER},#{deviceTokenMd5,jdbcType=VARCHAR},#{version,jdbcType=INTEGER})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS"
        useGeneratedKeys="true" keyProperty="id">
@@ -73,6 +71,7 @@
            <if test="createTime != null">createtime,</if>
            <if test="updateTime != null">updatetime,</if>
            <if test="version != null">version,</if>
            <if test="deviceTokenMd5 != null">device_token_md5,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -83,6 +82,7 @@
            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
            <if test="version != null">#{version,jdbcType=INTEGER},</if>
            <if test="deviceTokenMd5 != null">#{deviceTokenMd5,jdbcType=VARCHAR}</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS">update
@@ -91,8 +91,9 @@
        #{deviceToken,jdbcType=VARCHAR},device =
        #{device,jdbcType=VARCHAR},createtime =
        #{createTime,jdbcType=TIMESTAMP},updatetime =
        #{updateTime,jdbcType=TIMESTAMP},version =
        #{version,jdbcType=INTEGER}  where id = #{id,jdbcType=BIGINT}
        #{updateTime,jdbcType=TIMESTAMP},version = #{version,jdbcType=INTEGER}
        ,device_token_md5 =#{deviceTokenMd5,jdbcType=VARCHAR} where id =
        #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS">
        update yeshi_ec_uid_devicetoken_ios
@@ -103,6 +104,8 @@
            <if test="createTime != null">createtime=#{createTime,jdbcType=TIMESTAMP},</if>
            <if test="updateTime != null">updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
            <if test="version != null">version=#{version,jdbcType=INTEGER},</if>
            <if test="deviceTokenMd5 !=null">device_token_md5 =#{deviceTokenMd5,jdbcType=VARCHAR},
            </if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>