From e2b151e9bed2b6798cfc1ed499e98bcb0665d6ec Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 十二月 2024 12:00: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/SampleInfoConstructor.java | 59 +++++++++++++++--------------------------------------------
1 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index 515637b..53bed0b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -48,14 +48,8 @@
* @return
*/
protected SampleInfo prepareSampleInfo(String modelId, Date predictTime) {
- SampleInfo sampleInfo = new SampleInfo();
- //调用样本列数的方法
-// sampleInfo.setSampleColumn(getSampleColumn(modelId));
//样本的列信息
- sampleInfo.setColumnInfo(getColumnInfo(modelId, predictTime));
- //样本的采样周期
-// sampleInfo.setSampleCycle(getSampleCycle(modelId));
- return sampleInfo;
+ return getColumnInfo(modelId, predictTime);
}
/**
@@ -74,7 +68,7 @@
* @param predictTime
* @return
*/
- protected abstract List<ColumnItemPort> getColumnInfo(String modelId, Date predictTime);
+ protected abstract SampleInfo getColumnInfo(String modelId, Date predictTime);
/**
* 样本的采样周期
@@ -92,7 +86,7 @@
* @return
* @throws Exception
*/
- protected Date getStartTime(ColumnItem columnItem, Date originalTime, Map<String, ApiPointDTO> pointMap) {
+ protected Date getStartTime(ColumnItem columnItem, Date originalTime, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
Date dateTime = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(originalTime);
@@ -112,7 +106,11 @@
dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), 60);
break;
case PLAN:
- dateTime = calendar.getTime();
+ ApiPlanItemDTO apiPlanItemDTO = planMap.get(columnItem.getParamId());
+ if (apiPlanItemDTO == null) {
+ return null;
+ }
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue());
break;
default:
break;
@@ -128,32 +126,23 @@
* @return
* @throws Exception
*/
- protected Date getEndTime(ColumnItem columnItem, Date originalTime,Map<String, ApiPointDTO> pointMap) {
+ protected Date getEndTime(ColumnItem columnItem, Date originalTime,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
Date dateTime = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
- ApiPointDTO dataPoint = pointMap.get(columnItem.getParamId());
- if (dataPoint == null) {
- return null;
- }
dateTime = calendar.getTime();
break;
case NORMALITEM:
case MERGEITEM:
- dateTime = calendar.getTime();
+ dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), 60);
break;
case IND:
dateTime = calendar.getTime();
break;
case PLAN:
- ApiPlanItemDTO planItem = planItemApi.getInfoByNo(columnItem.getParamId());
- if (planItem == null) {
- return null;
- }
- dateTime = calculateDate(originalTime, false, columnItem.getDataLength(),
- TimeGranularityEnum.getEumByCode(planItem.getTimeGranularity()).getValue());
+ dateTime = calendar.getTime();
break;
default:
break;
@@ -168,26 +157,24 @@
* @return
* @throws Exception
*/
- protected Integer getGranularity(ColumnItem columnItem) {
+ protected Integer getGranularity(ColumnItem columnItem,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
// 默认60s
Integer granularity = 60;
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
- ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
+ ApiPointDTO dataPoint = pointMap.get(columnItem.getParamId());
granularity = DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();
break;
case NORMALITEM:
- granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
- break;
case MERGEITEM:
- granularity = mmPredictItemService.getItemByIdFromCache(columnItem.getParamId()).getGranularity();
+ granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
break;
case IND:
ApiIndItemDTO indItemDTO = indItemApi.getInfoById(columnItem.getParamId());
granularity = TimeGranularitySecEnum.getEumByCode(indItemDTO.getTimeGranularity()).getValue();;
break;
case PLAN:
- ApiPlanItemDTO apiPlanItemDTO = planItemApi.getInfoById(columnItem.getParamId());
+ ApiPlanItemDTO apiPlanItemDTO = planMap.get(columnItem.getParamId());
granularity = TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue();
break;
default:
@@ -218,22 +205,6 @@
calendar.set(Calendar.MILLISECOND, 0);
// 数据长度 * 粒度
calendar.add(Calendar.SECOND, timeLength * granularity);
- return calendar.getTime();
- }
-
- public Date calculateDate(Date originalTime, Boolean backward, int dataLength, int field) {
- int timeLength;
- if (backward) {
- timeLength = (-1) * dataLength;
- } else {
- timeLength = dataLength - 1;
- }
- Date desTime = originalTime;
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(desTime);
- calendar.set(Calendar.MILLISECOND, 0);
- // 数据长度 * 粒度
- calendar.add(Calendar.SECOND, timeLength);
return calendar.getTime();
}
}
\ No newline at end of file
--
Gitblit v1.9.3