From 89930d9c3e91f617514c50f86d16a2385d52cdc2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 05 六月 2019 14:54:06 +0800
Subject: [PATCH] 用户信息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java |   55 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
index c87fbf3..9ad6c4b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
@@ -3,14 +3,12 @@
 import java.io.PrintWriter;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import javax.annotation.Resource;
-import javax.print.attribute.standard.NumberUp;
 
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Controller;
@@ -24,7 +22,6 @@
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.lable.QualityFactory;
 import com.yeshi.fanli.entity.bus.recommend.Honest;
-import com.yeshi.fanli.entity.bus.search.HistorySearch;
 import com.yeshi.fanli.entity.bus.search.HotSearch;
 import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
 import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -36,13 +33,13 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
 import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.service.inter.user.HistorySearchService;
 import com.yeshi.fanli.util.Constant;
@@ -52,7 +49,6 @@
 import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
 import com.yeshi.fanli.util.taobao.SearchFilterUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 import net.sf.ehcache.Element;
 import net.sf.json.JSONArray;
@@ -88,6 +84,10 @@
 
 	@Resource
 	private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
+	
+	@Resource
+	private TaoBaoShopService taoBaoShopService;
+	
 
 	@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
 	public void getHotSearch(AcceptData acceptData, PrintWriter out) {
@@ -410,12 +410,12 @@
 
 		historySearchService.addHistorySearch(kw, bid);
 
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-				acceptData.getPackages());
-		if (system == null) {
-			out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
-			return;
-		}
+//		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+//				acceptData.getPackages());
+//		if (system == null) {
+//			out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
+//			return;
+//		}
 
 		if (!StringUtil.isNullOrEmpty(kw) && (kw.startsWith("http://") || kw.startsWith("https://"))) {
 			out.print(JsonUtil.loadFalseResult("鏃犳硶鎼滅储閾炬帴"));
@@ -608,19 +608,20 @@
 		}
 		// 鎼滅储鏄惁鍦ㄨ惀閿�涓诲晢鍝佸簱
 		if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
-			String numIds = "";
-			for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
-				numIds += goods.getAuctionId() + ",";
-			}
-			if (numIds.endsWith(","))
-				numIds = numIds.substring(0, numIds.length() - 1);
-			try {
-				List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getBatchGoodsInfos(numIds);
-				Map<Long, Integer> map = new HashMap<>();
-				for (TaoBaoGoodsBrief g : goodsList)
-					map.put(g.getAuctionId(), g.getMaterialLibType());
-				for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
-					goods.setMaterialLibType(map.get(goods.getAuctionId()));
+//          鏆傛椂鏀惧純鏇存柊鍒拌惀閿�鍟嗗搧搴�
+//			String numIds = "";
+//			for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
+//				numIds += goods.getAuctionId() + ",";
+//			}
+//			if (numIds.endsWith(","))
+//				numIds = numIds.substring(0, numIds.length() - 1);
+//			try {
+//				List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getBatchGoodsInfos(numIds);
+//				Map<Long, Integer> map = new HashMap<>();
+//				for (TaoBaoGoodsBrief g : goodsList)
+//					map.put(g.getAuctionId(), g.getMaterialLibType());
+//				for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
+//					goods.setMaterialLibType(map.get(goods.getAuctionId()));
 
 				ThreadUtil.run(new Runnable() {
 					@Override
@@ -630,9 +631,9 @@
 							taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods);
 					}
 				});
-			} catch (TaobaoGoodsDownException e) {
-				e.printStackTrace();
-			}
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//			}
 
 		}
 

--
Gitblit v1.8.0