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/WaterQualityDataService.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 5606069..28de73b 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
@@ -4,10 +4,12 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.dto.WaterQualityDataDto;
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;
@@ -19,27 +21,31 @@
//姘磋川鍙傛暟鑾峰彇缃戝潃锛屼緥濡傦細"http://iot.ainongye.cn/json/璁惧缂栧彿.json"
private final String WATER_QUALITY_DATA_URL = "http://iot.ainongye.cn/json/";
+ private WaterQualityDataMapper waterQualityDataMapper;
+
/**
* 鏌ヨ鍏ㄩ儴姘磋川璁惧鏁版嵁
*/
public List<WaterQualityData> listWaterQualityData() {
- LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
- List<WaterQualityData> list = list(wrapper);
-
- return list;
+ return waterQualityDataMapper.listWaterQualityData();
}
/**
* 妯＄硦鏌ヨ
*/
public List<WaterQualityData> listWaterQualityDataByKeyword(String keyword) {
-
- LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
- if (keyword != null) {
- wrapper.like(WaterQualityData::getBelongTo, keyword);
+ if (keyword == null || keyword.trim().length() == 0) {
+ return listWaterQualityData();
+ } else {
+ return waterQualityDataMapper.listWaterQualityDataByKeyword(keyword);
}
- List<WaterQualityData> waterQualityDataList = list(wrapper);
- return waterQualityDataList;
+
+// LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
+// if (keyword != null) {
+// wrapper.like(WaterQualityData::getBelongTo, keyword);
+// }
+// List<WaterQualityData> waterQualityDataList = list(wrapper);
+// return waterQualityDataList;
}
/**
@@ -76,6 +82,7 @@
save(waterQualityData);
} catch (Exception e) {
e.printStackTrace();
+ throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
}
return waterQualityDataDto;
--
Gitblit v1.9.3