From 38c84ea8b272bedd429e0031f283cdc83e203c76 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 28 Sep 2021 16:02:08 +0800
Subject: [PATCH] 均值计算上下限修改
---
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
index 971a459..2a9440d 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
@@ -74,7 +74,7 @@
//������������������
String deviceName = deviceMap.get(key).getName();
//������������������
- organizationService.getOrganizationById(deviceMap.get(key).getOrganizationId());
+ String orgName = organizationService.getOrganizationById(deviceMap.get(key).getOrganizationId()).getName();
//������������
String startTime = DateUtils.dateToDateString(startDate, "yyyy-MM-dd");
String endTime = DateUtils.dateToDateString(endDate, "yyyy-MM-dd");
@@ -165,6 +165,10 @@
double TVOCAvg = AmendUtils.sciCal(TVOCSum / TVOCNum,2);
+ dto.setDeviceName(deviceName);
+ dto.setTime(time);
+ dto.setOrganizationName(orgName);
+
});
}
--
Gitblit v1.8.0