From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 8ff80dd..c66afa5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -35,7 +35,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
-import com.yeshi.fanli.exception.integral.IntegralGetException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.TokenRecordException;
import com.yeshi.fanli.log.LogHelper;
@@ -57,6 +56,7 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.cache.IntegralGetCacheManager;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -119,6 +119,9 @@
@Resource
private IntegralGetService integralGetService;
+
+ @Resource
+ private IntegralGetCacheManager integralGetCacheManager;
/**
* 绮樿创鏉夸俊鎭帹鑽�
@@ -415,6 +418,7 @@
@RequestMapping(value = "searchGoods")
public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,
Integer order, Long uid, HttpSession session, PrintWriter out) {
+
if (goodsType == null || goodsType < 1 || goodsType > 3) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶閫掓纭钩鍙板弬鏁�"));
return;
@@ -433,24 +437,18 @@
if (uid != null) {
if (page == 1) {
- session.setAttribute("searchFirstTime", System.currentTimeMillis());
- } else if (page == 2) {
- Long lastTime = (Long) session.getAttribute("searchFirstTime");
+ integralGetCacheManager.cacheSearchGoods(acceptData.getDevice(), System.currentTimeMillis());
+ } else if (page > 1) {
+ Long lastTime = integralGetCacheManager.getLastSearchTime(acceptData.getDevice());
if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 瓒呰繃15s娴忚
-
+ integralGetCacheManager.clearSearchTime(acceptData.getDevice());
ThreadUtil.run(new Runnable() {
-
@Override
public void run() {
- try {
- // 澧炲姞閲戝竵
- integralGetService.addSearchResultScan(uid,key);
- } catch (IntegralGetException e) {
- e.printStackTrace();
- }
+ // 澧炲姞閲戝竵
+ integralGetService.addSearchResultScan(uid, key);
}
});
-
}
}
}
--
Gitblit v1.8.0