From 93be0702751363a2c228c081a3b78040554bf503 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Wed, 24 Jan 2024 16:17:57 +0800
Subject: [PATCH] fix：补充提交
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 12 ++++++++----
screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java | 12 +++++++-----
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index e9eb49c..c1b1b4e 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -53,8 +53,12 @@
private HistoryMonthlyService historyMonthlyService;
@Autowired
private DeviceService deviceService;
- @Autowired
- private EmailSpringUtil emailSpringUtil;
+
+ private final EmailSpringUtil emailSpringUtil;
+
+ public PubController(EmailSpringUtil emailSpringUtil) {
+ this.emailSpringUtil = emailSpringUtil;
+ }
@GetMapping("insertHistoryDaily")
@ApiOperation(value = "���������������", notes = "���������������")
@@ -181,9 +185,9 @@
out = ExcelUtil.generateExcel(list, DeviceExcelDTO.class);
// ������������
String content = startTime+"������������������������������";
- String toMail = "909710561@qq.com";
+ String toMail = "ad@7drlb.com";
emailSpringUtil.sendEmail("������������������",content,false,"909710561@qq.com",
- toMail,"null",null, fileName, new ByteArrayResource(out.toByteArray()));
+ toMail,"909710561@qq.com",null, fileName, new ByteArrayResource(out.toByteArray()));
} catch (IOException e) {
log.error(String.format("������excel������������������%s",e));
e.printStackTrace();
diff --git a/screen-job/src/main/java/com/moral/api/task/EmilTask.java b/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
similarity index 91%
rename from screen-job/src/main/java/com/moral/api/task/EmilTask.java
rename to screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
index 22e30a0..47fa913 100644
--- a/screen-job/src/main/java/com/moral/api/task/EmilTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
@@ -5,8 +5,6 @@
import com.moral.api.util.EmailSpringUtil;
import com.moral.api.util.ExcelUtil;
import com.moral.util.DateUtils;
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,11 +27,15 @@
*/
@Component
@Slf4j
-public class EmilTask {
+public class EmilInsetTask {
@Autowired
private DeviceService deviceService;
- @Autowired
- private EmailSpringUtil emailSpringUtil;
+ private final EmailSpringUtil emailSpringUtil;
+
+ public EmilInsetTask(EmailSpringUtil emailSpringUtil) {
+ this.emailSpringUtil = emailSpringUtil;
+ }
+
@XxlJob("emilTask")
public void emilTask()throws IOException {
String startTime = DateUtils.dateToDateString(DateUtils.addDays(new Date(),-1),DateUtils.yyyy_MM_dd_EN);
--
Gitblit v1.8.0