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/AirEquipmentService.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index 2343341..69b2386 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
@@ -18,27 +19,37 @@
@AllArgsConstructor
public class AirEquipmentService extends BaseServiceImpl<AirEquipmentMapper, AirEquipment> {
+ private final AirEquipmentMapper airEquipmentMapper;
+
/**
* 鏌ヨ鍏ㄩ儴澶ф皵璁惧鏁版嵁
*/
- public List<AirEquipment> listAirEquipment() {
- LambdaQueryWrapper<AirEquipment> wrapper = Wrappers.lambdaQuery(AirEquipment.class);
- List<AirEquipment> list = list(wrapper);
-
- return list;
+ public List<AirEquipmentBo> listAirEquipment() {
+ return airEquipmentMapper.listAirEquipment();
}
/**
* 妯＄硦鏌ヨ
*/
- public List<AirEquipment> listAirEquipmentByKeyword(String keyword) {
-
- LambdaQueryWrapper<AirEquipment> wrapper = Wrappers.lambdaQuery(AirEquipment.class);
- if(keyword != null){
- wrapper.like(AirEquipment::getBelongTo,keyword);
+ public List<AirEquipmentBo> listAirEquipmentByKeyword(String keyword) {
+ if (keyword == null || keyword.trim().length() == 0) {
+ return listAirEquipment();
+ } else {
+ return airEquipmentMapper.listAirEquipmentByKeyword(keyword);
}
- List<AirEquipment> airDataList = list(wrapper);
- return airDataList;
+
+ }
+
+ /**
+ * 娣诲姞澶ф皵璁惧鏁版嵁
+ *
+ * @return
+ */
+ public void addAirEquipment(AirEquipment airEquipment) {
+ AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, airEquipment.getMac()));
+ if (one == null) {
+ save(airEquipment);
+ }
}
/**
--
Gitblit v1.9.3