From f2f153d71b37f0998e979de889fcb986f356a54f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 13 Oct 2022 11:34:56 +0800
Subject: [PATCH] 修改浑南区图表季度PM2.5数据
---
screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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 b03f176..b411222 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
@@ -196,22 +196,19 @@
list1.add(0,"������������");
rsMap.put("hnq1",list1);
}
+
+ if (s.equals("������")){
+ List<Integer> list = stringListMap.get(s);
+ if (list.size()>0){
+ syExcelVo.setCode6(list.get(0).toString());
+ }else {
+ syExcelVo.setCode6("");
+ }
+
+ }
if (s.equals("PM2_5")){
ArrayList<String> list1 = new ArrayList<>();
List<Integer> list = stringListMap.get(s);
- Integer sum =0;
- if (data>=1 && data<=3){
- sum = list.get(0) + list.get(1) + list.get(2);
- }else if (data>=4 &&data<=6){
- sum = list.get(3) + list.get(4) + list.get(5);
- }else if (data>=7 &&data<=9){
- sum = list.get(6) + list.get(7) + list.get(8);
- }else {
- sum = list.get(9) + list.get(10) + list.get(11);
- }
-
- Integer round = Math.round(sum / 3);
- syExcelVo.setCode6(round.toString());
for (int i = 0; i < list.size()-1; i++) {
if (list.get(i)==0){
list1.add("");
@@ -645,6 +642,34 @@
}
}
+
+ //������������pm2.5
+ String ju = time.substring(5, 7);
+ int data = Integer.parseInt(ju);
+ ArrayList<Double> rsData = new ArrayList<>();
+ if (data>=1 && data<=3){
+ rsData.addAll(list1);
+ rsData.addAll(list2);
+ rsData.addAll(list3);
+ }else if (data>=4 &&data<=6){
+ rsData.addAll(list4);
+ rsData.addAll(list5);
+ rsData.addAll(list6);
+ }else if (data>=7 &&data<=9){
+ rsData.addAll(list7);
+ rsData.addAll(list8);
+ rsData.addAll(list9);
+ }else {
+ rsData.addAll(list10);
+ rsData.addAll(list11);
+ rsData.addAll(list12);
+ }
+ ArrayList<Integer> pmList = new ArrayList<>();
+ if (rsData.size()>0){
+ int pm = (int) AmendUtils.sciCal(rsData.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 0);
+ pmList.add(pm);
+ }
+
int code1 =0;
int code2 =0;
int code3 =0;
@@ -782,6 +807,7 @@
listPM.add(resPM25);
listMap.put("PM2_5",listPM);
listMap.put("������",integers);
+ listMap.put("������",pmList);
return listMap;
}
--
Gitblit v1.8.0