From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-common/src/main/java/com/moral/util/AmendUtils.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 3c726b1..ac3c4e0 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -57,6 +57,9 @@
             List<Double> data = new ArrayList<>();
             for (Map<String, Object> dataMap : list) {
                 Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
+                if (ObjectUtils.isEmpty(dataValue.get(Constants.SENSOR_CODE_O3))){
+                    continue;
+                }
                 Double o3 = Double.parseDouble(dataValue.get(Constants.SENSOR_CODE_O3).toString());
 
                 //O3���������������

--
Gitblit v1.8.0