From da602743da69e28a23601b1890bc43917fcd019a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 18 五月 2022 10:13:40 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 3c4576f..d4c7ca0 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;
@@ -51,6 +53,9 @@
@PostMapping("/remark")
public ResponseVO<Object> addRemark(@RequestBody @Validated LightRemarkParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_REMARK.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightService.addRemark(param);
if (result) {
return ResponseUtil.success("娣诲姞鎴愬姛");
@@ -87,15 +92,24 @@
/**
* 瀵煎嚭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);
+ public ResponseVO<Object> exportList(HttpServletRequest request, HttpServletResponse response, @RequestParam(required = false) String deviceCode) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_EXPORT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ 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")
@@ -112,22 +126,22 @@
// 浜害鎺у埗
@PostMapping("/control")
public ResponseVO<Object> controlBrightness(@RequestBody @Validated List<LightControlParam> paramList) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_CONTROL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<Map<String, Object>> list = lightService.controlBrightness(paramList);
return ResponseUtil.success(list);
}
@PostMapping("/Energy")
- @AnonymousAccess
public ResponseVO<Object> Energy() {
return ResponseUtil.success(lightService.controlEnergy());
}
- @AnonymousAccess
@PostMapping("/EnergySaving")
public ResponseVO<Object> controlEnergySaving() {
return ResponseUtil.success(lightService.controlEnergySaving());
}
-
/**
@@ -135,6 +149,9 @@
*/
@PostMapping("/setPower")
public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_SET_POWER.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean resule = lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
--
Gitblit v1.9.3