From 6c5150dfdd69a9c1d5db9c9780f721759b0e0e9c Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期一, 10 二月 2025 17:26:56 +0800
Subject: [PATCH] Merge branch 'develop1.0' into wt_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/realtimedata/service/impl/RealtimeDatabaseServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/service/impl/RealtimeDatabaseServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/service/impl/RealtimeDatabaseServiceImpl.java
index bb8b97b..7128652 100644
--- a/zhitan-system/src/main/java/com/zhitan/realtimedata/service/impl/RealtimeDatabaseServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/service/impl/RealtimeDatabaseServiceImpl.java
@@ -2,6 +2,8 @@
import com.google.common.collect.Lists;
import com.zhitan.common.enums.CollectionModes;
+import com.zhitan.common.enums.RetrievalModes;
+import com.zhitan.realtimedata.data.RealtimeDatabaseManager;
import com.zhitan.realtimedata.data.influxdb.InfluxDBRepository;
import com.zhitan.realtimedata.domain.TagValue;
import com.zhitan.realtimedata.service.RealtimeDatabaseService;
@@ -20,8 +22,11 @@
private final InfluxDBRepository repository;
- public RealtimeDatabaseServiceImpl(InfluxDBRepository repository) {
+ private final RealtimeDatabaseManager realtimeDatabaseManager;
+
+ public RealtimeDatabaseServiceImpl(InfluxDBRepository repository, RealtimeDatabaseManager realtimeDatabaseManager) {
this.repository = repository;
+ this.realtimeDatabaseManager = realtimeDatabaseManager;
}
/**
@@ -146,4 +151,9 @@
repository.store(tagValues);
}
+ @Override
+ public List<TagValue> retrieve(String tagCode, Date beginTime, Date endTime,
+ RetrievalModes retrievalModes, int pointCount) {
+ return realtimeDatabaseManager.retrieve(tagCode, beginTime, endTime, retrievalModes, pointCount);
+ }
}
--
Gitblit v1.9.3