From 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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..3954610 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);
}
/**
@@ -46,7 +41,7 @@
public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("鎴愬姛鍒犻櫎姘磋川璁惧");
} else {
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
@@ -56,7 +51,7 @@
public ResponseVO<Object> addQualityEquipment(@RequestBody WaterQualityEquipment waterQualityEquipment) {
boolean result = waterQualityEquipmentService.addWaterQualityEquipment(waterQualityEquipment);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("鎴愬姛娣诲姞姘磋川璁惧");
} else {
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
--
Gitblit v1.9.3