From a41f60a19a3d32808a891b495898e7c2ab7ea145 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 三月 2022 15:27:13 +0800
Subject: [PATCH] 灯杆倾斜fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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..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,8 +1,10 @@
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.AirEquipmentService;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -18,20 +20,14 @@
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