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/service/impl/config/ConfigServiceImpl.java |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
index b4bd739..6c687a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
@@ -63,7 +63,24 @@
 
 	@Cacheable(value = "config", key = "#p0+'Str'")
 	public String get(String key) {
-		List<Config> list = configMapper.listByKey(key);
+		List<Config> list = configMapper.listByKey(key, null, null);
+		if (list.size() == 0) {
+			return null;
+		}
+		String value = list.get(0).getValue();
+		return value;
+	}
+
+	@Cacheable(value = "config", key = "'getByVersion'+'-'+#key+'-'+#platform+'-'+#version ")
+	public String getByVersion(String key, String platform, int version) {
+		Integer minAndroidVersion = null;
+		Integer minIosVersion = null;
+		if ("android".equalsIgnoreCase(platform)) {
+			minAndroidVersion = version;
+		} else
+			minIosVersion = version;
+
+		List<Config> list = configMapper.listByKey(key, minAndroidVersion, minIosVersion);
 		if (list.size() == 0) {
 			return null;
 		}
@@ -73,7 +90,7 @@
 
 	@Cacheable(value = "config", key = "#p0")
 	public Config getConfig(String key) {
-		List<Config> list = configMapper.listByKey(key);
+		List<Config> list = configMapper.listByKey(key, null, null);
 		if (list.size() == 0) {
 			return null;
 		}
@@ -188,52 +205,50 @@
 
 	@Override
 	public void save(Config config) {
-		List<Config> list = configMapper.listByKey(config.getKey());
+		List<Config> list = configMapper.listByKey(config.getKey(), null, null);
 		if (list == null || list.size() == 0) {
 			configMapper.insertSelective(config);
 		}
 	}
 
-	
-	
 	@Cacheable(value = "config", key = "'getSearchDiscoveryKeys'")
 	@Override
 	public String getSearchDiscoveryKeys() {
-		List<Config> list = configMapper.listByKey("search_discovery_keys");
+		List<Config> list = configMapper.listByKey("search_discovery_keys", null, null);
 		if (list == null || list.size() == 0)
 			return null;
-		
+
 		Config config = list.get(0);
 		if (config == null)
 			return null;
-		
+
 		// 鏇存柊
 		updateSearchDiscoveryKeys(config);
-		
+
 		String value = config.getValue();
 		return value;
 	}
-	
-	
+
 	/**
 	 * 鏇存柊鎼滅储鍙戠幇璇�
+	 * 
 	 * @param config
 	 */
 	@Async
 	private void updateSearchDiscoveryKeys(Config config) {
 		long currentTime = java.lang.System.currentTimeMillis();
-		
+
 		String createtime = config.getCreatetime();
 		if (!StringUtil.isNullOrEmpty(createtime)) {
 			long diff = currentTime - Long.parseLong(createtime);
-			if (diff < 1000 * 60 * 60) 
+			if (diff < 1000 * 60 * 60)
 				return; // 瓒呰繃涓�涓皬鏃舵洿鏂�
 		}
-		
+
 		String hotWords = DaTaoKeApiUtil.getHotWords();
 		if (StringUtil.isNullOrEmpty(hotWords))
-			return ;
-		
+			return;
+
 		config.setValue(hotWords);
 		config.setCreatetime(currentTime + "");
 		configMapper.updateByPrimaryKeySelective(config);

--
Gitblit v1.8.0