From ba1482bb35c4f44deb069eb086acd7ec3b536548 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期五, 31 十二月 2021 17:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 19 +++++++++++--------
1 files changed, 11 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 5f89415..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;
@@ -19,24 +20,23 @@
@AllArgsConstructor
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);
}
@@ -59,6 +59,9 @@
if (waterQualityEquipment == null) {
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
+ //鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
+
return removeById(Id);
}
--
Gitblit v1.9.3