From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 106 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
index 1ae2431..2e6c093 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
@@ -1,22 +1,15 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
-import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.config.FileProperties;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.common.util.ResUtils;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightDataEnum;
@@ -30,15 +23,18 @@
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
-import java.sql.Wrapper;
-import java.time.LocalDate;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.time.LocalDateTime;
-import java.util.*;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author chenjiantian
@@ -51,6 +47,7 @@
private final FileProperties properties;
private final AliOssFileServiceImpl fileService;
+ private final LightReportDataMapper lightReportDataMapper;
/**
* 淇濆瓨涓婃姤鐨勭伅蹇冭烦鏁版嵁
@@ -58,14 +55,21 @@
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
- LightReportData lightReportData = RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, LightReportData.class);
+// LightReportData lightReportData = RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, LightReportData.class);
+
+
+ String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"));
+ LightReportData lightReportData = new LightReportData();
+
if (lightReportData == null) {
lightReportData = new LightReportData();
- lightReportData.setCreateTime(LocalDateTime.now());
+ lightReportData.setCreateTime(format);
}
+ lightReportData.setCreateTime(format);
BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
lightReportData.setDeviceCode(deviceName);
- lightReportData.setUpdateTime(LocalDateTime.now());
+
+ lightReportData.setUpdateTime(format);
//鍗曠伅鏁版嵁淇濆瓨鍒扮紦瀛橀噷
RedisUtils.getBean().set(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, lightReportData);
@@ -92,7 +96,7 @@
List<LightReportDataBo> lightReportDataBos = new ArrayList<>(pageSize);
- CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize);
+ CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize, keyword, deviceCode);
List<String> macList = stringCommonPage.getList();
if (CollUtil.isEmpty(macList)) {
return new CommonPage();
@@ -122,12 +126,13 @@
CommonPage commonPage = CommonPage.restPage(lightReportDataBos);
commonPage.setTotal(stringCommonPage.getTotal());
commonPage.setTotalPage(stringCommonPage.getTotalPage());
+ commonPage.setPageNum(pageNo);
return commonPage;
}
@SneakyThrows
- public String exportList(int pageNo, int pageSize, String keyword, String deviceCode) {
+ public void exportList(HttpServletRequest request, HttpServletResponse response, String deviceCode) {
if (SecurityUtils.getClientId() != null) {
PoleBinding one = SpringContextHolder.getBean(PoleBindingService.class).getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode)
@@ -144,31 +149,60 @@
}
}
- PageHelper.startPage(pageNo, pageSize);
- List<LightReportDataBo> list = baseMapper.listReportData(keyword, deviceCode);
+ List<LightReportDataBo> list = lightReportDataMapper.listReportData(null, deviceCode);
File file = new File("./" + RandomUtil.randomString(12) + ".xlsx");
-// File file = new File(properties.getUploadRootPath() + "export" + File.separator + RandomUtil.randomString(12) + ".xlsx");
-// ClassPathResource cpr = new ClassPathResource("public/exportOrder.xlsx");
-// FileUtil.mkParentDirs(file);
-//
-// ExcelWriter excelWriter = EasyExcel.write(file).withTemplate(cpr.getInputStream()).build();
-// WriteSheet writeSheet = EasyExcel.writerSheet().build();
-// excelWriter.fill(list, writeSheet);
-// excelWriter.finish();
EasyExcel.write(file, LightReportDataBo.class).sheet("妯＄増").doWrite(list);
- FileUploadDto fileUploadDto = fileService.uploadFile(file);
-// String url = file.getPath().replace(properties.getUploadRootPath(), "");
- String url = fileUploadDto.getFileUrl();
- file.delete();
- return url;
-
- // return list;
+ //鏂囦欢娴佸寲杩斿洖缁欏墠绔�
+ findfile(request, response, file);
+ //鍒犻櫎鏂囦欢
+ // file.delete();
}
- public List<LightReportDataBo> reportDataList(List<String> deviceCodeList, DateTime startDate, DateTime endDate) {
- return baseMapper.reportDataList(deviceCodeList, startDate, endDate);
+ /**
+ * 鏂囦欢娴佸寲
+ *
+ * @param request
+ * @param response
+ * @param file
+ * @throws IOException
+ */
+ public void findfile(HttpServletRequest request, HttpServletResponse response, File file) throws IOException {
+ ServletOutputStream out = null;
+ FileInputStream ips = null;
+ try {
+ //鑾峰彇鍒版枃瀛� 鏁版嵁搴撻噷瀵瑰簲鐨勯檮浠跺悕瀛楀姞涓婅�佺殑鏂囦欢鍚嶅瓧锛歠ilename 鎴彇鍒板悗闈㈢殑鏂囦欢绫诲瀷 渚嬶細txt 缁勬垚涓�涓柊鐨勬枃浠跺悕瀛楋細newFileName
+ //鐢熸垚3涓殢鏈烘暟锛岀敤鏉ョ敓鎴愭柊鐨勬枃浠跺悕瀛�
+ String newFileName = "鍗曠伅鏁版嵁" + RandomUtil.randomString(3) + ".xlsx";
+ if (!file.exists()) {
+ //濡傛灉鏂囦欢涓嶅瓨鍦ㄥ氨璺冲嚭
+ return;
+ }
+ ips = new FileInputStream(file);
+ response.setContentType("application/json;charset=utf-8");
+ //涓烘枃浠堕噸鏂拌缃悕瀛楋紝閲囩敤鏁版嵁搴撳唴瀛樺偍鐨勬枃浠跺悕绉�
+ response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(newFileName.getBytes("UTF-8"), "ISO8859-1") + "\"");
+ out = response.getOutputStream();
+ //璇诲彇鏂囦欢娴�
+ int len = 0;
+ byte[] buffer = new byte[1024 * 10];
+ while ((len = ips.read(buffer)) != -1) {
+ out.write(buffer, 0, len);
+ }
+ out.flush();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ out.close();
+ ips.close();
+ file.delete();
+ } catch (IOException e) {
+ System.out.println("鍏抽棴娴佸嚭鐜板紓甯�");
+ e.printStackTrace();
+ }
+ }
}
}
--
Gitblit v1.9.3