From 61c21f17b1ad94e4b0018c7e385195bab21b0b5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 19:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 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 b2b7b79..b4bd739 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
@@ -7,6 +7,7 @@
 
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.yeshi.utils.entity.ProxyIP;
@@ -19,6 +20,7 @@
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
 
 import net.sf.json.JSONArray;
 
@@ -192,4 +194,48 @@
 		}
 	}
 
+	
+	
+	@Cacheable(value = "config", key = "'getSearchDiscoveryKeys'")
+	@Override
+	public String getSearchDiscoveryKeys() {
+		List<Config> list = configMapper.listByKey("search_discovery_keys");
+		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) 
+				return; // 瓒呰繃涓�涓皬鏃舵洿鏂�
+		}
+		
+		String hotWords = DaTaoKeApiUtil.getHotWords();
+		if (StringUtil.isNullOrEmpty(hotWords))
+			return ;
+		
+		config.setValue(hotWords);
+		config.setCreatetime(currentTime + "");
+		configMapper.updateByPrimaryKeySelective(config);
+	}
 }

--
Gitblit v1.8.0