From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java | 75 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
index 4bd3795..30a0aed 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -10,6 +10,7 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
@@ -31,9 +32,9 @@
@Scheduled(cron = "0 0/10 6-23 * * ?")
public void insetDynamicInfo() {
-// if (!Constant.IS_TASK) {
-// return;
-// }
+ if (!Constant.IS_TASK) {
+ return;
+ }
try {
dynamicInfoService.insertTimeHotSale();
@@ -64,9 +65,9 @@
@Scheduled(cron = "0 0 6,7,15,16,21,22,23 * * ? ")
public void insetShopInfo1() {
-// if (!Constant.IS_TASK) {
-// return;
-// }
+ if (!Constant.IS_TASK) {
+ return;
+ }
try {
dynamicInfoService.insertShopInfo();
@@ -85,9 +86,9 @@
@Scheduled(cron = "0 0/30 8,9,10 * * ?")
public void insetShopInfo2() {
-// if (!Constant.IS_TASK) {
-// return;
-// }
+ if (!Constant.IS_TASK) {
+ return;
+ }
try {
dynamicInfoService.insertShopInfo();
@@ -107,9 +108,9 @@
@Scheduled(cron = "0 0/30 11,12,13,14 * * ?")
public void insetShopInfo3() {
-// if (!Constant.IS_TASK) {
-// return;
-// }
+ if (!Constant.IS_TASK) {
+ return;
+ }
try {
dynamicInfoService.insertShopInfo();
@@ -148,15 +149,16 @@
/**
* 姣忓ぉ闆剁偣鍒犻櫎3澶╀箣鍓嶆暟鎹�
*/
- @Scheduled(cron = "0 0 0 * * ?")
+ @Scheduled(cron = "0 0 1,10 * * ?")
public void remove() {
-// if (!Constant.IS_TASK) {
-// return;
-// }
+ if (!Constant.IS_TASK) {
+ return;
+ }
try {
- dynamicInfoService.removeByDate(DateUtil.reduceDay(3, new Date()));
+ LogHelper.test("DynamicInfoJob-remove-寮�濮嬫墽琛屾��");
+ dynamicInfoService.removeByDate(DateUtil.reduceDay(2, new Date()));
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -173,9 +175,9 @@
@Scheduled(cron = "0 0/3 * * * ?")
public void activityNeedPublish() {
-// if (!Constant.IS_TASK) {
-// return;
-// }
+ if (!Constant.IS_TASK) {
+ return;
+ }
try {
List<RecommendActivity> list = activityService.getNeedPublish();
@@ -188,20 +190,17 @@
Integer type = activity.getType();
if (RecommendActivity.TYPE_SHARE_GOODS == type) {
// 鍟嗗搧鍔ㄦ��
- dynamicInfoService.saveActivityRecommend(activity);
+ dynamicInfoService.insertActivityRecommend(activity);
activity.setState(1);
activityService.updateByPrimaryKeySelective(activity);
} else if (RecommendActivity.TYPE_INVITE == type) {
// 閭�璇风礌鏉�
- String imgUrl = null;
- List<String> imageList = activityService.getImgByActivityId(activity.getId());
- if (imageList != null && imageList.size() > 0) {
- imgUrl = imageList.get(0);
- }
+ RecommendActivityInviteInfo inviteInfo = activityService.getRecommendActivityInviteInfoByActivityId(activity.getId());
+ activity.setInviteInfo(inviteInfo);
- dynamicInfoService.insertInviteMaterial(activity.getTitle(), imgUrl, activity.getId(), activity.getActivityUser());
+ dynamicInfoService.insertInviteActivity(activity);
activity.setState(1);
activityService.updateByPrimaryKeySelective(activity);
@@ -218,4 +217,26 @@
}
+ /**
+ * 姣忓ぉ6鐐瑰ぉ鏇存柊閭�璇风礌鏉�
+ */
+ @Scheduled(cron = "0 0 6 * * ?")
+ public void insertTimeInvite() {
+
+ if (!Constant.IS_TASK) {
+ return;
+ }
+
+ try {
+ dynamicInfoService.insertTimeInvite();
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
+
}
--
Gitblit v1.8.0