From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:30:44 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/job/BrandInfoJob.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/BrandInfoJob.java b/fanli/src/main/java/com/yeshi/fanli/job/BrandInfoJob.java
index c252822..ba9082d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/BrandInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/BrandInfoJob.java
@@ -2,9 +2,10 @@
 
 import javax.annotation.Resource;
 
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.brand.BrandInfoService;
 import com.yeshi.fanli.util.Constant;
@@ -24,8 +25,15 @@
 	/**
 	 * 姣忎袱涓皬鏃惰繘琛屾洿鏂板搧鐗屽晢鍝佷俊鎭�
 	 */
-	@Scheduled(cron = "0 0 1/2 * * ? ")
+	// @Scheduled(cron = "0 0 1/2 * * ? ")
+	@XxlJob("brandGoodsUpdateHandler")
+	public ReturnT<String> demoJobHandler(String param) throws Exception {
+		updateGoods();
+		return ReturnT.SUCCESS;
+	}
+
 	public void updateGoods() {
+		System.out.println("鍝佺墝鍟嗗搧鏇存柊鎵ц");
 		if (!Constant.IS_TASK)
 			return;
 		long startTime = java.lang.System.currentTimeMillis();
@@ -33,17 +41,17 @@
 		long count = brandInfoService.countValidByCid(null);
 		if (count == 0)
 			return;
-		
+
 		long totalPage = (count / 100) + 1;
 		for (long page = 0; page < totalPage; page++) {
 			try {
 				brandInfoService.addShopAndGoods(page * 100, 100);
 			} catch (Exception e) {
-			   LogHelper.errorDetailInfo(e);
+				LogHelper.errorDetailInfo(e);
 			}
 		}
 		long endTime = java.lang.System.currentTimeMillis();
-		LogHelper.test("缁撴潫鎵ц鍝佺墝鏇存柊---updateGoods" + endTime + ",鎬昏�楁椂:" +(endTime -startTime) / 1000);
+		LogHelper.test("缁撴潫鎵ц鍝佺墝鏇存柊---updateGoods" + endTime + ",鎬昏�楁椂:" + (endTime - startTime) / 1000);
 	}
-	
+
 }

--
Gitblit v1.8.0