From 7a1c0a8f26b54db6fdf0dcb9a2568aa9811f8f4c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 18 Jun 2024 15:20:10 +0800
Subject: [PATCH] fix:测试提交
---
screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java b/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
index 47fa913..95e354b 100644
--- a/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/EmilInsetTask.java
@@ -38,9 +38,11 @@
@XxlJob("emilTask")
public void emilTask()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();
+ Date date = DateUtils.addDays(new Date(),-1);
+ String startTime = DateUtils.dateToDateString(date,DateUtils.yyyy_MM_dd_EN);
+ String mon = DateUtils.dateToDateString(date,DateUtils.yyyyMM_EN);
+ List<DeviceExcelDTO> list = deviceService.ListDeviceExcel(startTime,mon,72);
+ String path = System.getProperty("user.dir")+"/";
String fileName = String.format("%s������������������-%s.xlsx",path,startTime);
ByteArrayOutputStream out = null;
try {
@@ -48,7 +50,7 @@
out = ExcelUtil.generateExcel(list, DeviceExcelDTO.class);
// ������������
String content = startTime+"������������������������������";
- String toMail = "ad@7drlb.com";
+ String toMail = "lili@nieh.chinacdc.cn";
emailSpringUtil.sendEmail("������������������",content,false,"909710561@qq.com",
toMail,"909710561@qq.com",null, fileName, new ByteArrayResource(out.toByteArray()));
} catch (IOException e) {
@@ -64,4 +66,12 @@
}
log.info("������������������");
}
+
+ public static void main(String[] args) {
+ Date date = DateUtils.addDays(new Date(),+1);
+ String startTime = DateUtils.dateToDateString(date,DateUtils.yyyy_MM_dd_EN);
+ String mon = DateUtils.dateToDateString(date,DateUtils.yyyyMM_EN);
+ System.out.println(startTime);
+ System.out.println(mon);
+ }
}
--
Gitblit v1.8.0