From 17c774c9c13febdcff654ffd6bbabd313c37a3ee Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:24:09 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
index 6d52025..6d6bce9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
@@ -492,58 +492,58 @@
map.put("mac", objects[0]);
map.put("time", objects[1]);
// pm2.5
- if (!objects[2].toString().equals("--")){
+ if (!objects[2].toString().equals("-")){
map.put("a34004", objects[2]);
}
// pm10
- if (!objects[3].toString().equals("--")){
+ if (!objects[3].toString().equals("-")){
map.put("a34002", objects[3]);
}
// ������������
- if (!objects[4].toString().equals("--")){
+ if (!objects[4].toString().equals("-")){
map.put("a21026", objects[4]);
}
// ������������
- if (!objects[5].toString().equals("--")){
+ if (!objects[5].toString().equals("-")){
map.put("a21004", objects[5]);
}
// co
- if (!objects[6].toString().equals("--")){
+ if (!objects[6].toString().equals("-")){
map.put("a21005", objects[6]);
}
// o3
- if (!objects[7].toString().equals("--")){
+ if (!objects[7].toString().equals("-")){
map.put("a05024", objects[7]);
}
// ������
- if (!objects[8].toString().equals("--")){
+ if (!objects[8].toString().equals("-")){
map.put("a01001", objects[8]);
}
// ������
- if (!objects[9].toString().equals("--")){
+ if (!objects[9].toString().equals("-")){
map.put("a01002", objects[9]);
}
// ������
- if (!objects[10].toString().equals("--")){
+ if (!objects[10].toString().equals("-")){
map.put("a01007", objects[10]);
}
// ������
- if (!objects[11].toString().equals("--")){
+ if (!objects[11].toString().equals("-")){
map.put("a01008", objects[11]);
}
// ������
- if (!objects[12].toString().equals("--")){
+ if (!objects[12].toString().equals("-")){
map.put("a01006", objects[12]);
}
// ������������
- if (!objects[13].toString().equals("--")){
+ if (!objects[13].toString().equals("-")){
map.put("a00e12", objects[13]);
}
// tvoc
- if (!objects[14].toString().equals("--")){
+ if (!objects[14].toString().equals("-")){
map.put("a99054", objects[14]);
}
@@ -561,7 +561,13 @@
for (Map<String, Object> map : list) {
HistoryDaily historyDaily = new HistoryDaily();
String time = map.remove("time").toString();
- Date date = DateUtils.dateStringToDate(time);
+ Date date=null;
+ if (time.length()>20){
+ date = DateUtils.dateStringToDate(time);
+ }else {
+ date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ }
+
String mac = map.remove("mac").toString();
String value = JSONObject.toJSONString(map);
historyDaily.setMac(mac);
--
Gitblit v1.8.0