From f4ab89e7032bea8d3c7e05a44946c3fdb58b7473 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Tue, 27 Sep 2022 11:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
index 54daf3e..2608c7b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java
@@ -86,7 +86,7 @@
@Autowired
private SensorService sensorService;
- private static Map<String, String> senorMap = new HashMap<>();
+ private static final Map<String, String> senorMap = new HashMap<>();
static {
senorMap.put(Constants.SENSOR_CODE_PM25, "PM2_5");
@@ -237,7 +237,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -281,15 +281,15 @@
allDeviceSum = Double.parseDouble(o.toString());
}
- List<HistoryMonthly> preofessionDeviceHistoryMonthlyList = professionDataMap.get(resultTime);
+ List<HistoryMonthly> professionDeviceHistoryMonthlyList = professionDataMap.get(resultTime);
//���������
String contributionRate = null;
Double professionAvg = null;
- if (!ObjectUtils.isEmpty(preofessionDeviceHistoryMonthlyList)) {
+ if (!ObjectUtils.isEmpty(professionDeviceHistoryMonthlyList)) {
//���������������������
- professionAvg = historyMonthlyService.calculatedValue(preofessionDeviceHistoryMonthlyList, sensorCode, "avg");
+ professionAvg = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "avg");
//������������������������
- Double professionSum = historyMonthlyService.calculatedValue(preofessionDeviceHistoryMonthlyList, sensorCode, "sum");
+ Double professionSum = historyMonthlyService.calculatedValue(professionDeviceHistoryMonthlyList, sensorCode, "sum");
//���������������������
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMaximumFractionDigits(2);
@@ -299,9 +299,9 @@
}
//������������
- timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
//���������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
professionMap.put("data", dataList);
@@ -374,7 +374,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -436,9 +436,9 @@
}
//������������
- timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
//���������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
professionMap.put("data", dataList);
@@ -521,7 +521,7 @@
}
Map<String, Object> cityDataMap = new HashMap<>();
//������������
- cityDataMap.put("name", cityValue);
+ cityDataMap.put("value", cityValue);
cityDataList.add(cityDataMap);
}
@@ -583,9 +583,9 @@
}
//������������
- timeDataMap.put("name", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
+ timeDataMap.put("value", professionAvg == null ? null : AmendUtils.sciCal(professionAvg, 0));
//���������
- timeDataMap.put("value", contributionRate);
+ timeDataMap.put("name", contributionRate);
dataList.add(timeDataMap);
}
professionMap.put("data", dataList);
--
Gitblit v1.8.0