From bc940795faa161a988a7df3f27072bb426f17fdb Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期三, 19 十月 2022 16:34:09 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java | 91 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 43 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..27b8319 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;
}
/**
@@ -57,32 +52,42 @@
WaterQualityDataDto waterQualityDataDto = null;
try {
String s = HttpUtil.get(WATER_QUALITY_DATA_URL + waterQualityEquipmentCode + ".json");
- System.out.println(s);
-
- waterQualityDataDto = JSON.parseObject(s, WaterQualityDataDto.class);
- WaterQualityData waterQualityData = new WaterQualityData();
- for (WaterQualityDataDto.WaterQualityBean bean : waterQualityDataDto.getData()) {
- switch (bean.getCode()) {
- case "A211"://姘磋川PH
- waterQualityData.setWaterQualityPh(bean.getValue());
- break;
- case "A203"://姘磋川婧惰В姘�
- waterQualityData.setWaterQualityDo(bean.getValue());
- break;
- case "A343"://娴婂害
- waterQualityData.setWaterQualityNtu(bean.getValue());
- break;
- case "A209"://鐢靛鐜�
- waterQualityData.setWaterQualityEc(bean.getValue());
- break;
- default:
+ if (s.startsWith("{") && s.endsWith("}")) {
+ System.out.println(s);
+ waterQualityDataDto = JSON.parseObject(s, WaterQualityDataDto.class);
+ WaterQualityData waterQualityData = new WaterQualityData();
+ for (WaterQualityDataDto.WaterQualityBean bean : waterQualityDataDto.getData()) {
+ switch (bean.getCode()) {
+ case "A211"://姘磋川PH
+ waterQualityData.setWaterQualityPh(bean.getValue());
+ break;
+ case "A203"://姘磋川婧惰В姘�
+ waterQualityData.setWaterQualityDo(bean.getValue());
+ break;
+ case "A343"://娴婂害
+ waterQualityData.setWaterQualityNtu(bean.getValue());
+ break;
+ case "A209"://鐢靛鐜�
+ waterQualityData.setWaterQualityEc(bean.getValue());
+ break;
+ default:
+ }
}
+ waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
+ //璁剧疆姘磋川璁惧鐘舵��
+ if (waterQualityDataDto != null) {
+ waterQualityDataDto.setState(1);
+ } else {
+ waterQualityDataDto.setState(0);
+ }
+ save(waterQualityData);
+ } else {
+ System.out.println("姘磋川鏁版嵁涓嶆纭紒");
}
- waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
- save(waterQualityData);
} catch (Exception e) {
e.printStackTrace();
- throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
+ log.error("姘磋川璁惧鍙蜂笉姝ｇ‘");
+// throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
}
return waterQualityDataDto;
--
Gitblit v1.9.3