From 3fa847083d45461b4e5ee7ec3dbd9247e8a5047c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 12 一月 2022 10:28:05 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 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..e08ac9e 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
@@ -1,10 +1,18 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
+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;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
@@ -16,28 +24,25 @@
@Service
@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) {
+ public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ Long clientId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
- if(keyword != null){
- wrapper.like(WaterQualityEquipment::getBelongTo,keyword);
- }
- List<WaterQualityEquipment> airDataList = list(wrapper);
- return airDataList;
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, clientId);
+ return waterQualityEquipmentBoList;
}
/**
@@ -51,6 +56,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