From bca05a77fd9fe432382b03e3b1da1c5d8ba5ff8f Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 11:52:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 b11b288..d53c732 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,9 +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.domain.AirEquipment;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,21 +20,19 @@
@RequestMapping("/v1/admin/airequipment")
public class AirEquipmentController {
private final AirEquipmentService airEquipmentService;
-
- @GetMapping
- public ResponseVO<Object> listAirEquipment() {
- List<AirEquipment> list = airEquipmentService.listAirEquipment();
- return ResponseUtil.successPage(list);
- }
+ private PermissionConfig permissionConfig;
/**
- * 妯＄硦鏌ヨ
+ * 鏌ヨ澶ф皵璁惧
*
* @return
*/
- @GetMapping("/listAirEquipmentByKeyword/{keyword}")
- public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
- List<AirEquipment> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
+ @GetMapping("/listAirEquipment")
+ public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(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);
}
@@ -44,4 +45,9 @@
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
}
+
+ @GetMapping("/getAirEquipment/{mac}")
+ public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
+ return ResponseUtil.success(airEquipmentService.getAirEquipment(mac));
+ }
}
--
Gitblit v1.9.3