Search in sources :

Example 1 with StreamingPointValueTimeModel

use of com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel in project ma-modules-public by infiniteautomation.

the class AggregateValueMapper method apply.

@Override
public StreamingPointValueTimeModel apply(SeriesValueTime<? extends AggregateValue> value) {
    DataPointVO point = lookupPoint(value.getSeriesId());
    RollupEnum rollup = rollup(point);
    AggregateValue aggregate = value.getValue();
    StreamingPointValueTimeModel model = new StreamingPointValueTimeModel(point.getXid(), value.getTime());
    if (rollup == RollupEnum.ALL) {
        AllStatisticsModel allStatisticsModel = getAllRollup(point, aggregate);
        model.setAllStatistics(allStatisticsModel);
    } else {
        ValueTimeModel rollupValue = getRollupValue(point, aggregate, rollup);
        model.setValueModel(rollupValue);
    }
    if (fields.contains(PointValueField.CACHED)) {
        model.setCached(false);
    }
    if (fields.contains(PointValueField.BOOKEND)) {
        model.setBookend(false);
    }
    return copyPointPropertiesToModel(point, model);
}
Also used : DataPointVO(com.serotonin.m2m2.vo.DataPointVO) AggregateValue(com.serotonin.m2m2.db.dao.pointvalue.AggregateValue) AllStatisticsModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.AllStatisticsModel) MultistateAllStatisticsModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.MultistateAllStatisticsModel) StreamingPointValueTimeModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel) StreamingPointValueTimeModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel) ValueTimeModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.ValueTimeModel) RollupEnum(com.infiniteautomation.mango.rest.latest.model.pointValue.RollupEnum)

Example 2 with StreamingPointValueTimeModel

use of com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel in project ma-modules-public by infiniteautomation.

the class DefaultStreamMapper method apply.

@Override
public StreamingPointValueTimeModel apply(IdPointValueTime valueTime) {
    DataPointVO point = lookupPoint(valueTime.getSeriesId());
    StreamingPointValueTimeModel model = new StreamingPointValueTimeModel(point.getXid(), valueTime.getTime());
    model.setValueModel(getValue(point, valueTime));
    if (fields.contains(PointValueField.CACHED)) {
        model.setCached(valueTime.isFromCache());
    }
    if (fields.contains(PointValueField.BOOKEND)) {
        model.setBookend(valueTime.isBookend());
    }
    if (fields.contains(PointValueField.ANNOTATION)) {
        if (valueTime instanceof IAnnotated) {
            model.setAnnotation(((IAnnotated) valueTime).getSourceMessage());
        }
    }
    return copyPointPropertiesToModel(point, model);
}
Also used : DataPointVO(com.serotonin.m2m2.vo.DataPointVO) StreamingPointValueTimeModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel) IAnnotated(com.serotonin.m2m2.rt.dataImage.IAnnotated)

Example 3 with StreamingPointValueTimeModel

use of com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel in project ma-modules-public by infiniteautomation.

the class PointValueRestController method getStatistics.

@ApiOperation(value = "GET statistics for data point(s) over the given time range", notes = "From time inclusive, To time exclusive. Returns map of xid to Statistics object", response = PointValueTimeModel.class, responseContainer = "Map")
@RequestMapping(method = RequestMethod.GET, value = "/statistics/{xids}")
public Map<String, StreamingPointValueTimeModel> getStatistics(@ApiParam(value = "Point xids", required = true, allowMultiple = true) @PathVariable String[] xids, @ApiParam(value = "From time") @RequestParam(value = "from", required = false) @DateTimeFormat(iso = ISO.DATE_TIME) ZonedDateTime from, @ApiParam(value = "To time") @RequestParam(value = "to", required = false) @DateTimeFormat(iso = ISO.DATE_TIME) ZonedDateTime to, @ApiParam(value = "Time zone") @RequestParam(value = "timezone", required = false) String timezone, @ApiParam(value = "Date Time format pattern for timestamps as strings, if not included epoch milli number is used") @RequestParam(value = "dateTimeFormat", required = false) String dateTimeFormat, @ApiParam(value = "Fields to be included in the returned data, default is TIMESTAMP,VALUE") @RequestParam(required = false) PointValueField[] fields, Locale locale) {
    var points = Arrays.stream(xids).distinct().map(dataPointService::get).collect(Collectors.toUnmodifiableSet());
    var mapperBuilder = new StreamMapperBuilder().withDataPoints(points).withRollup(RollupEnum.ALL).withFields(fields).withDateTimeFormat(dateTimeFormat).withTimezone(timezone, from, to).withLocale(locale).withTimestampSource(TimestampSource.STATISTIC);
    var aggregateMapper = mapperBuilder.build(AggregateValueMapper::new);
    var rollupPeriod = Duration.between(from, to);
    return points.stream().collect(Collectors.toUnmodifiableMap(DataPointVO::getXid, point -> {
        var aggregateDao = dao.getAggregateDao();
        try (var stream = aggregateDao.query(point, from, to, null, rollupPeriod)) {
            return stream.map(aggregateMapper).findAny().orElseThrow();
        }
    }));
}
Also used : Arrays(java.util.Arrays) RequestParam(org.springframework.web.bind.annotation.RequestParam) ZonedDateTime(java.time.ZonedDateTime) Autowired(org.springframework.beans.factory.annotation.Autowired) ApiParam(io.swagger.annotations.ApiParam) PermissionHolder(com.serotonin.m2m2.vo.permission.PermissionHolder) DataPointVO(com.serotonin.m2m2.vo.DataPointVO) Duration(java.time.Duration) Map(java.util.Map) MultistateValue(com.serotonin.m2m2.rt.dataImage.types.MultistateValue) PointValueTimeModel(com.infiniteautomation.mango.rest.latest.model.pointValue.PointValueTimeModel) RuntimeManager(com.serotonin.m2m2.rt.RuntimeManager) XidTimeRangeQueryModel(com.infiniteautomation.mango.rest.latest.model.pointValue.query.XidTimeRangeQueryModel) RestController(org.springframework.web.bind.annotation.RestController) ZoneId(java.time.ZoneId) Stream(java.util.stream.Stream) DateUtils(com.serotonin.m2m2.util.DateUtils) TimestampSource(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.TimestampSource) PermissionService(com.infiniteautomation.mango.spring.service.PermissionService) DataSourceService(com.infiniteautomation.mango.spring.service.DataSourceService) StreamingMultiPointModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingMultiPointModel) PointValueDao(com.serotonin.m2m2.db.dao.PointValueDao) ArrayList(java.util.ArrayList) RequestBody(org.springframework.web.bind.annotation.RequestBody) DataType(com.serotonin.m2m2.DataType) PointValueTimeCacheControl(com.infiniteautomation.mango.rest.latest.model.pointValue.query.PointValueTimeCacheControl) MergingIterator(com.infiniteautomation.mango.db.iterators.MergingIterator) AggregateValueMapper(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.AggregateValueMapper) TemporalAmount(java.time.temporal.TemporalAmount) DataPointService(com.infiniteautomation.mango.spring.service.DataPointService) AnnotatedPointValueTime(com.serotonin.m2m2.rt.dataImage.AnnotatedPointValueTime) Api(io.swagger.annotations.Api) TemporaryResourceWebSocketHandler(com.infiniteautomation.mango.rest.latest.temporaryResource.TemporaryResourceWebSocketHandler) PointValueTime(com.serotonin.m2m2.rt.dataImage.PointValueTime) PointValueField(com.infiniteautomation.mango.rest.latest.model.pointValue.PointValueField) Common(com.serotonin.m2m2.Common) StreamingPointValueTimeModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel) XidLatestQueryInfoModel(com.infiniteautomation.mango.rest.latest.model.pointValue.query.XidLatestQueryInfoModel) HttpStatus(org.springframework.http.HttpStatus) SystemSettingsDao(com.serotonin.m2m2.db.dao.SystemSettingsDao) RTException(com.serotonin.m2m2.rt.RTException) RollupEnum(com.infiniteautomation.mango.rest.latest.model.pointValue.RollupEnum) PointValueImportResult(com.infiniteautomation.mango.rest.latest.model.pointValue.PointValueImportResult) BadRequestException(com.infiniteautomation.mango.rest.latest.exception.BadRequestException) PathVariable(org.springframework.web.bind.annotation.PathVariable) UriComponentsBuilder(org.springframework.web.util.UriComponentsBuilder) DataSourceVO(com.serotonin.m2m2.vo.dataSource.DataSourceVO) BinaryValue(com.serotonin.m2m2.rt.dataImage.types.BinaryValue) PurgePointValuesResponseModel(com.infiniteautomation.mango.rest.latest.model.pointValue.PurgePointValuesResponseModel) LoggerFactory(org.slf4j.LoggerFactory) GenericRestException(com.infiniteautomation.mango.rest.latest.exception.GenericRestException) ExpandTimePeriodAdjuster(com.infiniteautomation.mango.util.datetime.ExpandTimePeriodAdjuster) DateTimeFormat(org.springframework.format.annotation.DateTimeFormat) DataValue(com.serotonin.m2m2.rt.dataImage.types.DataValue) ApiOperation(io.swagger.annotations.ApiOperation) StreamMapperBuilder(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.StreamMapperBuilder) NumericValue(com.serotonin.m2m2.rt.dataImage.types.NumericValue) Locale(java.util.Locale) SimplifyUtility(com.goebl.simplify.SimplifyUtility) ITime(com.serotonin.m2m2.view.stats.ITime) AlphanumericValue(com.serotonin.m2m2.rt.dataImage.types.AlphanumericValue) URI(java.net.URI) PointValueTimePointExtractor(com.infiniteautomation.mango.rest.pointextractor.PointValueTimePointExtractor) TemporaryResourceStatusUpdate(com.infiniteautomation.mango.rest.latest.temporaryResource.TemporaryResourceStatusUpdate) UnitConverter(javax.measure.converter.UnitConverter) TimePeriodType(com.infiniteautomation.mango.rest.latest.model.time.TimePeriodType) PurgeDataPointValuesModel(com.infiniteautomation.mango.rest.latest.model.pointValue.PurgeDataPointValuesModel) XidRollupTimeRangeQueryModel(com.infiniteautomation.mango.rest.latest.model.pointValue.query.XidRollupTimeRangeQueryModel) TimeZone(java.util.TimeZone) HttpHeaders(org.springframework.http.HttpHeaders) SetPointSource(com.serotonin.m2m2.rt.dataImage.SetPointSource) Collection(java.util.Collection) RequestMethod(org.springframework.web.bind.annotation.RequestMethod) TranslatableMessage(com.serotonin.m2m2.i18n.TranslatableMessage) ISO(org.springframework.format.annotation.DateTimeFormat.ISO) Instant(java.time.Instant) Collectors(java.util.stream.Collectors) List(java.util.List) Environment(org.springframework.core.env.Environment) Entry(java.util.Map.Entry) Optional(java.util.Optional) TimeOrder(com.serotonin.m2m2.db.dao.pointvalue.TimeOrder) LegacyXidPointValueTimeModel(com.infiniteautomation.mango.rest.latest.model.pointValue.LegacyXidPointValueTimeModel) User(com.serotonin.m2m2.vo.User) TimestampGrouper(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.TimestampGrouper) NotFoundRestException(com.infiniteautomation.mango.rest.latest.exception.NotFoundRestException) NotFoundException(com.infiniteautomation.mango.util.exception.NotFoundException) TemporaryResourceStatus(com.infiniteautomation.mango.rest.latest.temporaryResource.TemporaryResource.TemporaryResourceStatus) RequestMapping(org.springframework.web.bind.annotation.RequestMapping) HashMap(java.util.HashMap) DataPointRT(com.serotonin.m2m2.rt.dataImage.DataPointRT) Function(java.util.function.Function) IdPointValueTime(com.serotonin.m2m2.rt.dataImage.IdPointValueTime) DefaultStreamMapper(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.DefaultStreamMapper) TruncateTimePeriodAdjuster(com.infiniteautomation.mango.util.datetime.TruncateTimePeriodAdjuster) FireEvents(com.serotonin.m2m2.rt.dataImage.DataPointRT.FireEvents) ServerErrorException(com.infiniteautomation.mango.rest.latest.exception.ServerErrorException) Nullable(org.checkerframework.checker.nullness.qual.Nullable) TemporaryResource(com.infiniteautomation.mango.rest.latest.temporaryResource.TemporaryResource) Logger(org.slf4j.Logger) MangoTaskTemporaryResourceManager(com.infiniteautomation.mango.rest.latest.temporaryResource.MangoTaskTemporaryResourceManager) LegacyPointValueTimeModel(com.infiniteautomation.mango.rest.latest.model.pointValue.LegacyPointValueTimeModel) AuthenticationPrincipal(org.springframework.security.core.annotation.AuthenticationPrincipal) ResponseEntity(org.springframework.http.ResponseEntity) AbstractRestException(com.infiniteautomation.mango.rest.latest.exception.AbstractRestException) Comparator(java.util.Comparator) PermissionException(com.serotonin.m2m2.vo.permission.PermissionException) AggregateValueMapper(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.AggregateValueMapper) StreamMapperBuilder(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.StreamMapperBuilder) ApiOperation(io.swagger.annotations.ApiOperation) RequestMapping(org.springframework.web.bind.annotation.RequestMapping)

Example 4 with StreamingPointValueTimeModel

use of com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel in project ma-modules-public by infiniteautomation.

the class MultiPointStatisticsStreamTest method getStatistics.

private Map<String, StreamingPointValueTimeModel> getStatistics(Collection<? extends DataPointVO> points, ZonedDateTime from, ZonedDateTime to, String timezone, PointValueField[] fields) {
    // AbstractStreamMapper stores itself in a request attribute for retrieval inside HttpMessageConverter
    MockHttpServletRequest request = new MockHttpServletRequest();
    RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
    var mapper = new StreamMapperBuilder().withDataPoints(points).withRollup(RollupEnum.ALL).withFields(fields).withTimezone(timezone, from, to).withTimestampSource(TimestampSource.STATISTIC).build(AggregateValueMapper::new);
    return points.stream().collect(Collectors.toMap(DataPointVO::getXid, point -> pointValueDao.getAggregateDao().query(point, from, to, null, Duration.between(from, to)).map(mapper).findAny().orElseThrow()));
}
Also used : StatisticsGenerator(com.serotonin.m2m2.view.stats.StatisticsGenerator) DataSourceDao(com.serotonin.m2m2.db.dao.DataSourceDao) Module(com.serotonin.m2m2.module.Module) REST_OBJECT_MAPPER_NAME(com.infiniteautomation.mango.spring.MangoRuntimeContextConfiguration.REST_OBJECT_MAPPER_NAME) ZonedDateTime(java.time.ZonedDateTime) MockRuntimeManager(com.serotonin.m2m2.MockRuntimeManager) DataPointVO(com.serotonin.m2m2.vo.DataPointVO) DataValue(com.serotonin.m2m2.rt.dataImage.types.DataValue) RequestContextHolder(org.springframework.web.context.request.RequestContextHolder) ValueChangeCounter(com.infiniteautomation.mango.statistics.ValueChangeCounter) StreamMapperBuilder(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.StreamMapperBuilder) AnalogStatistics(com.infiniteautomation.mango.statistics.AnalogStatistics) StartsAndRuntimeList(com.infiniteautomation.mango.statistics.StartsAndRuntimeList) DataPointDao(com.serotonin.m2m2.db.dao.DataPointDao) NumericValue(com.serotonin.m2m2.rt.dataImage.types.NumericValue) Duration(java.time.Duration) Map(java.util.Map) Assert.fail(org.junit.Assert.fail) JsonNode(com.fasterxml.jackson.databind.JsonNode) MultistateValue(com.serotonin.m2m2.rt.dataImage.types.MultistateValue) Collection(java.util.Collection) MockHttpServletRequest(org.springframework.mock.web.MockHttpServletRequest) Collectors(java.util.stream.Collectors) StartsAndRuntime(com.infiniteautomation.mango.statistics.StartsAndRuntime) ZoneId(java.time.ZoneId) List(java.util.List) MockMangoLifecycle(com.serotonin.m2m2.MockMangoLifecycle) TimestampSource(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.TimestampSource) BeforeClass(org.junit.BeforeClass) PointValueDao(com.serotonin.m2m2.db.dao.PointValueDao) DataPointWithEventDetectors(com.serotonin.m2m2.vo.dataPoint.DataPointWithEventDetectors) MockDataSourceVO(com.serotonin.m2m2.vo.dataSource.mock.MockDataSourceVO) DataPointRT(com.serotonin.m2m2.rt.dataImage.DataPointRT) Function(java.util.function.Function) ArrayList(java.util.ArrayList) PointValueCache(com.infiniteautomation.mango.pointvaluecache.PointValueCache) DataType(com.serotonin.m2m2.DataType) AggregateValueMapper(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.AggregateValueMapper) MangoTestBase(com.serotonin.m2m2.MangoTestBase) ShouldNeverHappenException(com.serotonin.ShouldNeverHappenException) PointValueTime(com.serotonin.m2m2.rt.dataImage.PointValueTime) MockPointLocatorVO(com.serotonin.m2m2.vo.dataPoint.MockPointLocatorVO) PointValueField(com.infiniteautomation.mango.rest.latest.model.pointValue.PointValueField) Common(com.serotonin.m2m2.Common) Assert.assertNotNull(org.junit.Assert.assertNotNull) ObjectMapper(com.fasterxml.jackson.databind.ObjectMapper) Test(org.junit.Test) ServletRequestAttributes(org.springframework.web.context.request.ServletRequestAttributes) StreamingPointValueTimeModel(com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel) ApplicationContext(org.springframework.context.ApplicationContext) LoggingTypes(com.serotonin.m2m2.vo.DataPointVO.LoggingTypes) RollupEnum(com.infiniteautomation.mango.rest.latest.model.pointValue.RollupEnum) Assert.assertEquals(org.junit.Assert.assertEquals) MockHttpServletRequest(org.springframework.mock.web.MockHttpServletRequest) ServletRequestAttributes(org.springframework.web.context.request.ServletRequestAttributes) AggregateValueMapper(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.AggregateValueMapper) StreamMapperBuilder(com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.StreamMapperBuilder)

Aggregations

StreamingPointValueTimeModel (com.infiniteautomation.mango.rest.latest.streamingvalues.model.StreamingPointValueTimeModel)4 DataPointVO (com.serotonin.m2m2.vo.DataPointVO)4 RollupEnum (com.infiniteautomation.mango.rest.latest.model.pointValue.RollupEnum)3 PointValueField (com.infiniteautomation.mango.rest.latest.model.pointValue.PointValueField)2 AggregateValueMapper (com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.AggregateValueMapper)2 StreamMapperBuilder (com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.StreamMapperBuilder)2 TimestampSource (com.infiniteautomation.mango.rest.latest.streamingvalues.mapper.TimestampSource)2 Common (com.serotonin.m2m2.Common)2 DataType (com.serotonin.m2m2.DataType)2 PointValueDao (com.serotonin.m2m2.db.dao.PointValueDao)2 DataPointRT (com.serotonin.m2m2.rt.dataImage.DataPointRT)2 PointValueTime (com.serotonin.m2m2.rt.dataImage.PointValueTime)2 DataValue (com.serotonin.m2m2.rt.dataImage.types.DataValue)2 MultistateValue (com.serotonin.m2m2.rt.dataImage.types.MultistateValue)2 NumericValue (com.serotonin.m2m2.rt.dataImage.types.NumericValue)2 Duration (java.time.Duration)2 ZoneId (java.time.ZoneId)2 ZonedDateTime (java.time.ZonedDateTime)2 ArrayList (java.util.ArrayList)2 Collection (java.util.Collection)2