From 35a52749b6d1657910386ce28fe8d9af2811bed7 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 29 十二月 2021 15:09:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 78baffa..ea77199 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
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.domain.AirEquipment;
+import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
@@ -16,7 +18,8 @@
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
-
+ private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
+ private final PoleBindingService poleBindingService;
/**
* 鏌ヨ鍏ㄩ儴姘磋川璁惧
*/
@@ -31,13 +34,19 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
+ if(keyword == null || keyword.trim().length() == 0){
+ return listWaterQualityEquipment();
- LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
- if(keyword != null){
- wrapper.like(WaterQualityEquipment::getBelongTo,keyword);
+ }else{
+ return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
}
- List<WaterQualityEquipment> airDataList = list(wrapper);
- return airDataList;
+
+// LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
+//// if (keyword != null) {
+//// wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
+//// }
+// List<WaterQualityEquipment> airDataList = list(wrapper);
+// waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
}
/**
@@ -51,6 +60,30 @@
if (waterQualityEquipment == null) {
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
+ //鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
+
return removeById(Id);
}
+
+ /**
+ * 娣诲姞姘磋川璁惧
+ *
+ * @param waterQualityEquipment
+ * @return
+ */
+
+ public boolean addWaterQualityEquipment(WaterQualityEquipment waterQualityEquipment) {
+ if (waterQualityEquipment.getWaterQualityEquipmentCode() == null) {
+ throw new BusinessException("缂哄皯姘磋川璁惧鍙峰弬鏁�");
+ }
+ WaterQualityEquipment one = getOne(Wrappers.lambdaQuery(WaterQualityEquipment.class).eq(WaterQualityEquipment::getWaterQualityEquipmentCode,
+ waterQualityEquipment.getWaterQualityEquipmentCode()));
+ if (one == null) {
+ return save(waterQualityEquipment);
+ } else {
+ waterQualityEquipment.setId(one.getId());
+ return updateById(waterQualityEquipment);
+ }
+ }
}
--
Gitblit v1.9.3