From 1fb4bbb7dd864cbe0da0d12826a9561783712e42 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 04 一月 2022 15:29:38 +0800
Subject: [PATCH] 水质设备查询
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
index 23a0645..c57fc6a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.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.param.WaterQualityEquipmentParam;
import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
@@ -20,21 +21,15 @@
public class WaterQualityEquipmentController {
private final WaterQualityEquipmentService waterQualityEquipmentService;
- @GetMapping
- public ResponseVO<Object> listWaterQualityEquipment() {
- List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipment();
- return ResponseUtil.success(list);
- }
-
/**
- * 妯＄硦鏌ヨ
+ * 姘磋川璁惧鍒楄〃鏌ヨ
*
* @return
*/
- @GetMapping("/listWaterQualityEquipmentByKeyword/{keyword}")
- public ResponseVO<Object> listWaterQualityEquipmentByKeyword(@PathVariable String keyword) {
- List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
- return ResponseUtil.success(list);
+ @GetMapping("/listWaterQualityEquipment")
+ public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(baseConditionVO, keyword);
+ return ResponseUtil.successPage(list);
}
/**
--
Gitblit v1.9.3