Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-20 28cd97d04c68bd8c5fd4adf7780200f61da13654

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml

@@ -14,8 +14,9 @@
      <result column="lua_device_type" property="deviceType"
         jdbcType="VARCHAR" />
      <result column="lua_os_version" property="osVersion" jdbcType="VARCHAR" />
      <result column="lua_device" property="device" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List">lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version
   <sql id="Base_Column_List">lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version,lua_device
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
@@ -23,32 +24,28 @@
      <include refid="Base_Column_List" />
      from yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}
   </select>

   <select id="selectLatestByUid" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id desc limit 1
      from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id
      desc limit 1
   </select>
	
   <select id="selectFirstActiveInfo" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id  limit 1
      from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id
      limit 1
   </select>
	
	

   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
      yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}
   </delete>
      yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}</delete>
   <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog"
      useGeneratedKeys="true" keyProperty="id">insert into
      yeshi_ec_log_user_active
      (lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version)
      (lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version,lua_device)
      values
      (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{ip,jdbcType=VARCHAR},#{channel,jdbcType=VARCHAR},#{versionCode,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{deviceType,jdbcType=VARCHAR},#{osVersion,jdbcType=VARCHAR})
      (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{ip,jdbcType=VARCHAR},#{channel,jdbcType=VARCHAR},#{versionCode,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{deviceType,jdbcType=VARCHAR},#{osVersion,jdbcType=VARCHAR},#{device,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog"
      useGeneratedKeys="true" keyProperty="id">
@@ -63,6 +60,7 @@
         <if test="updateTime != null">lua_updatetime,</if>
         <if test="deviceType != null">lua_device_type,</if>
         <if test="osVersion != null">lua_os_version,</if>
         <if test="device != null">lua_device,</if>
      </trim>
      values
      <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -75,6 +73,7 @@
         <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
         <if test="deviceType != null">#{deviceType,jdbcType=VARCHAR},</if>
         <if test="osVersion != null">#{osVersion,jdbcType=VARCHAR}</if>
         <if test="device != null">#{device,jdbcType=VARCHAR}</if>
      </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog">update
@@ -85,8 +84,8 @@
      #{createTime,jdbcType=TIMESTAMP},lua_updatetime =
      #{updateTime,jdbcType=TIMESTAMP} ,lua_device_type
      =#{deviceType,jdbcType=VARCHAR} ,lua_os_version
      =#{osVersion,jdbcType=VARCHAR} where lua_id = #{id,jdbcType=BIGINT}
   </update>
      =#{osVersion,jdbcType=VARCHAR},lua_device
      =#{device,jdbcType=VARCHAR} where lua_id = #{id,jdbcType=BIGINT}</update>
   <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog">
      update yeshi_ec_log_user_active
      <set>
@@ -96,9 +95,9 @@
         <if test="versionCode != null">lua_version_code=#{versionCode,jdbcType=VARCHAR},</if>
         <if test="createTime != null">lua_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
         <if test="updateTime != null">lua_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
         <if test="id !=null">lua_id =#{id,jdbcType=BIGINT},</if>
         <if test="deviceType !=null">lua_device_type =#{deviceType,jdbcType=VARCHAR},</if>
         <if test="osVersion !=null">lua_os_version =#{osVersion,jdbcType=VARCHAR},</if>
         <if test="device !=null">lua_device =#{device,jdbcType=VARCHAR},</if>
      </set>
      where lua_id = #{id,jdbcType=BIGINT}
   </update>