From 78cfab6f94517b93fa6218987f1a1e87fac0034c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 31 十二月 2021 16:30:41 +0800
Subject: [PATCH] 水质 大气
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
index ea77199..54ceb78 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
@@ -5,6 +5,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
+import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
@@ -20,24 +21,22 @@
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
private final PoleBindingService poleBindingService;
+
/**
* 鏌ヨ鍏ㄩ儴姘磋川璁惧
*/
- public List<WaterQualityEquipment> listWaterQualityEquipment() {
- LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
- List<WaterQualityEquipment> list = list(wrapper);
-
- return list;
+ public List<WaterQualityEquipmentBo> listWaterQualityEquipment() {
+ return waterQualityEquipmentMapper.listWaterQualityEquipment();
}
/**
* 妯＄硦鏌ヨ
*/
- public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
- if(keyword == null || keyword.trim().length() == 0){
+ public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(String keyword) {
+ if (keyword == null || keyword.trim().length() == 0) {
return listWaterQualityEquipment();
- }else{
+ } else {
return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
}
--
Gitblit v1.9.3