From aee78de39e2d957a0c4a91f75ab9f77b03e46af3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 14:35:17 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 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 7d27a28..edbeb8e 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
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* 璺伅鐩稿叧鎺у埗绫�
@@ -57,19 +58,34 @@
@GetMapping("/report/list")
public ResponseVO<Object> listReportData(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
List<LightReportDataBo> list = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
+ }
+
+ /**
+ * 瀵煎嚭Excel
+ * @param conditionVO
+ * @param keyword
+ * @param deviceCode
+ * @return
+ */
+ @GetMapping("/report/exportList")
+ public ResponseVO<Object> exportList(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+ String url = lightReportDataService.exportList(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
+ return ResponseUtil.success(url);
}
@GetMapping("/error/list")
public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
List<LightReportErrorBo> list = lightReportErrorService.listReportError(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
+
+
// 浜害鎺у埗
@PostMapping("/control")
- public ResponseVO<Object> controlBrightness(@RequestBody @Validated LightControlParam param) {
- Integer status = lightService.controlBrightness(param);
- return ResponseUtil.success(status);
+ public ResponseVO<Object> controlBrightness(@RequestBody @Validated List<LightControlParam> paramList) {
+ List<Map<String, Object>> list = lightService.controlBrightness(paramList);
+ return ResponseUtil.success(list);
}
}
--
Gitblit v1.9.3