From 650e5163ae9eb1adadac0b345b346eb9be0ca81b Mon Sep 17 00:00:00 2001
From: chenhang <3165269033@qq.com>
Date: Wed, 7 Aug 2024 14:08:52 +0800
Subject: [PATCH] 优化定时任务超时时间
---
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/order/erp/job/OrderOverTimeEventJob.java b/src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
index 6d8f84a..e765cfc 100644
--- a/src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
+++ b/src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
@@ -17,23 +17,15 @@ import com.order.erp.domain.dto.order.ReceiveEmailMappingDO;
import com.order.erp.domain.vo.order.*;
import com.order.erp.service.admin.AdminUserService;
import com.order.erp.service.order.*;
-import freemarker.template.TemplateException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-
import javax.annotation.Resource;
-import javax.mail.MessagingException;
-import java.io.IOException;
import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -49,13 +41,6 @@ public class OrderOverTimeEventJob {
@Resource
private OrderBaseInfoService orderBaseInfoService;
-
- @Resource
- private OrderProfitAnalysisService profitAnalysisService;
-
- @Resource
- private OrderCompletionReportService reportService;
-
@Resource
private OrderTrackStageService trackStageService;
@@ -63,9 +48,6 @@ public class OrderOverTimeEventJob {
private OrderInspectionStageService inspectionStageService;
@Resource
- private TransactionHelper transactionHelper;
-
- @Resource
private EmailSendUtils emailSendUtils;
@Resource
@@ -82,7 +64,7 @@ public class OrderOverTimeEventJob {
*/
@Scheduled(cron = "0 0 1 * * ?")
//存储的日期都必须为yyyy-MM-dd HH:mm:ss。
- public void checkOverTimeExecuteV2() throws MessagingException, TemplateException, IOException {
+ public void checkOverTimeExecuteV2() {
List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.getEventList();
if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
@@ -143,8 +125,8 @@ public class OrderOverTimeEventJob {
.eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
.eq(AdminUserDO::getUserName, productionDepartment));
List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
- .stream().map(String::trim)
- .collect(Collectors.toList());
+ .stream().map(String::trim)
+ .collect(Collectors.toList());
emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
productionEmail, orderEventJob);
redisUtils.set(EmailTemplateEnum.byTemplate(
--
libgit2 0.23.3