From c21c161bc5ecddbe2a1d5174c2d178d768939e17 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 26 Jan 2024 09:56:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 822ed13..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
@@ -1,6 +1,9 @@
package com.moral.api.controller;
import com.moral.api.service.*;
+import com.moral.api.util.DeviceExcelDTO;
+import com.moral.api.util.EmailSpringUtil;
+import com.moral.api.util.ExcelUtil;
import com.moral.api.util.HttpUtils;
import com.moral.constant.ResultMessage;
import com.moral.util.DateUtils;
@@ -10,13 +13,16 @@
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import javax.mail.MessagingException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.*;
/**
* @ClassName UserController
@@ -46,6 +52,14 @@
private HistoryHourlyService historyHourlyService;
@Autowired
private HistoryMonthlyService historyMonthlyService;
+ @Autowired
+ private DeviceService deviceService;
+
+ private final EmailSpringUtil emailSpringUtil;
+
+ public PubController(EmailSpringUtil emailSpringUtil) {
+ this.emailSpringUtil = emailSpringUtil;
+ }
@GetMapping("insertHistoryDaily")
@ApiOperation(value = "���������������", notes = "���������������")
@@ -170,5 +184,33 @@
}
}
-
+ @GetMapping("excelDevice")
+ @ApiOperation(value = "excle", notes = "excle")
+ 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 = 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 {
+ // ������excel������
+ out = ExcelUtil.generateExcel(list, DeviceExcelDTO.class);
+ // ������������
+ String content = startTime+"������������������������������";
+ String toMail = "ad@7drlb.com";
+ emailSpringUtil.sendEmail("������������������",content,false,"909710561@qq.com",
+ toMail,"909710561@qq.com",null, fileName, new ByteArrayResource(out.toByteArray()));
+ } catch (IOException e) {
+ log.error(String.format("������excel������������������%s",e));
+ e.printStackTrace();
+ } catch (MessagingException e) {
+ log.error(String.format("������������������������������%s",e));
+ e.printStackTrace();
+ }finally {
+ if(out != null){
+ out.close();
+ }
+ }
+ }
}
--
Gitblit v1.8.0