Commit 58ee9833 by zhangxingmin

修复

parent 5228e67e
...@@ -3,6 +3,7 @@ package com.yd.email.api.async; ...@@ -3,6 +3,7 @@ package com.yd.email.api.async;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yd.common.exception.BusinessException; import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.common.utils.DateUtil;
import com.yd.email.api.service.*; import com.yd.email.api.service.*;
import com.yd.email.feign.dto.ApiEmailSenderConfigDto; import com.yd.email.feign.dto.ApiEmailSenderConfigDto;
import com.yd.email.feign.dto.ApiSendMailDto; import com.yd.email.feign.dto.ApiSendMailDto;
...@@ -21,6 +22,7 @@ import org.springframework.stereotype.Component; ...@@ -21,6 +22,7 @@ import org.springframework.stereotype.Component;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
@Slf4j @Slf4j
...@@ -42,6 +44,20 @@ public class ApiEmailSendAsyncService { ...@@ -42,6 +44,20 @@ public class ApiEmailSendAsyncService {
@Autowired @Autowired
private ApiEmailContactService apiEmailContactService; private ApiEmailContactService apiEmailContactService;
@Autowired
private XxlJobService xxlJobService;
/**
* 创建XXL-Job定时任务-异步方法
* @param taskBizId
* @param scheduleTime
*/
@Async("emailTaskExecutor")
public void addScheduleJob(String taskBizId, Date scheduleTime) {
String jobId = xxlJobService.addScheduleJob(taskBizId, scheduleTime);
log.info("创建XXL-Job定时任务成功-->jobId:{}",jobId);
}
/** /**
* 立即发送邮件-异步方法 * 立即发送邮件-异步方法
* @param emailTask * @param emailTask
......
...@@ -32,8 +32,6 @@ import java.util.Objects; ...@@ -32,8 +32,6 @@ import java.util.Objects;
@Slf4j @Slf4j
public class ApiEmailSendServiceImpl implements ApiEmailSendService { public class ApiEmailSendServiceImpl implements ApiEmailSendService {
@Autowired
private XxlJobService xxlJobService;
@Autowired @Autowired
private IEmailTaskService iEmailTaskService; private IEmailTaskService iEmailTaskService;
...@@ -77,10 +75,10 @@ public class ApiEmailSendServiceImpl implements ApiEmailSendService { ...@@ -77,10 +75,10 @@ public class ApiEmailSendServiceImpl implements ApiEmailSendService {
//计划发送时间(为空表示立即发送,不为空表示定时发送) //计划发送时间(为空表示立即发送,不为空表示定时发送)
String jobId = ""; String jobId = "";
if (!Objects.isNull(request.getScheduleTime())) { if (!Objects.isNull(request.getScheduleTime())) {
//不为空表示定时发送:创建XXL-Job定时任务 //不为空表示定时发送:创建XXL-Job定时任务-异步方法
jobId = xxlJobService.addScheduleJob(taskBizId, DateUtil.convertDateByLocalDateTime(request.getScheduleTime())); apiEmailSendAsyncService.addScheduleJob(taskBizId, DateUtil.convertDateByLocalDateTime(request.getScheduleTime()));
}else { }else {
//为空表示立即发送 //为空表示立即发送邮件-异步方法
apiEmailSendAsyncService.sendImmediatelyEmail(mailTask, recipientsList); apiEmailSendAsyncService.sendImmediatelyEmail(mailTask, recipientsList);
} }
response.setJobId(jobId); response.setJobId(jobId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment