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/homemodule/SpecialMapper.xml | 51 +++++++++++++++------------------------------------
1 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SpecialMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SpecialMapper.xml
index 24e22fa..840f940 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SpecialMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SpecialMapper.xml
@@ -25,7 +25,7 @@
<result column="b_end_time" property="endTime" jdbcType="TIMESTAMP"/>
<result column="b_createtime" property="createtime" jdbcType="TIMESTAMP" />
<result column="b_updatetime" property="updatetime" jdbcType="TIMESTAMP" />
-
+ <result column="b_system" property="system" jdbcType="VARCHAR" />
<!-- 鑳屾櫙鍥剧墖 -->
<result column="cd_bottom_picture" property="bottomPicture"
jdbcType="VARCHAR" />
@@ -59,6 +59,7 @@
<result column="b_end_time" property="endTime" jdbcType="TIMESTAMP"/>
<result column="b_createtime" property="createtime" jdbcType="TIMESTAMP" />
<result column="b_updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+ <result column="b_system" property="system" jdbcType="VARCHAR" />
<!-- 鑳屾櫙鍥剧墖 -->
<result column="cd_bottom_picture" property="bottomPicture"
@@ -72,7 +73,7 @@
</resultMap>
- <sql id="Base_Column_List">b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_min_android_version_code,b_min_ios_version_code,b_start_time,b_end_time,b_createtime,b_updatetime</sql>
+ <sql id="Base_Column_List">b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_min_android_version_code,b_min_ios_version_code,b_start_time,b_end_time,b_createtime,b_updatetime,b_system</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
select
@@ -83,9 +84,9 @@
yeshi_ec_special where b_id = #{id,jdbcType=BIGINT}</delete>
<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.homemodule.Special"
useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_special
- (b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_min_android_version_code,b_min_ios_version_code,b_start_time,b_end_time,b_createtime,b_updatetime)
+ (b_id,b_name,b_card,b_card_id,b_main_picture,b_icon,b_sub_picture,b_jumpid,b_params,b_jump_login,b_orderby,b_order_man,b_order_woman,b_state,b_sex,b_show_type,b_remark,b_min_android_version_code,b_min_ios_version_code,b_start_time,b_end_time,b_createtime,b_updatetime,b_system)
values
- (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{card,jdbcType=VARCHAR},#{cardId,jdbcType=BIGINT},#{picture,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{subPicture,jdbcType=VARCHAR},#{jumpDetail.id,jdbcType=BIGINT},#{params,jdbcType=VARCHAR},#{jumpLogin,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{orderMan,jdbcType=INTEGER},#{orderWoman,jdbcType=INTEGER},#{state,jdbcType=BIGINT},#{sex,jdbcType=INTEGER},#{showType,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{minAndroidVersionCode,jdbcType=INTEGER},#{minIOSVersionCode,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
+ (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{card,jdbcType=VARCHAR},#{cardId,jdbcType=BIGINT},#{picture,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{subPicture,jdbcType=VARCHAR},#{jumpDetail.id,jdbcType=BIGINT},#{params,jdbcType=VARCHAR},#{jumpLogin,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{orderMan,jdbcType=INTEGER},#{orderWoman,jdbcType=INTEGER},#{state,jdbcType=BIGINT},#{sex,jdbcType=INTEGER},#{showType,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{minAndroidVersionCode,jdbcType=INTEGER},#{minIOSVersionCode,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.Special"
useGeneratedKeys="true" keyProperty="id">
insert into yeshi_ec_special
@@ -113,6 +114,7 @@
<if test="endTime != null">b_end_time,</if>
<if test="createtime != null">b_createtime,</if>
<if test="updatetime != null">b_updatetime,</if>
+ <if test="system != null">b_system,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -139,6 +141,7 @@
<if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</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.bus.homemodule.Special">update
@@ -159,7 +162,7 @@
#{remark,jdbcType=VARCHAR},b_min_android_version_code = #{minAndroidVersionCode,jdbcType=INTEGER},b_min_ios_version_code = #{minIOSVersionCode,jdbcType=INTEGER},
b_start_time = #{startTime,jdbcType=TIMESTAMP},b_end_time = #{endTime,jdbcType=TIMESTAMP},b_createtime =
#{createtime,jdbcType=TIMESTAMP},b_updatetime =
- #{updatetime,jdbcType=TIMESTAMP},b_sex=#{sex,jdbcType=INTEGER} where
+ #{updatetime,jdbcType=TIMESTAMP},b_sex=#{sex,jdbcType=INTEGER},b_system=#{system,jdbcType=VARCHAR} where
b_id = #{id,jdbcType=BIGINT}</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.Special">
update yeshi_ec_special
@@ -186,6 +189,7 @@
<if test="endTime != null">b_end_time=#{endTime,jdbcType=TIMESTAMP},</if>
<if test="createtime != null">b_createtime=#{createtime,jdbcType=TIMESTAMP},</if>
<if test="updatetime != null">b_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>
+ <if test="system != null">b_system=#{system,jdbcType=VARCHAR},</if>
</set>
where b_id = #{id,jdbcType=BIGINT}
</update>
@@ -339,19 +343,6 @@
limit 1
</select>
- <select id="listBySystemAndCard" resultMap="BaseResultMap">
- SELECT p.* FROM
- `yeshi_ec_special` p LEFT JOIN `yeshi_ec_special_card` c ON
- p.`b_card_id` = c.`cd_id`
- LEFT JOIN `yeshi_ec_super_special_card` s ON
- s.`sp_special_cid` = c.`cd_id`
- WHERE p.`b_state` = 0 AND c.`cd_state` =
- 0
- AND c.`cd_card` = #{card} AND s.`sp_system_id` = #{systemId}
- ORDER BY
- p.`b_orderby`
- </select>
-
<select id="listByVersion" resultMap="BaseResultMap">
SELECT sp.*,c.`cd_bottom_picture` FROM `yeshi_ec_special` sp
RIGHT JOIN
@@ -362,7 +353,8 @@
AND IF(c.`cd_end_time` IS NULL,TRUE,c.`cd_end_time`<![CDATA[>=]]>NOW())
AND pc.`sp_key` = #{placeKey}
LIMIT 1)c ON sp.`b_card_id` = c.`cd_id`
- WHERE sp.`b_state` = 0
+ WHERE sp.`b_state` = 0
+ AND sp.b_system=#{system}
AND IF(sp.b_start_time IS NULL,TRUE, sp.b_start_time<![CDATA[<=]]> NOW())
AND IF(sp.b_end_time IS NULL,TRUE, sp.b_end_time <![CDATA[>=]]> NOW())
<if test="platform == 1">
@@ -375,23 +367,6 @@
LIMIT ${start},${count}
</select>
-
- <select id="listPageBySystemAndCard" resultMap="BaseResultMap">
- SELECT p.* FROM
- `yeshi_ec_special` p LEFT JOIN `yeshi_ec_special_card` c ON
- p.`b_card_id` = c.`cd_id`
- LEFT JOIN `yeshi_ec_super_special_card` s ON
- s.`sp_special_cid` = c.`cd_id`
- WHERE p.`b_state` = 0 AND c.`cd_state` =
- 0 AND s.sp_id is not null
- AND c.`cd_card` = #{card} AND
- s.`sp_system_id` = #{systemId}
- ORDER BY
- p.`b_orderby`
- LIMIT
- ${start},${count}
- </select>
-
<select id="listByPlaceKey" resultMap="BaseResultMap">
SELECT sp.*,c.`cd_bottom_picture` FROM `yeshi_ec_special` sp
RIGHT JOIN
@@ -400,6 +375,7 @@
`yeshi_ec_special_place` pc ON pc.`sp_id` = c.`cd_place_id`
WHERE
c.`cd_state` = 0
+ AND sp.b_system=#{system}
AND IF(c.`cd_start_time` IS NULL,TRUE,
c.`cd_start_time`<![CDATA[<=]]>NOW())
AND IF(c.`cd_end_time` IS NULL,TRUE,c.`cd_end_time`<![CDATA[>=]]>NOW())
@@ -427,6 +403,7 @@
`yeshi_ec_special_place` pc ON pc.`sp_id` = c.`cd_place_id`
WHERE
c.`cd_state` = 0
+ AND sp.b_system=#{system}
AND IF(c.`cd_start_time` IS NULL,TRUE,
c.`cd_start_time`<![CDATA[<=]]>NOW())
AND IF(c.`cd_end_time` IS NULL,TRUE,c.`cd_end_time`<![CDATA[>=]]>NOW())
@@ -458,6 +435,7 @@
`yeshi_ec_special_place` pc ON pc.`sp_id` = c.`cd_place_id`
WHERE
c.`cd_state` = 0
+ AND sp.b_system=#{system}
AND IF(c.`cd_start_time` IS NULL,TRUE,
c.`cd_start_time`<![CDATA[<=]]>NOW())
AND IF(c.`cd_end_time` IS NULL,TRUE,c.`cd_end_time`<![CDATA[>=]]>NOW())
@@ -487,6 +465,7 @@
`yeshi_ec_special_place` pc ON pc.`sp_id` = c.`cd_place_id`
WHERE
c.`cd_state` = 0
+ AND sp.b_system=#{system}
AND IF(c.`cd_start_time` IS NULL,TRUE,
c.`cd_start_time`<![CDATA[<=]]>NOW())
AND IF(c.`cd_end_time` IS NULL,TRUE,c.`cd_end_time`<![CDATA[>=]]>NOW())
--
Gitblit v1.8.0