From 011d53f9f3d08af8cd622585ce40eb880f313aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 25 九月 2019 12:02:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenOPPOMapper.xml |  260 +++++++++++++++++++++++++--------------------------
 1 files changed, 128 insertions(+), 132 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenOPPOMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenOPPOMapper.xml
index 95208d5..d3fa541 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenOPPOMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenOPPOMapper.xml
@@ -1,132 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.yeshi.fanli.dao.mybatis.push.DeviceTokenOPPOMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.push.DeviceTokenOPPO">
-		<id column="do_id" property="id" jdbcType="BIGINT" />
-		<result column="do_device_id" property="deviceActiveId"
-			jdbcType="BIGINT" />
-		<result column="do_register_id" property="registerId" jdbcType="VARCHAR" />
-		<result column="do_uid" property="uid" jdbcType="BIGINT" />
-		<result column="do_create_time" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="do_update_time" property="updateTime" jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">do_id,do_device_id,do_register_id,do_uid,do_create_time,do_update_time
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_oppo where do_id = #{id,jdbcType=BIGINT}
-	</select>
-
-
-	<select id="selectByDeviceActiveId" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_oppo where do_device_id = #{0}
-	</select>
-
-
-	<select id="countDeviceToken" resultType="java.lang.Long"
-		parameterType="java.lang.Long">
-		select
-		count(do_id)
-		from yeshi_ec_uid_devicetoken_oppo op left join
-		yeshi_ec_device_active a on a.da_id=op.do_device_id
-		<if test="versionList!=null">
-			<foreach collection="versionList" open="where (" separator=" or "
-				item="ver" close=")">
-				da_version_code=#{ver}
-			</foreach>
-		</if>
-	</select>
-
-
-	<select id="listDeviceToken" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_oppo
-		left join
-		yeshi_ec_device_active a on a.da_id=do_device_id
-		<if test="versionList!=null">
-			<foreach collection="versionList" open="where (" separator=" or "
-				item="ver" close=")">
-				da_version_code=#{ver}
-			</foreach>
-		</if>
-		 limit #{start},#{count}
-	</select>
-
-
-	<select id="listByUid" resultMap="BaseResultMap" parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_oppo
-		left join
-		yeshi_ec_device_active a on a.da_id=do_device_id
-		where do_uid=#{uid}
-		<if test="versionList!=null">
-			<foreach collection="versionList" open="and (" separator=" or "
-				item="ver" close=")">
-				da_version_code=#{ver}
-			</foreach>
-		</if>
-		
-	</select>
-	
-	 List<Integer> verisonList
-	
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_uid_devicetoken_oppo where do_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_uid_devicetoken_oppo
-		(do_id,do_device_id,do_register_id,do_uid,do_create_time,do_update_time)
-		values
-		(#{id,jdbcType=BIGINT},#{deviceActiveId,jdbcType=BIGINT},#{registerId,jdbcType=VARCHAR},#{uid,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_uid_devicetoken_oppo
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">do_id,</if>
-			<if test="deviceActiveId != null">do_device_id,</if>
-			<if test="registerId != null">do_register_id,</if>
-			<if test="uid != null">do_uid,</if>
-			<if test="createTime != null">do_create_time,</if>
-			<if test="updateTime != null">do_update_time,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="deviceActiveId != null">#{deviceActiveId,jdbcType=BIGINT},</if>
-			<if test="registerId != null">#{registerId,jdbcType=VARCHAR},</if>
-			<if test="uid != null">#{uid,jdbcType=BIGINT},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO">update
-		yeshi_ec_uid_devicetoken_oppo set do_device_id =
-		#{deviceActiveId,jdbcType=BIGINT},do_register_id =
-		#{registerId,jdbcType=VARCHAR},do_uid =
-		#{uid,jdbcType=BIGINT},do_create_time =
-		#{createTime,jdbcType=TIMESTAMP},do_update_time =
-		#{updateTime,jdbcType=TIMESTAMP} where do_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO">
-		update yeshi_ec_uid_devicetoken_oppo
-		<set>
-			<if test="deviceActiveId != null">do_device_id=#{deviceActiveId,jdbcType=BIGINT},</if>
-			<if test="registerId != null">do_register_id=#{registerId,jdbcType=VARCHAR},</if>
-			<if test="uid != null">do_uid=#{uid,jdbcType=BIGINT},</if>
-			<if test="createTime != null">do_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">do_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-		</set>
-		where do_id = #{id,jdbcType=BIGINT}
-	</update>
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yeshi.fanli.dao.mybatis.push.DeviceTokenOPPOMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.push.DeviceTokenOPPO">
+		<id column="do_id" property="id" jdbcType="BIGINT" />
+		<result column="do_device_id" property="deviceActiveId"
+			jdbcType="BIGINT" />
+		<result column="do_register_id" property="registerId" jdbcType="VARCHAR" />
+		<result column="do_uid" property="uid" jdbcType="BIGINT" />
+		<result column="do_create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="do_update_time" property="updateTime" jdbcType="TIMESTAMP" />
+	</resultMap>
+	<sql id="Base_Column_List">do_id,do_device_id,do_register_id,do_uid,do_create_time,do_update_time
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_oppo where do_id = #{id,jdbcType=BIGINT}
+	</select>
+
+
+	<select id="selectByDeviceActiveId" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_oppo where do_device_id = #{0}
+	</select>
+
+
+	<select id="countDeviceToken" resultType="java.lang.Long"
+		parameterType="java.lang.Long">
+		select
+		count(do_id)
+		from yeshi_ec_uid_devicetoken_oppo op left join
+		yeshi_ec_device_active a on a.da_id=op.do_device_id
+		<if test="versionList!=null">
+			<foreach collection="versionList" open="where (" separator=" or "
+				item="ver" close=")">
+				da_version_code=#{ver}
+			</foreach>
+		</if>
+	</select>
+
+
+	<select id="listDeviceToken" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_oppo
+		left join
+		yeshi_ec_device_active a on a.da_id=do_device_id
+		<if test="versionList!=null">
+			<foreach collection="versionList" open="where (" separator=" or "
+				item="ver" close=")">
+				da_version_code=#{ver}
+			</foreach>
+		</if>
+		 limit #{start},#{count}
+	</select>
+
+
+	<select id="listByUid" resultMap="BaseResultMap" parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_oppo
+		left join
+		yeshi_ec_device_active a on a.da_id=do_device_id
+		where do_uid=#{uid}
+		<if test="versionList!=null">
+			<foreach collection="versionList" open="and (" separator=" or "
+				item="ver" close=")">
+				da_version_code=#{ver}
+			</foreach>
+		</if>
+	</select>
+	
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_uid_devicetoken_oppo where do_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_uid_devicetoken_oppo
+		(do_id,do_device_id,do_register_id,do_uid,do_create_time,do_update_time)
+		values
+		(#{id,jdbcType=BIGINT},#{deviceActiveId,jdbcType=BIGINT},#{registerId,jdbcType=VARCHAR},#{uid,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_uid_devicetoken_oppo
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">do_id,</if>
+			<if test="deviceActiveId != null">do_device_id,</if>
+			<if test="registerId != null">do_register_id,</if>
+			<if test="uid != null">do_uid,</if>
+			<if test="createTime != null">do_create_time,</if>
+			<if test="updateTime != null">do_update_time,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="deviceActiveId != null">#{deviceActiveId,jdbcType=BIGINT},</if>
+			<if test="registerId != null">#{registerId,jdbcType=VARCHAR},</if>
+			<if test="uid != null">#{uid,jdbcType=BIGINT},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO">update
+		yeshi_ec_uid_devicetoken_oppo set do_device_id =
+		#{deviceActiveId,jdbcType=BIGINT},do_register_id =
+		#{registerId,jdbcType=VARCHAR},do_uid =
+		#{uid,jdbcType=BIGINT},do_create_time =
+		#{createTime,jdbcType=TIMESTAMP},do_update_time =
+		#{updateTime,jdbcType=TIMESTAMP} where do_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenOPPO">
+		update yeshi_ec_uid_devicetoken_oppo
+		<set>
+			<if test="deviceActiveId != null">do_device_id=#{deviceActiveId,jdbcType=BIGINT},</if>
+			<if test="registerId != null">do_register_id=#{registerId,jdbcType=VARCHAR},</if>
+			<if test="uid != null">do_uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="createTime != null">do_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">do_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+		</set>
+		where do_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0