From 85fa0a9ed1f6cec968ca8e7ee80db872eb22c9cb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 29 五月 2019 10:56:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
index c5e1e9e..5b38d6f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
@@ -13,7 +13,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
@@ -28,7 +28,7 @@
private QualityFactoryService qualityFactoryService;
@Resource
- private DaTaoKeGoodsService daTaoKeGoodsService;
+ private DaTaoKeGoodsDetailService daTaoKeGoodsService;
// 涓ゅ皬鏃舵墽琛屼竴娆� 瀵瑰晢鍝佷俊鎭繘琛屾洿鏂�
@Scheduled(cron = "0 0 0/2 * * ?")
@@ -52,30 +52,30 @@
autoRule.setStartWeight(1);
autoRule.setEndWeight(3000);
autoRule.setGoodsSource(QualityFactory.SOURCE_TAOBAO_DATAOKE);
- qualityFactoryService.autoInsertOrUpadateStorage(listgoods, null, autoRule);
+ qualityFactoryService.autoInsertOrUpadateStorage(autoRule, listgoods, null, null);
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
+ // 20鍒嗛挓鏇存柊涓�娆�
@Scheduled(cron = "0 0/20 * * * ? ")
public void doSyncJob() {
if (!Constant.IS_TASK)
return;
try {
- daTaoKeGoodsService.startSyncGoods();
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ daTaoKeGoodsService.startSyncGoods();
+ }
+ }).start();
+
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
--
Gitblit v1.8.0