From a9cc2343ceaad3e99dc25eb036dc99aeded279a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:26:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 6d539cf..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
@@ -631,6 +631,9 @@
continue;
}
short lastCellNum = row.getLastCellNum();
+ if (lastCellNum<=0){
+ continue;
+ }
Object[] objects = new Object[lastCellNum];
for (int j = 0; j < lastCellNum; j++) {
@@ -644,7 +647,7 @@
HashMap<String, Object> map1 = new HashMap<>();
HashMap<String, Object> map2 = new HashMap<>();
- if (objects.length == 8) {
+ if (objects.length == 8 || objects.length == 9) {
if (objects[0]!=null){
if (!objects[1].toString().contains("H")
&& !objects[2].toString().contains("H")
@@ -1624,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