From 316dce3b4de147fdf301ff4295f286da908deffb Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 17:39:25 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java | 23 ++++++++++++-----------
1 files changed, 12 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 9ede873..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,9 +1,11 @@
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;
+import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -19,23 +21,22 @@
public class WaterQualityEquipmentController {
private final WaterQualityEquipmentService waterQualityEquipmentService;
- @GetMapping
- public ResponseVO<Object> listWaterQualityEquipment() {
- List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipment();
+ /**
+ * 姘磋川璁惧鍒楄〃鏌ヨ
+ *
+ * @return
+ */
+ @GetMapping("/listWaterQualityEquipment")
+ public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
/**
- * 妯＄硦鏌ヨ
- *
+ * 鍒犻櫎姘磋川璁惧
+ * @param id
* @return
*/
- @GetMapping("/listWaterQualityEquipmentByKeyword/{keyword}")
- public ResponseVO<Object> listWaterQualityEquipmentByKeyword(@PathVariable String keyword) {
- List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
- return ResponseUtil.successPage(list);
- }
-
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);
--
Gitblit v1.9.3