From eb78e9183005efa02064956cc9ef2299dc2d2bdd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 15 八月 2019 16:01:58 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 765adde..a447af8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -67,6 +67,7 @@
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import redis.clients.jedis.JedisPool;
@Controller
@RequestMapping("test")
@@ -97,16 +98,22 @@
@Resource
private ConfigService configService;
-
+
@Resource
private HongBaoManageService hongBaoManageService;
@Resource
private InviteMaterialService inviteMaterialService;
+
@Resource
private DynamicInfoDao dynamicInfoDao;
+
+
+ @Resource
+ private JedisPool jedisPool;
+
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -431,9 +438,10 @@
e.printStackTrace();
}
}
-
+
/**
* 鎻掑叆閭�璇风礌鏉�
+ *
* @param out
*/
@RequestMapping(value = "getJingFenList")
@@ -456,7 +464,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -470,6 +478,7 @@
e.printStackTrace();
}
}
+
/**
@@ -512,4 +521,11 @@
e.printStackTrace();
}
}
+
+
+ @RequestMapping(value = "getWaitingThreadsCount")
+ public void getWaitingThreadsCount(PrintWriter out) {
+ out.print(Constant.waitingThreadSet.size());
+
+ }
}
--
Gitblit v1.8.0