From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +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 | 103 +++++++++++++++++++++++++--------------------------
1 files changed, 51 insertions(+), 52 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 34a5900..c01e92a 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,12 @@
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;
@@ -12,7 +16,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 +24,8 @@
@Autowired
private DataPointApi dataPointApi;
+ @Autowired
+ private PlanItemApi planItemApi;
/**
* prepareSampleData
@@ -28,7 +33,7 @@
* @param sampleInfo
* @return
*/
- public abstract List<SampleData> prepareSampleData(SampleInfo sampleInfo);
+ public abstract List<SampleData> prepareSampleData(SampleInfo sampleInfo) throws Exception;
/**
* 补全数据
@@ -39,11 +44,11 @@
* @param endTime
* @return
*/
- public List<DataValueVO> completionData(int length, List<DataValueVO> dataEntityList, Date startTime, Date endTime, String paramId,String paramType) {
+ 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());
+ } else if (length < dataEntityList.size()) {
+ return dataEntityList.subList(dataEntityList.size() - length, dataEntityList.size());
}
List<DataValueVO> completionDataEntityList = new ArrayList<>();
@@ -54,70 +59,64 @@
long mins = 0L;
switch (ModelParamType.getEumByCode(paramType)) {
- case PREDICTITEM:
+ case NORMALITEM:
+ case MERGEITEM:
// 预测值
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(startTime);
- calendar.set(Calendar.HOUR_OF_DAY,0);
- calendar.set(Calendar.MINUTE,0);
- calendar.set(Calendar.SECOND,0);
- calendar.add(Calendar.DAY_OF_YEAR,1);
- startTime = calendar.getTime();
- start = startTime.getTime();
-
- calendar.setTime(endTime);
- calendar.set(Calendar.HOUR_OF_DAY,0);
- calendar.set(Calendar.MINUTE,0);
- calendar.set(Calendar.SECOND,0);
- endTime = calendar.getTime();
- end = endTime.getTime();
-
-
- oneMin = 24 * 60 * 60 * 1000;
+ 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 = dataPointApi.getInfoById(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:
- // 指标数据
- oneMin = 24 * 60 * 60 * 1000;
- Calendar calendar2 = Calendar.getInstance();
- calendar2.setTime(startTime);
- calendar2.set(Calendar.HOUR_OF_DAY,0);
- calendar2.set(Calendar.MINUTE,0);
- calendar2.set(Calendar.SECOND,0);
- start = calendar2.getTime().getTime();
-
- calendar2.setTime(endTime);
- calendar2.set(Calendar.HOUR_OF_DAY,0);
- calendar2.set(Calendar.MINUTE,0);
- calendar2.set(Calendar.SECOND,0);
- end = calendar2.getTime().getTime();
-
-
- mins = ((end - start) / oneMin);
+ case IND_ASCII:
+ // 测点值
+ 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());
+ }
}
//找出缺少项
Map<Long, Double> dataMap = new LinkedHashMap<>();
- for (int i = 0; i < mins; i ++) {
+ for (int i = 0; i < mins; i++) {
Long key = start + oneMin * i;
Double value = sourceDataMap.get(key);
dataMap.put(key, value);
@@ -132,11 +131,11 @@
} else if (item.getValue() == null) {
item.setValue(lastItem.getValue());
}
- k ++;
+ k++;
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