From 6eb8f65d4a69a550945a92cc916d3c63dee739fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:55:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb_21' 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 005d4ca..9619dba 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
@@ -358,8 +358,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