From 4ea48ee6d71a4877aa2644ecf3c4758e26a91149 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 09 九月 2019 14:56:17 +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/TestController.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 a447af8..c0f1e03 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -8,7 +8,9 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import javax.annotation.Resource;
@@ -67,6 +69,7 @@
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
@Controller
@@ -104,16 +107,12 @@
@Resource
private InviteMaterialService inviteMaterialService;
-
-
+
@Resource
private DynamicInfoDao dynamicInfoDao;
-
-
@Resource
private JedisPool jedisPool;
-
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -478,9 +477,7 @@
e.printStackTrace();
}
}
-
-
-
+
/**
* 鎻掑叆閭�璇风礌鏉�
*
@@ -490,42 +487,55 @@
public void queryExistsAuctionId(PrintWriter out) {
try {
List<DynamicInfo> list = dynamicInfoDao.queryExistsAuctionId();
- for (DynamicInfo dynamicInfo: list) {
+ for (DynamicInfo dynamicInfo : list) {
List<GoodsPicture> imgs = dynamicInfo.getImgs();
if (imgs == null || imgs.size() == 0) {
continue;
}
-
+
boolean update = false;
- for (GoodsPicture goodsPicture: imgs) {
+ for (GoodsPicture goodsPicture : imgs) {
TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
if (goods == null) {
continue;
}
-
+
if (goods.getAuctionId() == null) {
update = true;
goods.setAuctionId(goods.getId());
}
}
-
+
if (update) {
dynamicInfo.setImgs(imgs);
dynamicInfoDao.updateGoodInfo(dynamicInfo);
}
}
JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
-// JsonUtil.printMode(out, null, JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(list)));
+ // JsonUtil.printMode(out, null,
+ // JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(list)));
} catch (Exception e) {
JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
-
@RequestMapping(value = "getWaitingThreadsCount")
public void getWaitingThreadsCount(PrintWriter out) {
out.print(Constant.waitingThreadSet.size());
-
+ }
+
+ @RequestMapping(value = "getBinFaRedisKey")
+ public void getPinFaRedisKey(PrintWriter out) {
+ JSONArray array = new JSONArray();
+ Jedis jedis = jedisPool.getResource();
+ try {
+ Set<String> sets = jedis.keys("rs-*");
+ for (Iterator<String> its = sets.iterator(); its.hasNext();)
+ array.add(its.next());
+ } finally {
+ jedisPool.returnResource(jedis);
+ }
+ out.println(array.toString());
}
}
--
Gitblit v1.8.0