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/SystemClientParamsMapper.xml |  236 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/SystemClientParamsMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/SystemClientParamsMapper.xml
index 3e12753..f8e2360 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/SystemClientParamsMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/SystemClientParamsMapper.xml
@@ -1,118 +1,118 @@
-<?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.SystemClientParamsMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.system.SystemClientParams">
-		<id column="id" property="id" jdbcType="BIGINT" />
-		<result column="key" property="key" jdbcType="VARCHAR" />
-		<result column="value" property="value" jdbcType="VARCHAR" />
-		<result column="name" property="name" jdbcType="VARCHAR" />
-		<result column="updatetime" property="updatetime" jdbcType="BIGINT" />
-		<result column="min_version" property="minVersion" jdbcType="INTEGER" />
-		<association property="system" column="systemid"
-			javaType="com.yeshi.fanli.entity.system.BusinessSystem">
-			<id column="systemid" property="id" jdbcType="BIGINT" />
-		</association>
-
-	</resultMap>
-	<sql id="Base_Column_List">id,`systemid`,`key`,`value`,`name`,updatetime,min_version
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_system_clientparams where id = #{id,jdbcType=BIGINT}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_system_clientparams where id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.system.SystemClientParams"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_system_clientparams
-		(id,`systemid`,`key`,`value`,`name`,updatetime,min_version)
-		values
-		(#{id,jdbcType=BIGINT}, #{system.id,jdbcType=BIGINT},
-		#{key,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR},
-		#{name,jdbcType=VARCHAR},
-		#{updatetime,jdbcType=BIGINT},#{minVersion,jdbcType=INTEGER})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.SystemClientParams"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_system_clientparams
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">id,</if>
-			<if test="system != null">`systemid`,</if>
-			<if test="key != null">`key`,</if>
-			<if test="value != null">`value`,</if>
-			<if test="name != null">`name`,</if>
-			<if test="updatetime != null">updatetime,</if>
-			<if test="minVersion != null">min_version,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="system != null">#{system.id,jdbcType=BIGINT},</if>
-			<if test="key != null">#{key,jdbcType=VARCHAR},</if>
-			<if test="value != null">#{value,jdbcType=VARCHAR},</if>
-			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
-			<if test="updatetime != null">#{updatetime,jdbcType=BIGINT},</if>
-			<if test="minVersion != null">#{minVersion,jdbcType=INTEGER}</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.SystemClientParams">update
-		yeshi_ec_system_clientparams set systemid =
-		#{system.id,jdbcType=BIGINT},`key` = #{key,jdbcType=VARCHAR},`value` =
-		#{value,jdbcType=VARCHAR},`name` = #{name,jdbcType=VARCHAR},updatetime
-		= #{updatetime,jdbcType=BIGINT} ,min_version
-		=#{minVersion,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.SystemClientParams">
-		update yeshi_ec_system_clientparams
-		<set>
-			<if test="system != null">`systemid`=#{system.id,jdbcType=BIGINT},</if>
-			<if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
-			<if test="value != null">`value`=#{value,jdbcType=VARCHAR},</if>
-			<if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
-			<if test="updatetime != null">updatetime=#{updatetime,jdbcType=BIGINT},</if>
-			<if test="minVersion !=null">min_version =#{minVersion,jdbcType=INTEGER},</if>
-		</set>
-		where id = #{id,jdbcType=BIGINT}
-	</update>
-
-	<select id="listBySystemIdAndMinVersion" resultMap="BaseResultMap">
-		SELECT * FROM (
-		SELECT * FROM
-		yeshi_ec_system_clientparams cp WHERE
-		cp.`systemid` =
-		#{systemId}
-		<if test="minVersion!=null">
-			and #{minVersion}>=min_version
-			order by min_version desc
-		</if>
-		)a group by a.key
-	</select>
-
-	<select id="getSystemClientParamsBySystemAndKey" resultMap="BaseResultMap">SELECT
-		* FROM yeshi_ec_system_clientparams cp WHERE cp.`systemid` =
-		#{systemId} AND cp.`key` = #{key} LIMIT 1
-	</select>
-	<select id="listQuery" resultMap="BaseResultMap">
-		SELECT * FROM yeshi_ec_system_clientparams cp WHERE 1=1
-		<if test="systemId != null">AND cp.`systemid` = #{systemId}</if>
-		<if test="key != null and key != '' ">AND (cp.`name` LIKE '%${key}%' or cp.`key` LIKE
-			'%${key}%'
-			)
-		</if>
-		LIMIT #{start},#{count}
-	</select>
-	<select id="countQuery" resultType="java.lang.Long">
-		SELECT IFNULL(COUNT(cp.`id`),0) FROM yeshi_ec_system_clientparams cp
-		WHERE 1=1
-		<if test="systemId != null">AND cp.`systemid` = #{systemId}</if>
-		<if test="key != null and key != '' ">AND (cp.`name` LIKE '%${key}%' or cp.`key` LIKE
-			'%${key}%'
-			)
-		</if>
-	</select>
-</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.SystemClientParamsMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.system.SystemClientParams">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="key" property="key" jdbcType="VARCHAR" />
+		<result column="value" property="value" jdbcType="VARCHAR" />
+		<result column="name" property="name" jdbcType="VARCHAR" />
+		<result column="updatetime" property="updatetime" jdbcType="BIGINT" />
+		<result column="min_version" property="minVersion" jdbcType="INTEGER" />
+		<association property="system" column="systemid"
+			javaType="com.yeshi.fanli.entity.system.BusinessSystem">
+			<id column="systemid" property="id" jdbcType="BIGINT" />
+		</association>
+
+	</resultMap>
+	<sql id="Base_Column_List">id,`systemid`,`key`,`value`,`name`,updatetime,min_version
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_system_clientparams where id = #{id,jdbcType=BIGINT}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_system_clientparams where id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.system.SystemClientParams"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_system_clientparams
+		(id,`systemid`,`key`,`value`,`name`,updatetime,min_version)
+		values
+		(#{id,jdbcType=BIGINT}, #{system.id,jdbcType=BIGINT},
+		#{key,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR},
+		#{name,jdbcType=VARCHAR},
+		#{updatetime,jdbcType=BIGINT},#{minVersion,jdbcType=INTEGER})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.SystemClientParams"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_system_clientparams
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="system != null">`systemid`,</if>
+			<if test="key != null">`key`,</if>
+			<if test="value != null">`value`,</if>
+			<if test="name != null">`name`,</if>
+			<if test="updatetime != null">updatetime,</if>
+			<if test="minVersion != null">min_version,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="system != null">#{system.id,jdbcType=BIGINT},</if>
+			<if test="key != null">#{key,jdbcType=VARCHAR},</if>
+			<if test="value != null">#{value,jdbcType=VARCHAR},</if>
+			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
+			<if test="updatetime != null">#{updatetime,jdbcType=BIGINT},</if>
+			<if test="minVersion != null">#{minVersion,jdbcType=INTEGER}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.SystemClientParams">update
+		yeshi_ec_system_clientparams set systemid =
+		#{system.id,jdbcType=BIGINT},`key` = #{key,jdbcType=VARCHAR},`value` =
+		#{value,jdbcType=VARCHAR},`name` = #{name,jdbcType=VARCHAR},updatetime
+		= #{updatetime,jdbcType=BIGINT} ,min_version
+		=#{minVersion,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.SystemClientParams">
+		update yeshi_ec_system_clientparams
+		<set>
+			<if test="system != null">`systemid`=#{system.id,jdbcType=BIGINT},</if>
+			<if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
+			<if test="value != null">`value`=#{value,jdbcType=VARCHAR},</if>
+			<if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
+			<if test="updatetime != null">updatetime=#{updatetime,jdbcType=BIGINT},</if>
+			<if test="minVersion !=null">min_version =#{minVersion,jdbcType=INTEGER},</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+
+	<select id="listBySystemIdAndMinVersion" resultMap="BaseResultMap">
+		SELECT * FROM (
+		SELECT * FROM
+		yeshi_ec_system_clientparams cp WHERE
+		cp.`systemid` =
+		#{systemId}
+		<if test="minVersion!=null">
+			and #{minVersion}>=min_version
+			order by min_version desc
+		</if>
+		)a group by a.key
+	</select>
+
+	<select id="getSystemClientParamsBySystemAndKey" resultMap="BaseResultMap">SELECT
+		* FROM yeshi_ec_system_clientparams cp WHERE cp.`systemid` =
+		#{systemId} AND cp.`key` = #{key} LIMIT 1
+	</select>
+	<select id="listQuery" resultMap="BaseResultMap">
+		SELECT * FROM yeshi_ec_system_clientparams cp WHERE 1=1
+		<if test="systemId != null">AND cp.`systemid` = #{systemId}</if>
+		<if test="key != null and key != '' ">AND (cp.`name` LIKE '%${key}%' or cp.`key` LIKE
+			'%${key}%'
+			)
+		</if>
+		LIMIT #{start},#{count}
+	</select>
+	<select id="countQuery" resultType="java.lang.Long">
+		SELECT IFNULL(COUNT(cp.`id`),0) FROM yeshi_ec_system_clientparams cp
+		WHERE 1=1
+		<if test="systemId != null">AND cp.`systemid` = #{systemId}</if>
+		<if test="key != null and key != '' ">AND (cp.`name` LIKE '%${key}%' or cp.`key` LIKE
+			'%${key}%'
+			)
+		</if>
+	</select>
+</mapper>

--
Gitblit v1.8.0