From 21c1a691e7018967a429c276e6642c17e61ed778 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 22 四月 2022 14:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 12 +++++++++---
1 files changed, 9 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 bac7ce1..21a00fe 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
@@ -73,6 +73,7 @@
/**
* 瀵煎嚭Excel
+ *
* @param conditionVO
* @param keyword
* @param deviceCode
@@ -85,14 +86,14 @@
}
@GetMapping("/error/list")
- public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
+ public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword
+ , @RequestParam(required = false) int errorCode) {
if (!permissionConfig.check(MenuEnum.LIGHT_ERROR_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<LightReportErrorBo> list = lightReportErrorService.listReportError(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
+ List<LightReportErrorBo> list = lightReportErrorService.listReportError(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, errorCode);
return ResponseUtil.success(list);
}
-
// 浜害鎺у埗
@@ -101,4 +102,9 @@
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