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/service/impl/homemodule/FloatADServiceImpl.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
index 7788f95..b414e8f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
@@ -12,6 +12,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -174,7 +175,6 @@
 
 	/**
 	 * 鍒犻櫎鍥剧墖-涓嶆洿鏂版暟鎹簱
-	 * @param record
 	 * @throws Exception
 	 */
 	public void removePicture(String picture) throws Exception {
@@ -392,13 +392,12 @@
 		}
 	}
 	
-	@Cacheable(value = "configCache", key = "'getValidFloatADCache-'+#position+'-'+#type+'-'+#platform+'-'+#versionCode")
+	@Cacheable(value = "configCache", key = "'getValidFloatADCache-'+#position+'-'+#type+'-'+#platform+'-'+#versionCode+'-'+system")
 	@Override
-	public List<FloatAD> getValidFloatADCache(String position, Integer type, String platform, Integer versionCode) {
+	public List<FloatAD> getValidFloatADCache(String position, Integer type, String platform, Integer versionCode, SystemEnum system) {
 		List<FloatAD> list = floatADMapper.getValidFloatAD(position, type);
 		// 杩囨护
-		filterFloatAD(list, platform, versionCode);
-		
+		filterFloatAD(list, platform, versionCode,system);
 		return list;
 	}
 	
@@ -409,10 +408,10 @@
 	 * @param platform
 	 * @param versionCode
 	 */
-	private void filterFloatAD(List<FloatAD> list, String platform, int versionCode) {
+	private void filterFloatAD(List<FloatAD> list, String platform, int versionCode, SystemEnum system) {
 		if (list == null || list.size() == 0)
 			return;
-		AppVersionInfo app = appVersionService.getClientVersion(platform, versionCode);
+		AppVersionInfo app = appVersionService.getClientVersion(platform, versionCode,system);
 		if (app == null) {
 			list.clear();
 			return;

--
Gitblit v1.8.0