From b2cf36ae92e61534f9d2e02068bff0f5127272bc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 14:13:44 +0800
Subject: [PATCH] 接口排序

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
index b75bc35..5c04267 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
@@ -1,10 +1,12 @@
 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.security.PermissionConfig;
 import com.sandu.ximon.admin.service.AirEquipmentService;
 import com.sandu.ximon.dao.bo.AirEquipmentBo;
-import com.sandu.ximon.dao.domain.AirEquipment;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,26 +20,27 @@
 @RequestMapping("/v1/admin/airequipment")
 public class AirEquipmentController {
     private final AirEquipmentService airEquipmentService;
-
-    @GetMapping
-    public ResponseVO<Object> listAirEquipment() {
-        List<AirEquipmentBo> list = airEquipmentService.listAirEquipment();
-        return ResponseUtil.success(list);
-    }
+    private PermissionConfig permissionConfig;
 
     /**
-     * 妯$硦鏌ヨ
+     * 鏌ヨ澶ф皵璁惧
      *
      * @return
      */
-    @GetMapping("/listAirEquipmentByKeyword/{keyword}")
-    public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
-        List<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
-        return ResponseUtil.success(list);
+    @GetMapping("/listAirEquipment")
+    public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        List<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(baseConditionVO, keyword);
+        return ResponseUtil.successPage(list);
     }
 
     @PostMapping("/delete/{id}")
     public ResponseVO<Object> deleteAirEquipment(@PathVariable Long id) {
+        if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         boolean result = airEquipmentService.deleteAirEquipment(id);
         if (result) {
             return ResponseUtil.success(null);
@@ -45,4 +48,5 @@
             return ResponseUtil.fail("鎿嶄綔澶辫触");
         }
     }
+
 }

--
Gitblit v1.9.3