From 6124565fc7edeb1ff49aebd87711c176a6f2f38e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 31 十二月 2021 16:48:37 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 88513c4..23a0645 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
@@ -2,7 +2,9 @@
import com.sandu.common.domain.ResponseVO;
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.*;
@@ -20,8 +22,8 @@
@GetMapping
public ResponseVO<Object> listWaterQualityEquipment() {
- List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipment();
- return ResponseUtil.successPage(list);
+ List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipment();
+ return ResponseUtil.success(list);
}
/**
@@ -31,10 +33,15 @@
*/
@GetMapping("/listWaterQualityEquipmentByKeyword/{keyword}")
public ResponseVO<Object> listWaterQualityEquipmentByKeyword(@PathVariable String keyword) {
- List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
- return ResponseUtil.successPage(list);
+ List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
+ return ResponseUtil.success(list);
}
+ /**
+ * 鍒犻櫎姘磋川璁惧
+ * @param id
+ * @return
+ */
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);
@@ -44,4 +51,15 @@
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
}
+
+ @PostMapping("/add")
+ public ResponseVO<Object> addQualityEquipment(@RequestBody WaterQualityEquipment waterQualityEquipment) {
+ boolean result = waterQualityEquipmentService.addWaterQualityEquipment(waterQualityEquipment);
+ if (result) {
+ return ResponseUtil.success(null);
+ } else {
+ return ResponseUtil.fail("鎿嶄綔澶辫触");
+ }
+ }
+
}
--
Gitblit v1.9.3