From 31e798604209979bb9e93652dc0b0ac8d4d61538 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 17:54:16 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 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..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
@@ -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;
@@ -19,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;
@@ -50,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("娣诲姞鎴愬姛");
@@ -71,9 +77,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);
@@ -86,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")
@@ -111,8 +126,16 @@
     // 浜害鎺у埗
     @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")
+    public ResponseVO<Object> Energy() {
+        return ResponseUtil.success(lightService.controlEnergy());
     }
 
     @PostMapping("/EnergySaving")
@@ -120,20 +143,16 @@
         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);
+        if (!permissionConfig.check(MenuEnum.LIGHT_SET_POWER.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        boolean resule = lightService.setPower(lightPowerSettingParam);
         return ResponseUtil.success(resule);
     }
 }

--
Gitblit v1.9.3