From f78a9e03ae3f455a85dfd4d8a258dc0fbbb9e694 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 15:39:36 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 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 d238095..867aa19 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,16 @@
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;
@@ -18,28 +24,32 @@
@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) {
-
- LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
- if (keyword != null) {
- wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
+ public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ Long userId = SecurityUtils.getUserId();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
- List<WaterQualityEquipment> airDataList = list(wrapper);
- return airDataList;
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
+ } else {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
+ }
+ return waterQualityEquipmentBoList;
}
/**
@@ -53,6 +63,9 @@
if (waterQualityEquipment == null) {
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
+ //鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());
+
return removeById(Id);
}
--
Gitblit v1.9.3