From 9cac94cd48fde9c9cb1b8f37cd652d974ca8d349 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 25 Jan 2024 10:33:47 +0800
Subject: [PATCH] fix：补充提交
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..c29aa7e 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
@@ -21,6 +21,7 @@
import javax.mail.MessagingException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.*;
/**
@@ -53,8 +54,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 = "���������������")
@@ -173,7 +178,8 @@
public void excelDevice() throws IOException {
String startTime = DateUtils.dateToDateString(DateUtils.addDays(new Date(),-1),DateUtils.yyyy_MM_dd_EN);
List<DeviceExcelDTO> list = deviceService.ListDeviceExcel(startTime,null,72);
- String path = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath();
+ // String path = this.getClass().getClassLoader().getResource("/data/file").getPath();
+ String path = System.getProperty("user.dir")+"/";
String fileName = String.format("%s������������������-%s.xlsx",path,startTime);
ByteArrayOutputStream out = null;
try {
@@ -181,9 +187,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();
--
Gitblit v1.8.0