From 1d5d9b98c668145a160bca8cae8a743a370c8f8a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 05 Feb 2024 09:51:03 +0800
Subject: [PATCH] fix:断线统计补充提交
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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..c11ae9a 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 = "���������������")
@@ -80,12 +85,23 @@
@GetMapping("dateInsertHistoryHourlyJKAvg")
@ApiOperation(value = "������������������������", notes = "������������������������")
public ResultMessage dateInsertHistoryHourlyJKAvg(String start,String end) {
+ Date ks = DateUtils.getDate(start,"yyyy-MM-dd HH:mm:ss");
+ Date js = DateUtils.getDate("2024-01-23 13:00:00","yyyy-MM-dd HH:mm:ss");
+ Date ends = DateUtils.getDate(end,"yyyy-MM-dd HH:mm:ss");
+ while (DateUtils.isTimeBefor(js,ks)){
+ String dateString = DateUtils.dateToDateString(ks);
+ String dateString1 = DateUtils.dateToDateString(ends);
+// historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+ historyHourlyService.dateInsertHistoryHourlyJKAvg(dateString, dateString1);
+ ks = DateUtils.getDateAddHour(ks,1);
+ ends = DateUtils.getDateAddHour(ends,1);
+ }
// String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
// String start ="2023-11-19 09:00"
// String end ="2023-11-19 10:00";
// Date start1 = DateUtils.getDate(start,format);
// Date end1 = DateUtils.getDate(end,format);
- historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+
return new ResultMessage();
}
@@ -173,7 +189,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 +198,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