From eca8731f8626a8baf4d472de31da160e5f77abc7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Dec 2021 16:56:12 +0800
Subject: [PATCH] 获取多设备公有因子,排序
---
screen-api/src/main/java/com/moral/api/service/impl/ProfessionServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..a4adcb6 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
@@ -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);
--
Gitblit v1.8.0