From ebce479a2d0634c90e5f80045e204248336b410d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 30 五月 2019 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java | 93 +++++++++-------------------------------------
1 files changed, 18 insertions(+), 75 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
index 655155b..66aad77 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
@@ -8,13 +8,9 @@
import org.springframework.stereotype.Component;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.ActivityException;
-import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
@@ -22,7 +18,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
/**
* 娣樺疂鍟嗗搧鏇寸粏
@@ -38,9 +33,6 @@
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
-
- @Resource
private ActivityService activityService;
@Resource
@@ -51,39 +43,9 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
+
@Resource
private QualityFlashSaleService qualityFlashSaleService;
-
-
- @Scheduled(cron = "0 0 0 * * ?")
- public void doJob() {
- if (!Constant.IS_TASK)
- return;
- taoBaoGoodsBriefService.getUpdateTaoBao();
- }
-
- // 涓ゅ皬鏃舵墽琛屼竴娆� 瀵规帹鑽愬晢鍝佷俊鎭繘琛屾洿鏂�
- @Scheduled(cron = "0 0 */2 * * ?")
- public void doUpdateJob() {
- if (!Constant.IS_TASK)
- return;
- List<RecommendSectionGoods> list = taoBaoGoodsBriefService.listRecommendSectionGoods();
- for (RecommendSectionGoods recommendSectionGoods : list) {
- try {
- TaoBaoGoodsBrief goods = TaoKeApiUtil
- .searchGoodsDetail(recommendSectionGoods.getTaoBaoGoodsBrief().getAuctionId());
- taoBaoGoodsUpdateService.updateTaoBaoGoods(goods);
- } catch (TaobaoGoodsDownException e1) {
- taoBaoGoodsUpdateService. offlineTaoBaoGoods(recommendSectionGoods.getTaoBaoGoodsBrief().getAuctionId());
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- }
- }
- }
- }
// 鍔ㄦ�佸晢鍝佹洿鏂� 锛�1涓皬鏃舵洿鏂�
@Scheduled(cron = "0 0 */1 * * ?")
@@ -121,16 +83,9 @@
}
try {
- LogHelper.test("---鎵ц--updateQualityFactoryWeightJob--");
-
qualityFactoryService.updateWeight(10, 3);
-
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
@@ -147,56 +102,44 @@
// 娣诲姞绮鹃�夊簱涓渶瑕佹洿鏂扮殑娣樺疂鍟嗗搧ID(2涓皬鏃舵墽琛屼竴娆�)
@Scheduled(cron = "0 0 1/2 * * ? ")
public void addNeddUpdateTaoBaoGoods() {
- if (!Constant.IS_TASK) {
+ if (!Constant.IS_TASK)
+ return;
+
+ List<Long> list = qualityFactoryService.queryNeedUpdate(0, 1000, 4);
+ if (list == null || list.size() == 0) {
return;
}
- LogHelper.test("---addNeddUpdateTaoBaoGoods----execute ");
-
- List<Long> list = qualityFactoryService.queryNeedUpdate(0, 3000, 4);
- if (list != null) {
- for (Long id : list) {
- try {
- CMQManager.getInstance().addNeedUpdateTaoBaoGoodsId(id);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
+ for (Long id : list) {
+ try {
+ CMQManager.getInstance().addNeedUpdateTaoBaoGoodsId(id);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
}
}
-
-
+
/**
* 瀹氭椂娓呯悊瓒呰繃6涓皬鏃舵湭鏇存柊鐨勯檺鏃舵姠璐晢鍝�
*/
@Scheduled(cron = "0 15 0/6 * * ? ")
public void removeFlashSaleGoods() {
-
+
if (!Constant.IS_TASK) {
return;
}
-
+
try {
while (true) {
- List<Long> list = qualityFlashSaleService.queryNeedRemove(0, 100, 6);
-
+ List<Long> list = qualityFlashSaleService.queryNeedRemove(0, 200, 6);
if (list == null || list.size() == 0) {
break;
- }
-
+ }
qualityFlashSaleService.deleteBatchByPrimaryKey(list);
}
-
+
} catch (Exception e) {
- try {
LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
}
}
--
Gitblit v1.8.0