From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |   89 +++++++++++++++++---------------------------
 1 files changed, 35 insertions(+), 54 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 374edf2..8764e7b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -34,15 +34,14 @@
 import com.google.gson.GsonBuilder;
 import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
 import com.yeshi.fanli.dao.mybatis.help.HelpCenterMapper;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
-import com.yeshi.fanli.dto.jd.JDSearchResult;
 import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
 import com.yeshi.fanli.entity.dynamic.InviteMaterial;
-import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.ActivityException;
 import com.yeshi.fanli.exception.push.PushException;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
+import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -52,16 +51,13 @@
 import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
-import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.db.MongoDBManager;
-import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
-import com.yeshi.fanli.util.jd.JDApiUtil;
 import com.yeshi.fanli.util.push.OPPOPushUtil;
-import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -115,8 +111,6 @@
 
 	@Resource
 	private UserMoneyExtraService userMoneyExtraService;
-	
-	
 
 	@RequestMapping(value = "kefu")
 	public void kefu(HttpServletRequest request, PrintWriter out) {
@@ -324,50 +318,7 @@
 			e.printStackTrace();
 		}
 	}
-
-	/**
-	 * 鎻掑叆閭�璇风礌鏉�
-	 * 
-	 * @param out
-	 */
-	@RequestMapping(value = "getJingFenList")
-	public void getJingFenList(String callback, Integer page, Integer eliteId, PrintWriter out) {
-		try {
-			JDSearchResult result = JDApiUtil.getJingFenGoods(page, eliteId);
-			long count = 0;
-			JSONObject data = new JSONObject();
-			JSONArray array = new JSONArray();
-			if (result != null) {
-				PageEntity pageEntity = result.getPageEntity();
-				if (pageEntity != null) {
-					count = pageEntity.getTotalCount();
-				}
-
-				List<JDGoods> goodsList = result.getGoodsList();
-				if (goodsList != null && goodsList.size() > 0) {
-					BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
-					BigDecimal shareRate = hongBaoManageService.getShareRate();
-					ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
-							hongBaoManageService.getVIPFanLiRate());
-
-					Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
-							.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-					for (JDGoods goods : goodsList) {
-						GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
-						array.add(gson.toJson(goodsDetailVO));
-					}
-				}
-			}
-
-			data.put("count", count);
-			data.put("list", array);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
-			e.printStackTrace();
-		}
-	}
-
+
 	@RequestMapping(value = "getWaitingThreadsCount")
 	public void getWaitingThreadsCount(PrintWriter out) {
 		out.print(Constant.waitingThreadSet.size());
@@ -435,5 +386,35 @@
 			}
 		} catch (Exception e) {
 		}
-	}
+	}
+
+	@RequestMapping("getTBGoodsCate")
+	public void getTaoBaoGoodsCat(Long id, PrintWriter out) {
+		TaoBaoGoodsBrief goods = null;
+		try {
+			goods = TaoKeApiUtil.getSimpleGoodsInfo(id);
+		} catch (TaobaoGoodsDownException e) {
+			e.printStackTrace();
+		}
+		if (goods == null)
+			out.println("鍟嗗搧宸蹭笅鏋�");
+		else
+			out.println(
+					"<html><head><meta charset=utf-8></head><body>" + String.format("cat_name:%s <br> cat_leaf_name:%s",
+							goods.getRootCategoryName(), goods.getLeafName()) + "</body></html>");
+	}
+
+	@RequestMapping("getJedisInfo")
+	public void getJedisInfo(PrintWriter out) {
+		JSONObject data = new JSONObject();
+		data.put("active", jedisPool.getNumActive());
+		data.put("idle", jedisPool.getNumIdle());
+		data.put("waiters", jedisPool.getNumWaiters());
+		out.print(data.toString());
+	}
+	
+	
+	
+	
+	
 }

--
Gitblit v1.8.0