From c00a73b74e67dbeb508865c3da4ed8d57c8631db Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 14:16:12 +0800
Subject: [PATCH] fix admin LIST
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 9683856..16308ae 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
@@ -5,12 +5,14 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LightControlParam;
import com.sandu.ximon.admin.param.LightRemarkParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightReportDataService;
import com.sandu.ximon.admin.service.LightReportErrorService;
import com.sandu.ximon.admin.service.LightService;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -31,10 +33,14 @@
private final LightService lightService;
private final LightReportDataService lightReportDataService;
private final LightReportErrorService lightReportErrorService;
+ private PermissionConfig permissionConfig;
@GetMapping("/list")
public ResponseVO<Object> listLight(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
return ResponseUtil.successPage(list);
}
@@ -56,16 +62,38 @@
* @return
*/
@GetMapping("/report/list")
- public ResponseVO<Object> listReportData(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+ public ResponseVO<Object> listReportData(BaseConditionVO conditionVO
+ , @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
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) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_ERROR_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<LightReportErrorBo> list = lightReportErrorService.listReportError(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
+
// 浜害鎺у埗
@PostMapping("/control")
@@ -73,4 +101,8 @@
List<Map<String, Object>> list = lightService.controlBrightness(paramList);
return ResponseUtil.success(list);
}
+ @PostMapping("/EnergySaving")
+ public ResponseVO<Object> controlEnergySaving() {
+ return ResponseUtil.success(lightService.controlEnergySaving());
+ }
}
--
Gitblit v1.9.3