From 1d9cecff18f4db15f66d7aab63f4acb4e5a3bc3a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 20 七月 2022 16:21:07 +0800
Subject: [PATCH] 优化

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 14d1a93..881bef7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -7,7 +7,6 @@
 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.dto.DeviceStatus;
 import com.sandu.ximon.admin.param.PoleBindParam;
@@ -71,30 +70,40 @@
     }
 
     @PostMapping("/listDetail")
-    public ResponseVO<Object> listPoleDetail(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
+    public ResponseVO<Object> listPoleDetail(BaseConditionVO baseConditionVO,
+                                             @RequestBody PoleStatesParam param,
+                                             @RequestParam(value = "order", required = false) Integer order,
+                                             @RequestParam(value = "seq", required = false) Integer seq) {
         if (!permissionConfig.check(MenuEnum.POLE_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
-        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
+        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param, order, seq);
+        List<Pole> listCommonPage = (List<Pole>) commonPage.getList();
+
         List<PoleBindVO> listResult = new ArrayList<>();
-        for (Pole pole : (List<Pole>) commonPage.getList()) {
+        for (Pole pole : listCommonPage) {
             PoleBindVO bindByPoleId = poleService.getBindByPoleId(pole.getId());
             bindByPoleId.setPole(pole);
             listResult.add(bindByPoleId);
         }
+        commonPage.setList(listResult);
         return ResponseUtil.success(commonPage);
     }
 
     @PostMapping("/list")
-    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
+    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO,
+                                       @RequestBody PoleStatesParam param,
+                                       @RequestParam(value = "order", required = false) Integer order,
+                                       @RequestParam(value = "seq", required = false) Integer seq) {
         if (!permissionConfig.check(MenuEnum.POLE_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
-        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
+        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param, order, seq);
 
         return ResponseUtil.success(commonPage);
     }
 
+    //宸插惎鐢�
     @GetMapping("/listPoleAndState")
     public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
                                                @RequestParam(value = "groupid", required = false) Long groupid) {
@@ -109,7 +118,6 @@
     /**
      * 鍦ㄧ嚎鏁伴噺
      */
-    @AnonymousAccess
     @GetMapping("/online")
     public ResponseVO<Object> online() {
         return ResponseUtil.success(poleService.poleCount());
@@ -138,7 +146,6 @@
         return ResponseUtil.success(poleService.poleReset(poleId));
     }
 
-//TODO  璁惧鐨勭粦瀹氳В缁戦兘瑕佸崟鐙噸鏂板鐞�
 
     /**
      * 鐏潌缁戝畾璁惧
@@ -195,7 +202,7 @@
     }
 
     /**
-     * 鐏潌缁戝畾璁惧
+     * 鐏潌瑙ｇ粦璁惧
      */
     @PostMapping("/unBind/{poleId}")
     public ResponseVO<Object> unBindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
@@ -288,9 +295,8 @@
     }
 
     /**
-     * 鏌ョ湅鐏潌缁戝畾鐨勮澶�
+     * 鏌ョ湅鐏潌缁戝畾鐨勮澶�   //宸插悎骞跺埌鍒楄〃鍔熻兘 姝ゆ帴鍙ｅ凡搴熷純
      */
-    @AnonymousAccess
     @PostMapping("/getPoleBindDevice/{poleId}")
     public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
         if (!permissionConfig.check(MenuEnum.GET_POLE_BINDING.getCode())) {
@@ -303,7 +309,6 @@
     /**
      * 鎺ㄩ�佸ぇ姘旇澶囧埌璇虹摝
      */
-    @AnonymousAccess
     @GetMapping("/pushAidDataToNova/{poleId}")
     public ResponseVO<Object> pushAirDataToNova(@PathVariable Long poleId) {
         if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_NOVA.getCode())) {
@@ -315,7 +320,6 @@
     /**
      * 鎺ㄩ�佸ぇ姘旇澶囧埌鐔欒
      */
-    @AnonymousAccess
     @GetMapping("/pushAirDataToXiXun/{poleId}")
     public ResponseVO<Object> pushAirDataToXiXun(@PathVariable Long poleId) {
         if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_XIXUN.getCode())) {

--
Gitblit v1.9.3