From a4a5e8e957ee9e390b53c876c9c996aa892a6375 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 06 五月 2022 14:05:29 +0800
Subject: [PATCH] Changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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 b27bcc6..ce82c7a 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,8 +3,10 @@
 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;
 import com.sandu.ximon.admin.param.LightRemarkParam;
 import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.LightReportDataService;
@@ -119,6 +121,13 @@
         return ResponseUtil.success(lightService.controlEnergySaving());
     }
 
+
+    @PostMapping("/Energy")
+    @AnonymousAccess
+    public ResponseVO<Object> Energy() {
+        return ResponseUtil.success(lightService.controlEnergy());
+    }
+
 //    /**
 //     * 鑾峰彇璁惧鐮�
 //     */
@@ -130,12 +139,9 @@
     /**
      * 璁剧疆鍔熺巼
      */
-    @PostMapping("/setPower/{power1}/{power2}")
-    public ResponseVO<Object> setPower(@RequestBody  List<Long> ids, @PathVariable Integer power1,@PathVariable Integer power2) {
-        if(ids.isEmpty()||power1==null||power2==null){
-            return ResponseUtil.fail("id涓虹┖鎴栬�呭姛鐜囦负绌�");
-        }
-        boolean resule= lightService.setPower(ids,power1,power2);
+    @PostMapping("/setPower")
+    public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
+        boolean resule= lightService.setPower(lightPowerSettingParam);
         return ResponseUtil.success(resule);
     }
 }

--
Gitblit v1.9.3