From 4d62a3cd87461bd07e8d939bd57585b29df22679 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 17 Aug 2023 10:06:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/constants/CommonConstants.java | 2 ++ .../src/main/java/com/cool/store/job/JobHandler.java | 5 +++++ .../com/cool/store/service/impl/FollowTaskServiceImpl.java | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 7bfc6f949..f9b7ff03a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -105,6 +105,8 @@ public class CommonConstants { public static final int HUNDRED = 100; public static final int FIVE_HUNDRED = 100; public static final int ONE_THOUSAND = 1000; + public static final int FIFTY_FIVE = 55; + public static final int SIXTY_FIVE = 65; public static final String ONE_STR = "1"; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java index ec08b357f..3ad9abfd5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java @@ -1,11 +1,14 @@ package com.cool.store.job; +import com.cool.store.constants.CommonConstants; import com.cool.store.service.EnterpriseSyncService; import com.cool.store.service.FollowTaskService; import com.cool.store.service.HyPartnerInterviewPlanService; +import com.cool.store.utils.UUIDUtils; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; +import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -83,6 +86,7 @@ public class JobHandler { @XxlJob("followTaskAnHourAgoRemind") public void followTaskAnHourAgoRemind(){ try { + MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get8UUID()); log.info("跟进任务前一小时提醒开始"); followTaskService.followTaskAnHourAgoRemind(); log.info("跟进任务前一小时提醒结束"); @@ -96,6 +100,7 @@ public class JobHandler { @XxlJob("followTaskDailyRemind") public void followTaskDailyRemind(){ try { + MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get8UUID()); log.info("跟进任务提醒开始"); followTaskService.followTaskDailyRemind(); log.info("跟进任务提醒结束"); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java index 5a94e87b7..85ac2d809 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java @@ -189,8 +189,8 @@ public class FollowTaskServiceImpl implements FollowTaskService { //获取一个小时后的任务 Boolean hasNext = true; int pageNum = CommonConstants.ONE, pageSize = CommonConstants.HUNDRED; - String startTime = DateUtil.format(DateUtils.addMinutes(new Date(), -CommonConstants.FIVE), CoolDateUtils.DATE_FORMAT_SEC); - String endTime = DateUtil.format(DateUtils.addMinutes(new Date(), CommonConstants.FIVE), CoolDateUtils.DATE_FORMAT_SEC); + String startTime = DateUtil.format(DateUtils.addMinutes(new Date(), CommonConstants.FIFTY_FIVE), CoolDateUtils.DATE_FORMAT_SEC); + String endTime = DateUtil.format(DateUtils.addMinutes(new Date(), CommonConstants.SIXTY_FIVE), CoolDateUtils.DATE_FORMAT_SEC); while (hasNext){ Page undoTaskList = hyFollowTaskDAO.getUndoTaskPage(startTime, endTime, pageNum, pageSize); if(CollectionUtils.isEmpty(undoTaskList)){