|
@@ -1,5 +1,7 @@
|
|
|
package org.jetlinks.community.gateway.monitor.measurements;
|
|
|
|
|
|
+import org.hswebframework.web.api.crud.entity.QueryParamEntity;
|
|
|
+import org.jetlinks.community.timeseries.query.Aggregation;
|
|
|
import org.jetlinks.core.metadata.ConfigMetadata;
|
|
|
import org.jetlinks.core.metadata.DataType;
|
|
|
import org.jetlinks.core.metadata.DefaultConfigMetadata;
|
|
@@ -21,82 +23,133 @@ import java.util.Date;
|
|
|
|
|
|
class DeviceGatewayMeasurement extends StaticMeasurement {
|
|
|
|
|
|
- static MeasurementDefinition definition = new MeasurementDefinition() {
|
|
|
- @Override
|
|
|
- public String getId() {
|
|
|
- return "device-gateway-message-quantity";
|
|
|
- }
|
|
|
+ private TimeSeriesManager timeSeriesManager;
|
|
|
|
|
|
- @Override
|
|
|
- public String getName() {
|
|
|
- return "设备网关数据量";
|
|
|
- }
|
|
|
- };
|
|
|
-
|
|
|
- private TimeSeriesManager timeSeriesManager;
|
|
|
-
|
|
|
- public DeviceGatewayMeasurement(TimeSeriesManager timeSeriesManager) {
|
|
|
- super(definition);
|
|
|
- this.timeSeriesManager = timeSeriesManager;
|
|
|
- addDimension(new AggDeviceStateDimension());
|
|
|
- }
|
|
|
-
|
|
|
- static ConfigMetadata historyConfigMetadata = new DefaultConfigMetadata()
|
|
|
- .add("time", "周期", "例如: 1h,10m,30s", new StringType())
|
|
|
- .add("format", "时间格式", "如: MM-dd:HH", new StringType())
|
|
|
- .add("type", "类型", "", new EnumType()
|
|
|
- .addElement(EnumType.Element.of("connected", "创建连接数"))
|
|
|
- .addElement(EnumType.Element.of("rejected", "拒绝连接数"))
|
|
|
- .addElement(EnumType.Element.of("disconnected", "断开连接数"))
|
|
|
- .addElement(EnumType.Element.of("receivedMessage", "接收消息数"))
|
|
|
- .addElement(EnumType.Element.of("sentMessage", "发送消息数"))
|
|
|
- )
|
|
|
- .add("limit", "最大数据量", "", new IntType())
|
|
|
- .add("from", "时间从", "", new DateTimeType().format("yyyy-MM-dd HH:mm:ss"))
|
|
|
- .add("to", "时间至", "", new DateTimeType().format("yyyy-MM-dd HH:mm:ss"));
|
|
|
-
|
|
|
- static DataType historyValueType = new IntType();
|
|
|
-
|
|
|
- class AggDeviceStateDimension implements MeasurementDimension {
|
|
|
-
|
|
|
- @Override
|
|
|
- public DimensionDefinition getDefinition() {
|
|
|
- return CommonDimensionDefinition.agg;
|
|
|
- }
|
|
|
+ private String type;
|
|
|
|
|
|
- @Override
|
|
|
- public DataType getValueType() {
|
|
|
- return historyValueType;
|
|
|
- }
|
|
|
+ private Aggregation defaultAgg;
|
|
|
|
|
|
- @Override
|
|
|
- public ConfigMetadata getParams() {
|
|
|
- return historyConfigMetadata;
|
|
|
- }
|
|
|
+ private String property;
|
|
|
|
|
|
- @Override
|
|
|
- public boolean isRealTime() {
|
|
|
- return false;
|
|
|
+ public DeviceGatewayMeasurement(MeasurementDefinition definition,
|
|
|
+ String property,
|
|
|
+ Aggregation defaultAgg,
|
|
|
+ TimeSeriesManager timeSeriesManager) {
|
|
|
+ super(definition);
|
|
|
+ this.timeSeriesManager = timeSeriesManager;
|
|
|
+ this.defaultAgg = defaultAgg;
|
|
|
+ this.type = definition.getId();
|
|
|
+ this.property = property;
|
|
|
+ addDimension(new AggDeviceStateDimension());
|
|
|
+ addDimension(new HistoryDimension());
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public Flux<MeasurementValue> getValue(MeasurementParameter parameter) {
|
|
|
-
|
|
|
- return AggregationQueryParam.of()
|
|
|
- .sum("count")
|
|
|
- .groupBy(parameter.getDuration("time").orElse(Duration.ofHours(1)),
|
|
|
- "time",
|
|
|
- parameter.getString("format").orElse("MM-dd:HH"))
|
|
|
- .filter(query -> query.where("target", parameter.getString("type").orElse("connected")))
|
|
|
- .limit(parameter.getInt("limit").orElse(1))
|
|
|
- .from(parameter.getDate("from").orElse(Date.from(LocalDateTime.now().plusDays(-1).atZone(ZoneId.systemDefault()).toInstant())))
|
|
|
- .to(parameter.getDate("to").orElse(new Date()))
|
|
|
- .execute(timeSeriesManager.getService(GatewayTimeSeriesMetric.deviceGatewayMetric())::aggregation)
|
|
|
- .map(data -> SimpleMeasurementValue.of(
|
|
|
- data.getInt("count").orElse(0),
|
|
|
- data.getString("time").orElse(""),
|
|
|
- System.currentTimeMillis()));
|
|
|
+ static ConfigMetadata historyConfigMetadata = new DefaultConfigMetadata()
|
|
|
+ .add("gatewayId", "网关", "", new StringType())
|
|
|
+ .add("time", "周期", "例如: 1h,10m,30s", new StringType())
|
|
|
+ .add("format", "时间格式", "如: MM-dd:HH", new StringType())
|
|
|
+ .add("limit", "最大数据量", "", new IntType())
|
|
|
+ .add("from", "时间从", "", new DateTimeType().format("yyyy-MM-dd HH:mm:ss"))
|
|
|
+ .add("to", "时间至", "", new DateTimeType().format("yyyy-MM-dd HH:mm:ss"));
|
|
|
+
|
|
|
+
|
|
|
+ class HistoryDimension implements MeasurementDimension {
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public DimensionDefinition getDefinition() {
|
|
|
+ return CommonDimensionDefinition.history;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public DataType getValueType() {
|
|
|
+ return new IntType();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public ConfigMetadata getParams() {
|
|
|
+ return historyConfigMetadata;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean isRealTime() {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Flux<MeasurementValue> getValue(MeasurementParameter parameter) {
|
|
|
+ return QueryParamEntity.newQuery()
|
|
|
+ .where("target", type)
|
|
|
+ .is("name", parameter.getString("gatewayId").orElse(null))
|
|
|
+ .doPaging(0, parameter.getInt("limit").orElse(1))
|
|
|
+ .between("timestamp",
|
|
|
+ parameter.getDate("from").orElseGet(() -> Date.from(LocalDateTime.now().plusDays(-1).atZone(ZoneId.systemDefault()).toInstant())),
|
|
|
+ parameter.getDate("to").orElseGet(Date::new)
|
|
|
+ )
|
|
|
+ .execute(timeSeriesManager.getService(GatewayTimeSeriesMetric.deviceGatewayMetric())::query)
|
|
|
+ .map(data -> SimpleMeasurementValue.of(
|
|
|
+ data.getInt(property).orElse(0),
|
|
|
+ data.getTimestamp()));
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
+ static ConfigMetadata aggConfigMetadata = new DefaultConfigMetadata()
|
|
|
+ .add("gatewayId", "网关", "", new StringType())
|
|
|
+ .add("time", "周期", "例如: 1h,10m,30s", new StringType())
|
|
|
+ .add("format", "时间格式", "如: MM-dd:HH", new StringType())
|
|
|
+ .add("agg", "聚合方式", "", new EnumType()
|
|
|
+ .addElement(EnumType.Element.of("SUM", "总和"))
|
|
|
+ .addElement(EnumType.Element.of("MAX", "最大值"))
|
|
|
+ .addElement(EnumType.Element.of("MIN", "最小值"))
|
|
|
+ .addElement(EnumType.Element.of("AVG", "平局值"))
|
|
|
+ )
|
|
|
+ .add("limit", "最大数据量", "", new IntType())
|
|
|
+ .add("from", "时间从", "", new DateTimeType().format("yyyy-MM-dd HH:mm:ss"))
|
|
|
+ .add("to", "时间至", "", new DateTimeType().format("yyyy-MM-dd HH:mm:ss"));
|
|
|
+
|
|
|
+
|
|
|
+ //聚合数据
|
|
|
+ class AggDeviceStateDimension implements MeasurementDimension {
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public DimensionDefinition getDefinition() {
|
|
|
+ return CommonDimensionDefinition.agg;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public DataType getValueType() {
|
|
|
+ return new IntType();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public ConfigMetadata getParams() {
|
|
|
+ return aggConfigMetadata;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean isRealTime() {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Flux<MeasurementValue> getValue(MeasurementParameter parameter) {
|
|
|
+
|
|
|
+ return AggregationQueryParam.of()
|
|
|
+ .agg(property, parameter.get("agg", Aggregation.class).orElse(defaultAgg))
|
|
|
+ .groupBy(parameter.getDuration("time").orElse(Duration.ofHours(1)),
|
|
|
+ "time",
|
|
|
+ parameter.getString("format").orElse("MM-dd:HH"))
|
|
|
+ .filter(query -> query
|
|
|
+ .where("target", type)
|
|
|
+ .is("name", parameter.getString("gatewayId").orElse(null)))
|
|
|
+ .limit(parameter.getInt("limit").orElse(1))
|
|
|
+ .from(parameter.getDate("from").orElseGet(()->Date.from(LocalDateTime.now().plusDays(-1).atZone(ZoneId.systemDefault()).toInstant())))
|
|
|
+ .to(parameter.getDate("to").orElse(new Date()))
|
|
|
+ .execute(timeSeriesManager.getService(GatewayTimeSeriesMetric.deviceGatewayMetric())::aggregation)
|
|
|
+ .map(data -> SimpleMeasurementValue.of(
|
|
|
+ data.getInt(property).orElse(0),
|
|
|
+ data.getString("time").orElse(""),
|
|
|
+ System.currentTimeMillis()));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|