From 9330e9b0e4e70151d36084ecb5695b818cfda2db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
index 28de73b..8be5742 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
@@ -1,15 +1,17 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
-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.dto.WaterQualityDataDto;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
import com.sandu.ximon.dao.mapper.WaterQualityDataMapper;
-import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -24,28 +26,21 @@
private WaterQualityDataMapper waterQualityDataMapper;
/**
- * 鏌ヨ鍏ㄩ儴姘磋川璁惧鏁版嵁
- */
- public List<WaterQualityData> listWaterQualityData() {
- return waterQualityDataMapper.listWaterQualityData();
- }
-
- /**
* 妯＄硦鏌ヨ
*/
- public List<WaterQualityData> listWaterQualityDataByKeyword(String keyword) {
- if (keyword == null || keyword.trim().length() == 0) {
- return listWaterQualityData();
+ public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Long> waterQualityDataId;
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
} else {
- return waterQualityDataMapper.listWaterQualityDataByKeyword(keyword);
+ waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
}
-
-// LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
-// if (keyword != null) {
-// wrapper.like(WaterQualityData::getBelongTo, keyword);
-// }
-// List<WaterQualityData> waterQualityDataList = list(wrapper);
-// return waterQualityDataList;
+ if (CollUtil.isEmpty(waterQualityDataId)) {
+ return CollUtil.newArrayList();
+ }
+ List<WaterQualityDataBo> airEquipmentBos = waterQualityDataMapper.listWaterQualityDataByIds(waterQualityDataId);
+ return airEquipmentBos;
}
/**
@@ -79,10 +74,17 @@
}
}
waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
+ //璁剧疆姘磋川璁惧鐘舵��
+ if (waterQualityDataDto != null) {
+ waterQualityDataDto.setState(1);
+ } else {
+ waterQualityDataDto.setState(0);
+ }
save(waterQualityData);
} catch (Exception e) {
e.printStackTrace();
- throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
+ log.error("姘磋川璁惧鍙蜂笉姝ｇ‘");
+// throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
}
return waterQualityDataDto;
--
Gitblit v1.9.3