From 098dd2ed33b90a8a14ff0b04bace845ec119244c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 10:40:21 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 1e14ff3..3c4576f 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
@@ -3,6 +3,7 @@
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LightControlParam;
import com.sandu.ximon.admin.param.LightPowerSettingParam;
@@ -71,9 +72,9 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
- List<LightReportDataBo> lightReportDataBos = ( List<LightReportDataBo>)commonPage.getList();
+ List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();
- if(lightReportDataBos == null){
+ if (lightReportDataBos == null) {
return ResponseUtil.success(CommonPage.restPage(new ArrayList<>()));
}
CommonPage commonPage1 = CommonPage.restPage(lightReportDataBos);
@@ -115,25 +116,26 @@
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());
}
-// /**
-// * 鑾峰彇璁惧鐮�
-// */
-// @GetMapping("/deviceCode")
-// public ResponseVO<Object> getDeviceCode(BaseConditionVO baseConditionVO) {
-// return ResponseUtil.success(lightService.listDeviceCode(baseConditionVO.getPageNo() , baseConditionVO.getPageSize()));
-// }
+
/**
* 璁剧疆鍔熺巼
*/
- @PostMapping("/setPower/{power1}/{power2}")
+ @PostMapping("/setPower")
public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
- boolean resule= lightService.setPower(lightPowerSettingParam);
+ boolean resule = lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
}
--
Gitblit v1.9.3