From 5cfcf41368e52dd0128e8561e3709ba3bea833a4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 02 三月 2022 18:13:56 +0800
Subject: [PATCH] 大气数据主动获取保存数据库FIX
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 15 +++++----------
1 files changed, 5 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 0b6bc99..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,6 +1,7 @@
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;
@@ -19,20 +20,14 @@
public class AirEquipmentController {
private final AirEquipmentService airEquipmentService;
- @GetMapping
- public ResponseVO<Object> listAirEquipment() {
- List<AirEquipmentBo> list = airEquipmentService.listAirEquipment();
- return ResponseUtil.successPage(list);
- }
-
/**
- * 妯＄硦鏌ヨ
+ * 鏌ヨ澶ф皵璁惧
*
* @return
*/
- @GetMapping("/listAirEquipmentByKeyword/{keyword}")
- public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
- List<AirEquipmentBo> 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