From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化

---
 fanli/src/main/java/com/yeshi/fanli/mapping/AppVersionInfoMapper.xml |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/AppVersionInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/AppVersionInfoMapper.xml
index e54628b..87f5796 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/AppVersionInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/AppVersionInfoMapper.xml
@@ -12,8 +12,9 @@
 			jdbcType="TIMESTAMP" />
 		<result column="avcm_updatetime" property="updateTime"
 			jdbcType="TIMESTAMP" />
+		<result column="avcm_system" property="system" jdbcType="VARCHAR" />
 	</resultMap>
-	<sql id="Base_Column_List">avcm_id,avcm_platform,avcm_version,avcm_version_code,avcm_createtime,avcm_updatetime
+	<sql id="Base_Column_List">avcm_id,avcm_platform,avcm_version,avcm_version_code,avcm_createtime,avcm_updatetime,avcm_system
 	</sql>
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
 		parameterType="java.lang.Long">
@@ -24,12 +25,11 @@
 	</select>
 
 
-	<select id="selectByPlatform" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
+	<select id="selectByPlatform" resultMap="BaseResultMap">
 		select
 		<include refid="Base_Column_List" />
 		from yeshi_ec_app_version_code_map where avcm_platform =
-		#{0}
+		#{platform} AND avcm_system=#{system}
 	</select>
 
 	<select id="selectByPlatformAndVersion" resultMap="BaseResultMap">
@@ -37,7 +37,7 @@
 		<include refid="Base_Column_List" />
 		from yeshi_ec_app_version_code_map where avcm_platform =
 		#{platform}
-		and avcm_version=#{version}
+		and avcm_version=#{version} AND avcm_system=#{system}
 	</select>
 
 	<select id="selectByPlatformAndVersionCode" resultMap="BaseResultMap">
@@ -45,7 +45,7 @@
 		<include refid="Base_Column_List" />
 		from yeshi_ec_app_version_code_map where avcm_platform =
 		#{platform}
-		and avcm_version_code=#{versionCode}
+		and avcm_version_code=#{versionCode} AND avcm_system=#{system}
 	</select>
 
 	<select id="listByPlatformAndMinVersionCode" resultMap="BaseResultMap">
@@ -53,7 +53,7 @@
 		<include refid="Base_Column_List" />
 		from yeshi_ec_app_version_code_map where avcm_platform =
 		#{platform}
-		and avcm_version_code>=#{minVersionCode}
+		and avcm_version_code>=#{minVersionCode} AND avcm_system=#{system}
 	</select>
 
 
@@ -63,7 +63,7 @@
 		<include refid="Base_Column_List" />
 		from yeshi_ec_app_version_code_map where avcm_platform =
 		#{platform}
-		and #{maxVersionCode}> avcm_version_code
+		and #{maxVersionCode}> avcm_version_code AND avcm_system=#{system}
 	</select>
 
 
@@ -71,7 +71,7 @@
 		parameterType="java.lang.String">
 		select
 		<include refid="Base_Column_List" />
-		from yeshi_ec_app_version_code_map where avcm_version=#{version}
+		from yeshi_ec_app_version_code_map where avcm_version=#{version} AND avcm_system=#{system}
 	</select>
 
 	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
@@ -80,9 +80,9 @@
 	<insert id="insert" parameterType="com.yeshi.fanli.entity.AppVersionInfo"
 		useGeneratedKeys="true" keyProperty="id">insert into
 		yeshi_ec_app_version_code_map
-		(avcm_id,avcm_platform,avcm_version,avcm_version_code,avcm_createtime,avcm_updatetime)
+		(avcm_id,avcm_platform,avcm_version,avcm_version_code,avcm_createtime,avcm_updatetime,avcm_system)
 		values
-		(#{id,jdbcType=BIGINT},#{platform,jdbcType=VARCHAR},#{version,jdbcType=VARCHAR},#{versionCode,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
+		(#{id,jdbcType=BIGINT},#{platform,jdbcType=VARCHAR},#{version,jdbcType=VARCHAR},#{versionCode,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})
 	</insert>
 	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.AppVersionInfo"
 		useGeneratedKeys="true" keyProperty="id">
@@ -94,6 +94,7 @@
 			<if test="versionCode != null">avcm_version_code,</if>
 			<if test="createTime != null">avcm_createtime,</if>
 			<if test="updateTime != null">avcm_updatetime,</if>
+			<if test="system != null">avcm_system,</if>
 		</trim>
 		values
 		<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -103,6 +104,7 @@
 			<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="system != null">#{system,jdbcType=VARCHAR},</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.AppVersionInfo">update
@@ -111,7 +113,8 @@
 		#{version,jdbcType=VARCHAR},avcm_version_code =
 		#{versionCode,jdbcType=INTEGER},avcm_createtime =
 		#{createTime,jdbcType=TIMESTAMP},avcm_updatetime =
-		#{updateTime,jdbcType=TIMESTAMP} where avcm_id = #{id,jdbcType=BIGINT}
+		#{updateTime,jdbcType=TIMESTAMP},avcm_system =
+		#{system,jdbcType=VARCHAR} where avcm_id = #{id,jdbcType=BIGINT}
 	</update>
 	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.AppVersionInfo">
 		update yeshi_ec_app_version_code_map
@@ -121,6 +124,7 @@
 			<if test="versionCode != null">avcm_version_code=#{versionCode,jdbcType=INTEGER},</if>
 			<if test="createTime != null">avcm_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
 			<if test="updateTime != null">avcm_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="system != null">avcm_system=#{system,jdbcType=VARCHAR},</if>
 		</set>
 		where avcm_id = #{id,jdbcType=BIGINT}
 	</update>

--
Gitblit v1.8.0