From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 b6e6e08..91896fe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -56,6 +56,7 @@
import com.yeshi.fanli.util.FileUtil;
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;
@@ -63,6 +64,8 @@
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
@Controller
@RequestMapping("test")
@@ -93,12 +96,15 @@
@Resource
private ConfigService configService;
-
+
@Resource
private HongBaoManageService hongBaoManageService;
@Resource
private InviteMaterialService inviteMaterialService;
+
+ @Resource
+ private JedisPool jedisPool;
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -423,9 +429,10 @@
e.printStackTrace();
}
}
-
+
/**
* 鎻掑叆閭�璇风礌鏉�
+ *
* @param out
*/
@RequestMapping(value = "getJingFenList")
@@ -448,8 +455,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -463,4 +469,9 @@
e.printStackTrace();
}
}
+
+ @RequestMapping(value = "getWaitingThreadsCount")
+ public void getWaitingThreadsCount(PrintWriter out) {
+ out.print(Constant.waitingThreadSet.size());
+ }
}
--
Gitblit v1.8.0