From 3b8877b6d8c13e37f8c7769282a2751b0faeb499 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 18:30:54 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 da0bab3..1718593 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
@@ -20,6 +20,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -90,18 +92,25 @@
/**
* 瀵煎嚭Excel
*
- * @param conditionVO
- * @param keyword
* @param deviceCode
* @return
*/
+ @AnonymousAccess
@GetMapping("/report/exportList")
- public ResponseVO<Object> exportList(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+ public ResponseVO<Object> exportList(HttpServletRequest request, HttpServletResponse response, @RequestParam(required = false) String deviceCode) {
if (!permissionConfig.check(MenuEnum.LIGHT_EXPORT_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- String url = lightReportDataService.exportList(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
- return ResponseUtil.success(url);
+ if (deviceCode.isEmpty()) {
+ return ResponseUtil.fail("璁惧缂栧彿涓嶈兘涓虹┖");
+ }
+ int length = deviceCode.length();
+ if (length != 24) {
+ return ResponseUtil.fail("璁惧缂栧彿闀垮害涓嶆纭�");
+ }
+ lightReportDataService.exportList(request, response, deviceCode);
+
+ return ResponseUtil.success("瀵煎嚭鎴愬姛");
}
@GetMapping("/error/list")
--
Gitblit v1.9.3