From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +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/DeviceActiveMapper.xml |  274 +++++++++++++++++++++++++++---------------------------
 1 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml
index f6fbcaa..2c9c3e2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml
@@ -1,137 +1,137 @@
-<?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.DeviceActiveMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.push.DeviceActive">
-		<id column="da_id" property="id" jdbcType="BIGINT" />
-		<result column="da_platform" property="platform" jdbcType="INTEGER" />
-		<result column="da_device" property="device" jdbcType="VARCHAR" />
-		<result column="da_device_token_md5" property="deviceTokenMd5"
-			jdbcType="VARCHAR" />
-		<result column="da_device_token" property="deviceToken"
-			jdbcType="VARCHAR" />
-		<result column="da_version_code" property="versionCode"
-			jdbcType="INTEGER" />
-		<result column="da_createtime" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="da_updatetime" property="updateTime" jdbcType="TIMESTAMP" />
-		<result column="da_ip" property="ipInfo" jdbcType="VARCHAR" />
-		<result column="da_channel" property="channel" jdbcType="VARCHAR" />
-		<result column="da_imei" property="imei" jdbcType="VARCHAR" />
-		<result column="da_idfa" property="idfa" jdbcType="VARCHAR" />
-		<result column="da_mac" property="mac" jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="Base_Column_List">da_id,da_platform,da_device,da_device_token_md5,da_device_token,da_version_code,da_createtime,da_updatetime,da_ip,da_channel,da_imei,da_idfa,da_mac
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_device_active where da_id = #{id,jdbcType=BIGINT}
-	</select>
-	<select id="selectByDeviceAndPlatform" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_device_active where da_device = #{device} and
-		da_platform=#{platform} order by da_id desc limit 1
-	</select>
-	<select id="selectFirstByDeviceAndPlatform" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_device_active where da_device = #{device} and
-		da_platform=#{platform} limit 1
-	</select>
-	<select id="selectByDeviceToeknMd5AndPlatform" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_device_active where da_device_token_md5 =
-		#{deviceTokenMd5} and da_platform=#{platform}
-	</select>
-	<select id="selectFirst" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_device_active where da_device = #{0} order by da_id
-		limit 1
-	</select>
-	<select id="selectFirstByImei" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_device_active where da_imei = #{0} order by da_id limit
-		1
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_device_active where da_id = #{id,jdbcType=BIGINT}</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.push.DeviceActive"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_device_active
-		(da_id,da_platform,da_device,da_device_token_md5,da_device_token,da_version_code,da_createtime,da_updatetime,da_ip,da_channel,da_imei,da_idfa,da_mac)
-		values
-		(#{id,jdbcType=BIGINT},#{platform,jdbcType=INTEGER},#{device,jdbcType=VARCHAR},#{deviceTokenMd5,jdbcType=VARCHAR},#{deviceToken,jdbcType=VARCHAR},#{versionCode,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{ipInfo,jdbcType=VARCHAR},#{channel,jdbcType=VARCHAR},#{imei,jdbcType=VARCHAR},#{idfa,jdbcType=VARCHAR},#{mac,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.DeviceActive"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_device_active
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">da_id,</if>
-			<if test="platform != null">da_platform,</if>
-			<if test="device != null">da_device,</if>
-			<if test="deviceTokenMd5 != null">da_device_token_md5,</if>
-			<if test="deviceToken != null">da_device_token,</if>
-			<if test="versionCode != null">da_version_code,</if>
-			<if test="createTime != null">da_createtime,</if>
-			<if test="updateTime != null">da_updatetime,</if>
-			<if test="ipInfo != null">da_ip,</if>
-			<if test="channel != null">da_channel,</if>
-			<if test="imei != null">da_imei,</if>
-			<if test="idfa != null">da_idfa,</if>
-			<if test="mac != null">da_mac,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="platform != null">#{platform,jdbcType=INTEGER},</if>
-			<if test="device != null">#{device,jdbcType=VARCHAR},</if>
-			<if test="deviceTokenMd5 != null">#{deviceTokenMd5,jdbcType=VARCHAR},</if>
-			<if test="deviceToken != null">#{deviceToken,jdbcType=VARCHAR},</if>
-			<if test="versionCode != null">#{versionCode,jdbcType=INTEGER},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="ipInfo != null">#{ipInfo,jdbcType=VARCHAR},</if>
-			<if test="channel != null">#{channel,jdbcType=VARCHAR},</if>
-			<if test="imei != null">#{imei,jdbcType=VARCHAR},</if>
-			<if test="idfa != null">#{idfa,jdbcType=VARCHAR},</if>
-			<if test="mac != null">#{mac,jdbcType=VARCHAR},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceActive">update
-		yeshi_ec_device_active set da_platform =
-		#{platform,jdbcType=INTEGER},da_device =
-		#{device,jdbcType=VARCHAR},da_device_token_md5 =
-		#{deviceTokenMd5,jdbcType=VARCHAR},da_device_token =
-		#{deviceToken,jdbcType=VARCHAR},da_version_code =
-		#{versionCode,jdbcType=INTEGER},da_createtime =
-		#{createTime,jdbcType=TIMESTAMP},da_updatetime =
-		#{updateTime,jdbcType=TIMESTAMP},da_ip = #{ipInfo,jdbcType=VARCHAR}
-		,da_channel =#{channel,jdbcType=VARCHAR},da_imei
-		=#{imei,jdbcType=VARCHAR} ,da_idfa =#{idfa,jdbcType=VARCHAR} ,da_mac
-		=#{mac,jdbcType=VARCHAR} where da_id = #{id,jdbcType=BIGINT}</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.DeviceActive">
-		update yeshi_ec_device_active
-		<set>
-			<if test="platform != null">da_platform=#{platform,jdbcType=INTEGER},</if>
-			<if test="device != null">da_device=#{device,jdbcType=VARCHAR},</if>
-			<if test="deviceTokenMd5 != null">da_device_token_md5=#{deviceTokenMd5,jdbcType=VARCHAR},
-			</if>
-			<if test="deviceToken != null">da_device_token=#{deviceToken,jdbcType=VARCHAR},</if>
-			<if test="versionCode != null">da_version_code=#{versionCode,jdbcType=INTEGER},</if>
-			<if test="createTime != null">da_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">da_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="ipInfo != null">da_ip=#{ipInfo,jdbcType=VARCHAR},</if>
-			<if test="channel !=null">da_channel =#{channel,jdbcType=VARCHAR},</if>
-			<if test="imei !=null">da_imei =#{imei,jdbcType=VARCHAR},</if>
-			<if test="idfa !=null">da_idfa =#{idfa,jdbcType=VARCHAR},</if>
-			<if test="mac !=null">da_mac =#{mac,jdbcType=VARCHAR},</if>
-		</set>
-		where da_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.DeviceActiveMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.push.DeviceActive">
+		<id column="da_id" property="id" jdbcType="BIGINT" />
+		<result column="da_platform" property="platform" jdbcType="INTEGER" />
+		<result column="da_device" property="device" jdbcType="VARCHAR" />
+		<result column="da_device_token_md5" property="deviceTokenMd5"
+			jdbcType="VARCHAR" />
+		<result column="da_device_token" property="deviceToken"
+			jdbcType="VARCHAR" />
+		<result column="da_version_code" property="versionCode"
+			jdbcType="INTEGER" />
+		<result column="da_createtime" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="da_updatetime" property="updateTime" jdbcType="TIMESTAMP" />
+		<result column="da_ip" property="ipInfo" jdbcType="VARCHAR" />
+		<result column="da_channel" property="channel" jdbcType="VARCHAR" />
+		<result column="da_imei" property="imei" jdbcType="VARCHAR" />
+		<result column="da_idfa" property="idfa" jdbcType="VARCHAR" />
+		<result column="da_mac" property="mac" jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">da_id,da_platform,da_device,da_device_token_md5,da_device_token,da_version_code,da_createtime,da_updatetime,da_ip,da_channel,da_imei,da_idfa,da_mac
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_device_active where da_id = #{id,jdbcType=BIGINT}
+	</select>
+	<select id="selectByDeviceAndPlatform" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_device_active where da_device = #{device} and
+		da_platform=#{platform} order by da_id desc limit 1
+	</select>
+	<select id="selectFirstByDeviceAndPlatform" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_device_active where da_device = #{device} and
+		da_platform=#{platform} limit 1
+	</select>
+	<select id="selectByDeviceToeknMd5AndPlatform" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_device_active where da_device_token_md5 =
+		#{deviceTokenMd5} and da_platform=#{platform}
+	</select>
+	<select id="selectFirst" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_device_active where da_device = #{0} order by da_id
+		limit 1
+	</select>
+	<select id="selectFirstByImei" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_device_active where da_imei = #{0} order by da_id limit
+		1
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_device_active where da_id = #{id,jdbcType=BIGINT}</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.push.DeviceActive"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_device_active
+		(da_id,da_platform,da_device,da_device_token_md5,da_device_token,da_version_code,da_createtime,da_updatetime,da_ip,da_channel,da_imei,da_idfa,da_mac)
+		values
+		(#{id,jdbcType=BIGINT},#{platform,jdbcType=INTEGER},#{device,jdbcType=VARCHAR},#{deviceTokenMd5,jdbcType=VARCHAR},#{deviceToken,jdbcType=VARCHAR},#{versionCode,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{ipInfo,jdbcType=VARCHAR},#{channel,jdbcType=VARCHAR},#{imei,jdbcType=VARCHAR},#{idfa,jdbcType=VARCHAR},#{mac,jdbcType=VARCHAR})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.DeviceActive"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_device_active
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">da_id,</if>
+			<if test="platform != null">da_platform,</if>
+			<if test="device != null">da_device,</if>
+			<if test="deviceTokenMd5 != null">da_device_token_md5,</if>
+			<if test="deviceToken != null">da_device_token,</if>
+			<if test="versionCode != null">da_version_code,</if>
+			<if test="createTime != null">da_createtime,</if>
+			<if test="updateTime != null">da_updatetime,</if>
+			<if test="ipInfo != null">da_ip,</if>
+			<if test="channel != null">da_channel,</if>
+			<if test="imei != null">da_imei,</if>
+			<if test="idfa != null">da_idfa,</if>
+			<if test="mac != null">da_mac,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="platform != null">#{platform,jdbcType=INTEGER},</if>
+			<if test="device != null">#{device,jdbcType=VARCHAR},</if>
+			<if test="deviceTokenMd5 != null">#{deviceTokenMd5,jdbcType=VARCHAR},</if>
+			<if test="deviceToken != null">#{deviceToken,jdbcType=VARCHAR},</if>
+			<if test="versionCode != null">#{versionCode,jdbcType=INTEGER},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="ipInfo != null">#{ipInfo,jdbcType=VARCHAR},</if>
+			<if test="channel != null">#{channel,jdbcType=VARCHAR},</if>
+			<if test="imei != null">#{imei,jdbcType=VARCHAR},</if>
+			<if test="idfa != null">#{idfa,jdbcType=VARCHAR},</if>
+			<if test="mac != null">#{mac,jdbcType=VARCHAR},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceActive">update
+		yeshi_ec_device_active set da_platform =
+		#{platform,jdbcType=INTEGER},da_device =
+		#{device,jdbcType=VARCHAR},da_device_token_md5 =
+		#{deviceTokenMd5,jdbcType=VARCHAR},da_device_token =
+		#{deviceToken,jdbcType=VARCHAR},da_version_code =
+		#{versionCode,jdbcType=INTEGER},da_createtime =
+		#{createTime,jdbcType=TIMESTAMP},da_updatetime =
+		#{updateTime,jdbcType=TIMESTAMP},da_ip = #{ipInfo,jdbcType=VARCHAR}
+		,da_channel =#{channel,jdbcType=VARCHAR},da_imei
+		=#{imei,jdbcType=VARCHAR} ,da_idfa =#{idfa,jdbcType=VARCHAR} ,da_mac
+		=#{mac,jdbcType=VARCHAR} where da_id = #{id,jdbcType=BIGINT}</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.DeviceActive">
+		update yeshi_ec_device_active
+		<set>
+			<if test="platform != null">da_platform=#{platform,jdbcType=INTEGER},</if>
+			<if test="device != null">da_device=#{device,jdbcType=VARCHAR},</if>
+			<if test="deviceTokenMd5 != null">da_device_token_md5=#{deviceTokenMd5,jdbcType=VARCHAR},
+			</if>
+			<if test="deviceToken != null">da_device_token=#{deviceToken,jdbcType=VARCHAR},</if>
+			<if test="versionCode != null">da_version_code=#{versionCode,jdbcType=INTEGER},</if>
+			<if test="createTime != null">da_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">da_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="ipInfo != null">da_ip=#{ipInfo,jdbcType=VARCHAR},</if>
+			<if test="channel !=null">da_channel =#{channel,jdbcType=VARCHAR},</if>
+			<if test="imei !=null">da_imei =#{imei,jdbcType=VARCHAR},</if>
+			<if test="idfa !=null">da_idfa =#{idfa,jdbcType=VARCHAR},</if>
+			<if test="mac !=null">da_mac =#{mac,jdbcType=VARCHAR},</if>
+		</set>
+		where da_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0