From 9655ea9ce8cdd671a766f87a0885b0fdff7b89c9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Aug 2023 17:12:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
index eda029a..8d59d01 100644
--- a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
@@ -126,35 +126,45 @@
if (ObjectUtils.isEmpty(map)){
return deviceData;
}
- if (ObjectUtils.isEmpty(aqiMap.get("a21005"))){
- JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
- String a21005 = jsonObject.get("a21005").toString();
- deviceData.put("a21005",Double.parseDouble(a21005));
- }
- if (ObjectUtils.isEmpty(aqiMap.get("a21026"))){
- JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
- String a21026 = jsonObject.get("a21026").toString();
- deviceData.put("a21026",Double.parseDouble(a21026));
- }
- if (ObjectUtils.isEmpty(aqiMap.get("a21004"))){
- JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
- String a21004 = jsonObject.get("a21004").toString();
- deviceData.put("a21004",Double.parseDouble(a21004));
- }
- if (ObjectUtils.isEmpty(aqiMap.get("a34002"))){
- JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
- String a34002 = jsonObject.get("a34002").toString();
- deviceData.put("a34002",Double.parseDouble(a34002));
- }
- if (ObjectUtils.isEmpty(aqiMap.get("a34004"))){
- JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
- String a34004 = jsonObject.get("a34004").toString();
- deviceData.put("a34004",Double.parseDouble(a34004));
- }
- if (ObjectUtils.isEmpty(aqiMap.get("a05024"))){
- JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
- String a05024 = jsonObject.get("a05024").toString();
- deviceData.put("a05024",Double.parseDouble(a05024));
+ JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
+ if (ObjectUtils.isEmpty(aqiMap)){
+ deviceData.put("a21005",Double.parseDouble(jsonObject.get("a21005").toString()));
+ deviceData.put("a21026",Double.parseDouble(jsonObject.get("a21026").toString()));
+ deviceData.put("a21004",Double.parseDouble(jsonObject.get("a21004").toString()));
+ deviceData.put("a34002",Double.parseDouble(jsonObject.get("a34002").toString()));
+ deviceData.put("a34004",Double.parseDouble(jsonObject.get("a34004").toString()));
+ deviceData.put("a05024",Double.parseDouble(jsonObject.get("a05024").toString()));
+ }else {
+ if (ObjectUtils.isEmpty(aqiMap.get("a21005"))){
+
+ String a21005 = jsonObject.get("a21005").toString();
+ deviceData.put("a21005",Double.parseDouble(a21005));
+ }
+ if (ObjectUtils.isEmpty(aqiMap.get("a21026"))){
+// JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
+ String a21026 = jsonObject.get("a21026").toString();
+ deviceData.put("a21026",Double.parseDouble(a21026));
+ }
+ if (ObjectUtils.isEmpty(aqiMap.get("a21004"))){
+// JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
+ String a21004 = jsonObject.get("a21004").toString();
+ deviceData.put("a21004",Double.parseDouble(a21004));
+ }
+ if (ObjectUtils.isEmpty(aqiMap.get("a34002"))){
+// JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
+ String a34002 = jsonObject.get("a34002").toString();
+ deviceData.put("a34002",Double.parseDouble(a34002));
+ }
+ if (ObjectUtils.isEmpty(aqiMap.get("a34004"))){
+// JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
+ String a34004 = jsonObject.get("a34004").toString();
+ deviceData.put("a34004",Double.parseDouble(a34004));
+ }
+ if (ObjectUtils.isEmpty(aqiMap.get("a05024"))){
+// JSONObject jsonObject = JSONObject.parseObject(map.get("value").toString());
+ String a05024 = jsonObject.get("a05024").toString();
+ deviceData.put("a05024",Double.parseDouble(a05024));
+ }
}
}
--
Gitblit v1.8.0