From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java
index 1aa3e26..5c7cda8 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java
@@ -42,11 +42,9 @@
* @param dataEntityList
* @param startTime
* @param endTime
- * @param planMap
* @return
*/
- public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime,
- String paramId, String paramType, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
+ public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime, String paramType, Integer granularity) {
if (CollectionUtils.isEmpty(dataEntityList) || length == dataEntityList.size()) {
return dataEntityList;
} else if (length < dataEntityList.size()) {
@@ -64,18 +62,31 @@
case NORMALITEM:
case MERGEITEM:
// 预测值
- oneMin = PredGranularityEnum.MIN1.getCode() * 1000L;
- start = start - (start % oneMin);
- end = end - (end % oneMin);
- mins = ((end - start) / oneMin) + 1;
+ oneMin = granularity * 1000L;
+ // 设置时间偏移量
+ if (granularity >= 24*60*60) {
+ // 如果时间粒度大于等于一天，因为时区问题，特殊处理，否则时间为8：00，而非0：00
+ start = start - ((start+8*60*60*1000) % oneMin);
+ end = end - ((end+8*60*60*1000) % oneMin);
+ } else {
+ start = start - (start % oneMin);
+ end = end - (end % oneMin);
+ }
+ mins = ((end - start) / oneMin);
break;
case DATAPOINT:
+ case PLAN:
// 测点值
- ApiPointDTO dataPoint = pointMap.get(paramId);
- oneMin = 1000L * DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();
+ oneMin = 1000L * granularity;
// 设置时间偏移量
- start = start - (start % oneMin) + oneMin;
- end = end - (end % oneMin) + oneMin;
+ if (granularity >= 24*60*60) {
+ // 如果时间粒度大于等于一天，因为时区问题，特殊处理，否则时间为8：00，而非0：00
+ start = start - ((start+8*60*60*1000) % oneMin);
+ end = end - ((end+8*60*60*1000) % oneMin);
+ } else {
+ start = start - (start % oneMin);
+ end = end - (end % oneMin);
+ }
mins = ((end - start) / oneMin);
break;
case IND:
@@ -93,15 +104,6 @@
calendar2.set(Calendar.MINUTE, 0);
calendar2.set(Calendar.SECOND, 0);
end = calendar2.getTime().getTime();
- mins = ((end - start) / oneMin);
- break;
- case PLAN:
- // 计划数据
- ApiPlanItemDTO planItem = planMap.get(paramId);
- oneMin = 1000L * TimeGranularitySecEnum.getEumByCode(planItem.getTimeGranularity()).getValue();
- // 设置时间偏移量
- start = start - (start % oneMin) + oneMin;
- end = end - (end % oneMin) + oneMin;
mins = ((end - start) / oneMin);
break;
default:
--
Gitblit v1.9.3