From 0e49c2c61b26146d1a826edd6afa5d8c03696e59 Mon Sep 17 00:00:00 2001
From: DYL0109 <1332079466@qq.com>
Date: 星期二, 11 二月 2025 10:27:50 +0800
Subject: [PATCH] !57 能源流向分析 Merge pull request !57 from DYL0109/dyl_dev
---
zhitan-system/src/main/java/com/zhitan/realtimedata/service/impl/RealtimeDatabaseServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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..9e16113 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
@@ -1,16 +1,19 @@
package com.zhitan.realtimedata.service.impl;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
import com.zhitan.common.enums.CollectionModes;
+import com.zhitan.common.enums.GroupTimeType;
+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;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 瀹炴椂鏁版嵁搴撳彇鏁版湇鍔″疄鐜扮被.
@@ -20,8 +23,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;
}
/**
@@ -126,6 +132,20 @@
return repository.statistics(tagCodes, beginTime, endTime, collectionModes);
}
+ @Override
+ public List<TagValue> statistics(String tagCodes, Date beginTime, Date endTime, CollectionModes modes, GroupTimeType timeType) {
+ try {
+ List<String> tagCodeList = Arrays.asList(tagCodes.split(StrUtil.COMMA).clone());
+ List<TagValue> tagValues = repository.statistics(tagCodeList, beginTime, endTime, modes, timeType);
+ if (ObjectUtil.isEmpty(tagValues)) {
+ tagValues = new ArrayList<>();
+ }
+ return tagValues;
+ } catch (Exception e) {
+ return new ArrayList<>();
+ }
+ }
+
/**
* 瀛樺偍娴嬬偣鐨勫疄鏃舵暟鎹�.
*
@@ -146,4 +166,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