From 49148428d71415ad2b5449cb6ea2e83f1fbb6c18 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期二, 21 一月 2025 15:12:19 +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 | 90 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 13 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 bee81d5..6915322 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,10 +1,19 @@
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.mcs.pre.enums.PredGranularityEnum;
+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;
import com.iailab.module.model.mdk.vo.DataValueVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -13,13 +22,18 @@
private Logger logger = LoggerFactory.getLogger(getClass());
+ @Autowired
+ private DataPointApi dataPointApi;
+ @Autowired
+ private PlanItemApi planItemApi;
+
/**
* prepareSampleData
*
* @param sampleInfo
* @return
*/
- public abstract List<SampleData> prepareSampleData(SampleInfo sampleInfo);
+ public abstract List<SampleData> prepareSampleData(SampleInfo sampleInfo) throws Exception;
/**
* 补全数据
@@ -30,23 +44,76 @@
* @param endTime
* @return
*/
- public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime, int granularity) {
- if (CollectionUtils.isEmpty(dataEntityList) || length <= dataEntityList.size()) {
+ 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()) {
+ return dataEntityList.subList(dataEntityList.size() - length, dataEntityList.size());
}
- logger.info("补全数据, length =" + length + "; size = " + dataEntityList.size() + "; startTime = " + startTime.getTime() + "; endTime = " + endTime.getTime());
- logger.info("补全前：" + dataEntityList);
+ List<DataValueVO> completionDataEntityList = new ArrayList<>();
+ long oneMin = 0L;
+
+ long start = startTime.getTime();
+ long end = endTime.getTime();
+ long mins = 0L;
+
+ switch (ModelParamType.getEumByCode(paramType)) {
+ case NORMALITEM:
+ case MERGEITEM:
+ // 预测值
+ 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:
+ // 测点值
+ oneMin = 1000L * granularity;
+ // 设置时间偏移量
+ 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:
+ // 测点值
+ oneMin = 1000L * granularity;
+ // 设置时间偏移量
+ 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) + 1;
+ break;
+ default:
+ break;
+ }
Map<Long, Double> sourceDataMap = new HashMap<>(dataEntityList.size());
for (DataValueVO dataEntity : dataEntityList) {
- sourceDataMap.put(dataEntity.getDataTime().getTime(), dataEntity.getDataValue());
+ if (null != dataEntity.getDataTime()) {
+ sourceDataMap.put(dataEntity.getDataTime().getTime(), dataEntity.getDataValue());
+ }
}
//找出缺少项
- long oneMin = 1000 * granularity;
- long start = startTime.getTime();
- long end = endTime.getTime();
- long mins = ((end - start) / oneMin) + 1;
Map<Long, Double> dataMap = new LinkedHashMap<>();
for (int i = 0; i < mins; i++) {
Long key = start + oneMin * i;
@@ -57,7 +124,6 @@
//补充缺少项
int k = 0;
Map.Entry<Long, Double> lastItem = null;
- List<DataValueVO> completionDataEntityList = new ArrayList<>();
for (Map.Entry<Long, Double> item : dataMap.entrySet()) {
if (k == 0 && item.getValue() == null) {
item.setValue(getFirstValue(dataMap));
@@ -72,8 +138,6 @@
dataEntity.setDataValue(item.getValue());
completionDataEntityList.add(dataEntity);
}
-
- logger.info("补全后：" + completionDataEntityList);
return completionDataEntityList;
}
--
Gitblit v1.9.3