From 981055073317b3b07534d5ac504a4e470e87f3d8 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 30 三月 2022 11:04:22 +0800
Subject: [PATCH] 摄像头

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java |   21 +++++++++------------
 1 files changed, 9 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 93ecfa3..33be8db 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,36 +1,33 @@
 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.service.AirDataService;
 import com.sandu.ximon.admin.service.AirEquipmentService;
-import com.sandu.ximon.dao.domain.AirData;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
 import com.sandu.ximon.dao.domain.AirEquipment;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * 澶ф皵璁惧
+ */
 @RestController
 @AllArgsConstructor
 @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);
-    }
-
     /**
-     * 妯$硦鏌ヨ
+     * 鏌ヨ澶ф皵璁惧
      *
      * @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) {
+        List<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(baseConditionVO, keyword);
         return ResponseUtil.successPage(list);
     }
 

--
Gitblit v1.9.3