From 1f93887d0e1e327cf7a1dc644cb59b5f8cca1e88 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Oct 2022 13:57:42 +0800
Subject: [PATCH] 上传浑南区图表功能
---
screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 6b48252..79b6f06 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
@@ -36,8 +36,7 @@
import com.moral.api.pojo.vo.excel.ExcelVo;
import com.moral.api.service.ExcelService;
import com.moral.api.utils.ExcelUtils;
-import com.moral.pojo.AQI;
-import com.moral.util.AQIUtils;
+
import com.moral.util.DateUtils;
@@ -48,7 +47,7 @@
private ExcelMapper excelMapper;
/**
- * ������
+ * ���������������
* @param files
* @param params
* @return
@@ -83,9 +82,11 @@
MultipartFile file5 = files.get(4);
Map<String, Object> map5 = getMap5(file5);
map.put("c5",map5);
- MultipartFile file6 = files.get(5);
- Map<String, Object> map6 = getMap6(file6);
- map.put("c6",map6);
+ if (files.size()>5){
+ MultipartFile file6 = files.get(5);
+ Map<String, Object> map6 = getMap6(file6);
+ map.put("c6",map6);
+ }
String s = JSON.toJSONString(map);
excel1.setValue(s);
excel1.setTime(date);
@@ -113,9 +114,11 @@
MultipartFile file5 = files.get(4);
Map<String, Object> map5 = getMap5(file5);
map.put("c5",map5);
- MultipartFile file6 = files.get(5);
- Map<String, Object> map6 = getMap6(file6);
- map.put("c6",map6);
+ if (files.size()>5){
+ MultipartFile file6 = files.get(5);
+ Map<String, Object> map6 = getMap6(file6);
+ map.put("c6",map6);
+ }
String s = JSON.toJSONString(map);
excel.setValue(s);
excelMapper.updateById(excel);
@@ -127,14 +130,12 @@
}
/**
- * ������
+ * ���������������
* @param id
* @return
*/
@Override
public ExcelVo export(Integer id) {
-
-
HashMap<String, Object> map1 = new HashMap<>();
ArrayList<Map<String,Object>> list1 = new ArrayList<>();
ArrayList<Map<String,Object>> list2 = new ArrayList<>();
--
Gitblit v1.8.0