From 556ba4f27cc2f9e47a355b3672abdb4715673cee Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 28 Dec 2020 11:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96group?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/TimeSeriesRowDeviceDataStoreStoragePolicy.java | 4 ++-- .../community/device/web/GatewayDeviceController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/TimeSeriesRowDeviceDataStoreStoragePolicy.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/TimeSeriesRowDeviceDataStoreStoragePolicy.java index 4541fa62..650e5618 100644 --- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/TimeSeriesRowDeviceDataStoreStoragePolicy.java +++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/TimeSeriesRowDeviceDataStoreStoragePolicy.java @@ -239,13 +239,13 @@ public class TimeSeriesRowDeviceDataStoreStoragePolicy extends TimeSeriesDeviceD //执行查询 .execute(timeSeriesManager.getService(getTimeSeriesMetric(productId))::aggregation) //按时间分组,然后将返回的结果合并起来 - .groupBy(agg -> agg.getString("time", "")) + .groupBy(agg -> agg.getString("time", ""),Integer.MAX_VALUE) .flatMap(group -> { String time = group.key(); return group //按属性分组 - .groupBy(agg -> agg.getString("property", "")) + .groupBy(agg -> agg.getString("property", ""),Integer.MAX_VALUE) .flatMap(propsGroup -> { String property = propsGroup.key(); return propsGroup diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/GatewayDeviceController.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/GatewayDeviceController.java index 340d1af8..53d08fb3 100644 --- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/GatewayDeviceController.java +++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/GatewayDeviceController.java @@ -82,7 +82,7 @@ public class GatewayDeviceController { .where() .in(DeviceInstanceEntity::getParentId, mapping.keySet()) .fetch() - .groupBy(DeviceInstanceEntity::getParentId) + .groupBy(DeviceInstanceEntity::getParentId,Integer.MAX_VALUE) .flatMap(group -> { String parentId = group.key(); return group