From 5bf42aa9950058f391805e6fb8d7376f4378924b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:16:55 +0800
Subject: [PATCH] cumulateHandle.getCurrent
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 6b3b291..c25dae4 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
@@ -1,8 +1,11 @@
package com.iailab.module.model.mdk.sample;
+import com.iailab.module.data.api.plan.PlanItemApi;
+import com.iailab.module.data.api.plan.dto.ApiPlanItemDTO;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.enums.DataPointFreqEnum;
+import com.iailab.module.data.enums.TimeGranularitySecEnum;
import com.iailab.module.model.mdk.common.enums.ModelParamType;
import com.iailab.module.model.mdk.sample.dto.SampleData;
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
@@ -12,7 +15,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import java.sql.Timestamp;
import java.util.*;
abstract class SampleDataConstructor {
@@ -21,6 +23,8 @@
@Autowired
private DataPointApi dataPointApi;
+ @Autowired
+ private PlanItemApi planItemApi;
/**
* prepareSampleData
@@ -28,7 +32,7 @@
* @param sampleInfo
* @return
*/
- public abstract List<SampleData> prepareSampleData(SampleInfo sampleInfo);
+ public abstract List<SampleData> prepareSampleData(SampleInfo sampleInfo) throws Exception;
/**
* 补全数据
@@ -37,10 +41,11 @@
* @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) {
+ String paramId, String paramType, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
if (CollectionUtils.isEmpty(dataEntityList) || length == dataEntityList.size()) {
return dataEntityList;
} else if (length < dataEntityList.size()) {
@@ -74,12 +79,12 @@
endTime = calendar.getTime();
end = endTime.getTime();
- oneMin = 24 * 60 * 60 * 1000;
+ oneMin = 60 * 1000L;
mins = ((end - start) / oneMin);
break;
case DATAPOINT:
// 测点值
- ApiPointDTO dataPoint = dataPointApi.getInfoById(paramId);
+ ApiPointDTO dataPoint = pointMap.get(paramId);
oneMin = 1000L * DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();
// 设置时间偏移量
start = start - (start % oneMin) + oneMin;
@@ -101,6 +106,15 @@
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:
@@ -132,7 +146,7 @@
lastItem = item;
DataValueVO dataEntity = new DataValueVO();
- dataEntity.setDataTime(new Timestamp(item.getKey()));
+ dataEntity.setDataTime(new Date(item.getKey()));
dataEntity.setDataValue(item.getValue());
completionDataEntityList.add(dataEntity);
}
--
Gitblit v1.9.3