From 032eddac4b4627f855905e8e846b0388483e3979 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 11:58:50 +0800
Subject: [PATCH] 客户端参数/系统参数增加版本区分

---
 fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml |   60 ++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml
index c5def27..12f2782 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml
@@ -9,52 +9,53 @@
 		<result column="`name`" property="name" jdbcType="VARCHAR" />
 		<result column="beizhu" property="beizhu" jdbcType="VARCHAR" />
 		<result column="createtime" property="createtime" jdbcType="VARCHAR" />
+		<result column="min_android_version" property="minAndroidVersionCode"
+			jdbcType="INTEGER" />
+		<result column="min_ios_version" property="minIosVersionCode"
+			jdbcType="INTEGER" />
 	</resultMap>
-	<sql id="Base_Column_List">`id`,`key`,`value`,`name`,beizhu,createtime</sql>
+	<sql id="Base_Column_List">`id`,`key`,`value`,`name`,beizhu,createtime,min_android_version,min_ios_version
+	</sql>
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
 		parameterType="java.lang.Long">
 		select
 		<include refid="Base_Column_List" />
 		from yeshi_ec_config where id = #{id,jdbcType=BIGINT}
 	</select>
-
-
 	<select id="selectByKey" resultMap="BaseResultMap"
 		parameterType="java.lang.String">
 		select
 		<include refid="Base_Column_List" />
 		from yeshi_ec_config where `key` = #{0} limit 1
 	</select>
-
-
 	<select id="listAll" resultMap="BaseResultMap">
 		select
 		<include refid="Base_Column_List" />
 		from yeshi_ec_config
 	</select>
-
-
 	<select id="listSearchByName" resultMap="BaseResultMap"
 		parameterType="java.lang.String">
 		select
 		<include refid="Base_Column_List" />
-		from yeshi_ec_config where `name` like '%${key}%' limit #{start},#{count}
+		from yeshi_ec_config where `name` like '%${key}%' limit
+		#{start},#{count}
 	</select>
-
-
 	<select id="countSearchByName" resultType="java.lang.Long"
-		parameterType="java.lang.String">
-		select
-		count(*)
-		from yeshi_ec_config where `name` like
-		'%${key}%'
-	</select>
+		parameterType="java.lang.String">select count(*) from yeshi_ec_config where `name` like
+		'%${key}%'</select>
 
-
-	<select id="listByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+	<select id="listByKey" resultMap="BaseResultMap">
 		select
 		<include refid="Base_Column_List" />
-		from yeshi_ec_config where `key`=#{0}
+		from yeshi_ec_config where `key`=#{key}
+		<if test="minAndroidVersion!=null">
+			and #{minAndroidVersion} >= min_android_version
+			order by min_android_version desc
+		</if>
+		<if test="minIosVersion!=null">
+			and #{minIosVersion} >= min_ios_version
+			order by min_ios_version desc
+		</if>
 	</select>
 
 
@@ -65,8 +66,9 @@
 	</delete>
 	<insert id="insert" parameterType="com.yeshi.fanli.entity.common.Config"
 		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_config
-		(id,key,value,name,beizhu,createtime) values
-		(#{id,jdbcType=BIGINT},#{key,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{beizhu,jdbcType=VARCHAR},#{createtime,jdbcType=VARCHAR})
+		(id,key,value,name,beizhu,createtime,min_android_version,min_ios_version)
+		values
+		(#{id,jdbcType=BIGINT},#{key,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{beizhu,jdbcType=VARCHAR},#{createtime,jdbcType=VARCHAR},#{minAndroidVersionCode,jdbcType=INTEGER},#{minIosVersionCode,jdbcType=INTEGER})
 	</insert>
 	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.common.Config"
 		useGeneratedKeys="true" keyProperty="id">
@@ -78,6 +80,8 @@
 			<if test="name != null">`name`,</if>
 			<if test="beizhu != null">beizhu,</if>
 			<if test="createtime != null">createtime,</if>
+			<if test="minAndroidVersionCode != null">min_android_version,</if>
+			<if test="minIosVersionCode != null">min_ios_version,</if>
 		</trim>
 		values
 		<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -87,14 +91,17 @@
 			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
 			<if test="beizhu != null">#{beizhu,jdbcType=VARCHAR},</if>
 			<if test="createtime != null">#{createtime,jdbcType=VARCHAR},</if>
+			<if test="minAndroidVersionCode != null">#{minAndroidVersionCode,jdbcType=INTEGER},</if>
+			<if test="minIosVersionCode != null">#{minIosVersionCode,jdbcType=INTEGER}</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.common.Config">update
 		yeshi_ec_config set `key` = #{key,jdbcType=VARCHAR},`value` =
 		#{value,jdbcType=VARCHAR},`name` = #{name,jdbcType=VARCHAR},beizhu =
-		#{beizhu,jdbcType=VARCHAR},createtime =
-		#{createtime,jdbcType=VARCHAR}
-		where id = #{id,jdbcType=BIGINT}
+		#{beizhu,jdbcType=VARCHAR},createtime = #{createtime,jdbcType=VARCHAR}
+		,min_android_version =#{minAndroidVersionCode,jdbcType=INTEGER}
+		,min_ios_version =#{minIosVersionCode,jdbcType=INTEGER} where id =
+		#{id,jdbcType=BIGINT}
 	</update>
 	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.common.Config">
 		update yeshi_ec_config
@@ -104,6 +111,11 @@
 			<if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
 			<if test="beizhu != null">beizhu=#{beizhu,jdbcType=VARCHAR},</if>
 			<if test="createtime != null">createtime=#{createtime,jdbcType=VARCHAR},</if>
+			<if test="minAndroidVersionCode !=null">min_android_version
+				=#{minAndroidVersionCode,jdbcType=INTEGER},
+			</if>
+			<if test="minIosVersionCode !=null">min_ios_version =#{minIosVersionCode,jdbcType=INTEGER},
+			</if>
 		</set>
 		where id = #{id,jdbcType=BIGINT}
 	</update>

--
Gitblit v1.8.0