From e11aff139734ce34e4f7468170ebf0f62ccbb50b Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:11 +0800
Subject: [PATCH] 首页

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
index ec6f3a6..ca4b4f0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
@@ -1,11 +1,15 @@
 package com.sandu.ximon.admin.controller;
 
 import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.C3ChargingParam;
+import com.sandu.ximon.admin.param.LightPoleHeelingListParam;
 import com.sandu.ximon.admin.param.LightPoleHeelingParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.LightPoleHeelingService;
 import com.sandu.ximon.dao.domain.LightPoleHeeling;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -13,28 +17,27 @@
 import java.util.List;
 
 /**
- * 鐏潌鍊炬枩
+ * 鐏潌鍊炬枩璀﹀憡鍒楄〃
  */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/v1/admin/LightPoleHeeling")
 public class LightPoleHeelingController {
     private final LightPoleHeelingService lightPoleHeelingService;
-
-    @GetMapping
-    public ResponseVO<Object> listLightPoleHeeling() {
-        List<LightPoleHeeling> list = lightPoleHeelingService.listLightPoleHeeling();
-        return ResponseUtil.successPage(list);
-    }
+    private PermissionConfig permissionConfig;
 
     /**
      * 妯$硦鏌ヨ
      *
      * @return
      */
-    @GetMapping("/listLightPoleHeelingByKeyword/{keyword}")
-    public ResponseVO<Object> listLightPoleHeelingByKeyword(@PathVariable String keyword) {
-        List<LightPoleHeeling> list = lightPoleHeelingService.listLightPoleHeelingByKeyword(keyword);
+    @PostMapping("/listLightPoleHeelingByKeyword")
+    public ResponseVO<Object> listLightPoleHeelingByKeyword(BaseConditionVO baseConditionVO
+            , @RequestBody(required = false) LightPoleHeelingListParam lightPoleHeelingListParam) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        List<LightPoleHeeling> list = lightPoleHeelingService.listLightPoleHeelingByKeyword(baseConditionVO, lightPoleHeelingListParam);
         return ResponseUtil.successPage(list);
     }
 
@@ -67,7 +70,12 @@
      */
     @PostMapping("/RestartLightPoleHeeling")
     public ResponseVO<Object> RestartLightPoleHeeling(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
-        return ResponseUtil.success(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
+        String result = lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName());
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
 
     }
 
@@ -76,8 +84,13 @@
      */
     @PostMapping("/SetHeartbeatPacketTime")
     public ResponseVO<Object> SetHeartbeatPacketTime(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
+        String result = lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime());
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
 
-        return ResponseUtil.success(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
     }
 
     /**
@@ -85,7 +98,11 @@
      */
     @PostMapping("/SetSensorState")
     public ResponseVO<Object> SetSensorState(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
-
-        return ResponseUtil.success(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
+        String result = lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName());
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
     }
 }

--
Gitblit v1.9.3