From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 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 92cc163..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
@@ -29,9 +29,13 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, clientId);
+ List<Long> waterQualityDataId;
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
+ } else {
+ waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
+ }
if (CollUtil.isEmpty(waterQualityDataId)) {
return CollUtil.newArrayList();
}
@@ -48,38 +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);
+ waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
+ //璁剧疆姘磋川璁惧鐘舵��
+ if (waterQualityDataDto != null) {
+ waterQualityDataDto.setState(1);
+ } else {
+ waterQualityDataDto.setState(0);
+ }
+ save(waterQualityData);
} else {
- waterQualityDataDto.setState(0);
+ System.out.println("姘磋川鏁版嵁涓嶆纭紒");
}
- save(waterQualityData);
} catch (Exception e) {
e.printStackTrace();
- throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
+ log.error("姘磋川璁惧鍙蜂笉姝ｇ‘");
+// throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
}
return waterQualityDataDto;
--
Gitblit v1.9.3