From cc2e35bac3aca6d98b337a0b306c279f036ce989 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Sep 2023 11:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 74d4260..bd62813 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -359,8 +359,14 @@
Map<String,Object> historyHourlyMap = new HashMap<>();
historyHourlyMap.put("mac",mac);
JSONObject value = JSONObject.parseObject(historyFiveMinutely.getValue());
- Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
- historyHourlyMap.put(sensorCode,sensorValue);
+ if (value.get(sensorCode)==null){
+ historyHourlyMap.put(sensorCode,0.0);
+ }else {
+ Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
+ historyHourlyMap.put(sensorCode,sensorValue);
+ }
+// Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
+// historyHourlyMap.put(sensorCode,sensorValue);
Date time = historyFiveMinutely.getTime();
String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
historyHourlyMap.put("time",timeStr);
--
Gitblit v1.8.0