From 3be7f43f9d7c1e0691407b1a3470186369b87bd9 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 13 五月 2022 10:37:17 +0800
Subject: [PATCH] 单灯数据直接下载
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index a418960..f50c77a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -104,6 +104,10 @@
if (deviceCode.isEmpty()) {
return ResponseUtil.fail("璁惧缂栧彿涓嶈兘涓虹┖");
}
+ int length = deviceCode.length();
+ if (length != 24) {
+ return ResponseUtil.fail("璁惧缂栧彿闀垮害涓嶆纭�");
+ }
String url = lightReportDataService.exportList(request,response, deviceCode);
return ResponseUtil.success(url);
}
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 88c2a53..d4df841 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
@@ -184,7 +184,7 @@
return;
}
ips = new FileInputStream(file);
- response.setContentType("multipart/form-data");
+ response.setContentType("application/json;charset=utf-8");
//涓烘枃浠堕噸鏂拌缃悕瀛楋紝閲囩敤鏁版嵁搴撳唴瀛樺偍鐨勬枃浠跺悕绉�
response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(newFileName.getBytes("UTF-8"), "ISO8859-1") + "\"");
out = response.getOutputStream();
--
Gitblit v1.9.3