From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
index 2c5cfb9..d742c7e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
@@ -1627,12 +1627,20 @@
if (i < 10) {
Object o = hnMap1.get(s + "-" + month + "-0" + i);
String s1 = JSON.toJSONString(o);
+ if (s1.equals("null")){
+ list2.add(0.0);
+ continue;
+ }
Map map1 = JSON.parseObject(s1, Map.class);
String pm2_5 = map1.get("PM2_5").toString();
list2.add(Double.parseDouble(pm2_5));
} else {
Object o = hnMap1.get(s + "-" + month + "-" + i);
String s1 = JSON.toJSONString(o);
+ if (s1.equals("null")){
+ list2.add(0.0);
+ continue;
+ }
Map map1 = JSON.parseObject(s1, Map.class);
String pm2_5 = map1.get("PM2_5").toString();
list2.add(Double.parseDouble(pm2_5));
--
Gitblit v1.8.0