From d440fc97a7061447fe44ae333e86b29357439104 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 11:01:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 61 ++++++++++++++----------------
1 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index 2b3d71b..81d776d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -205,12 +205,13 @@
public void run() {
while (true) {
try {
+
// 鍙�16涓鍗�
List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
- Map<String, List<TaoBaoOrder>> map = new HashMap<>();
if (orderIds != null) {
for (String orderId : orderIds) {
if (NumberUtil.isNumeric(orderId.trim())) {
+ Map<String, List<TaoBaoOrder>> map = new HashMap<>();
List<TaoBaoOrder> orderList = taoBaoOrderService
.getTaoBaoOrderByOrderId(orderId);
map.put(orderId, orderList);
@@ -569,7 +570,6 @@
}
} catch (Exception e) {
LogHelper.error("杩樻鍑洪敊:" + e.getMessage());
-
}
}
}
@@ -634,17 +634,12 @@
}
PDDOrderCMQManager.getInstance().deletePDDOrder(key);
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
}
} catch (Exception e) {
LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
-
}
}
}
@@ -656,36 +651,38 @@
* 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂�
*/
public void doImportantTaoBaoGoodsUpdateJob() {
- executor.execute(new Runnable() {
- @Override
- public void run() {
- while (true) {
- Map<String, Long> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16);
- if (map != null) {
- Iterator<String> its = map.keySet().iterator();
- while (its.hasNext()) {
- String key = its.next();
- try {
- long startTime = System.currentTimeMillis();
- TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(map.get(key));
- // 鏇存柊涓�鏉℃暟鎹渶瑕佺殑鏃堕棿
- taoBaoGoodsUpdateService.updateTaoBaoGoods(goods);
- long time = System.currentTimeMillis() - startTime;
- LogHelper.test("娣樺疂閲嶈鍟嗗搧搴撴洿鏂版椂闂�:" + time);
- } catch (Exception e) {
+ // 寮�鍚�2涓嚎绋嬪仛鏇存柊
+ for (int i = 0; i < 2; i++)
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ Map<String, Long> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
+ long startTime = System.currentTimeMillis();
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(map.get(key));
+ // 鏇存柊涓�鏉℃暟鎹渶瑕佺殑鏃堕棿
+ taoBaoGoodsUpdateService.updateTaoBaoGoods(goods);
+ long time = System.currentTimeMillis() - startTime;
+ LogHelper.test("娣樺疂閲嶈鍟嗗搧搴撴洿鏂版椂闂�:" + time);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+ CMQManager.getInstance().deleteTBImpGoodsUpdateMsg(key);
}
- } finally {
- CMQManager.getInstance().deleteTBImpGoodsUpdateMsg(key);
}
}
}
}
- }
- });
+ });
}
--
Gitblit v1.8.0