From b270a07828a9627f1a42e254a430c9921fec4e95 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 26 三月 2025 16:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 63 +++++++++++++------------------
1 files changed, 27 insertions(+), 36 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 ce370a3..430c810 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
@@ -1,6 +1,5 @@
package com.iailab.module.model.mdk.sample;
-import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
import com.iailab.module.data.api.plan.dto.ApiPlanItemDTO;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
@@ -25,9 +24,6 @@
abstract class SampleInfoConstructor {
@Autowired
- private IndItemApi indItemApi;
-
- @Autowired
private MmPredictItemService mmPredictItemService;
/**
@@ -39,7 +35,9 @@
*/
protected SampleInfo prepareSampleInfo(String modelId, Date predictTime, Map<Integer, Integer> dynamicDataLength) {
//样本的列信息
- return getColumnInfo(modelId, predictTime, dynamicDataLength);
+ SampleInfo sampleInfo = getColumnInfo(modelId, predictTime, dynamicDataLength);
+ sampleInfo.setPredictTime(predictTime);
+ return sampleInfo;
}
/**
@@ -76,31 +74,22 @@
* @return
* @throws Exception
*/
- protected Date getStartTime(ColumnItem columnItem, Date originalTime, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
+ protected Date getStartTime(ColumnItem columnItem, Date originalTime) {
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 = calculateTime(originalTime, true, columnItem.getDataLength(), DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue());
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
+ break;
+ case PLAN:
+ dateTime = originalTime;
+ break;
+ case IND:
+ case IND_ASCII:
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength() - 1, columnItem.getGranularity());
break;
case NORMALITEM:
case MERGEITEM:
- dateTime = calendar.getTime();
- break;
- case IND:
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), 60);
- break;
- case PLAN:
- ApiPlanItemDTO apiPlanItemDTO = planMap.get(columnItem.getParamId());
- if (apiPlanItemDTO == null) {
- return null;
- }
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue());
+ dateTime = calculateTime(originalTime, false, 1, columnItem.getGranularity());
break;
default:
break;
@@ -116,23 +105,24 @@
* @return
* @throws Exception
*/
- protected Date getEndTime(ColumnItem columnItem, Date originalTime,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
+ protected Date getEndTime(ColumnItem columnItem, Date originalTime) {
Date dateTime = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
- dateTime = calendar.getTime();
+ dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
+ break;
+ case PLAN:
+ dateTime = calculateTime(originalTime, false, columnItem.getDataLength()-1, columnItem.getGranularity());
+ break;
+ case IND:
+ case IND_ASCII:
+ dateTime = originalTime;
break;
case NORMALITEM:
case MERGEITEM:
- dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), 60);
- break;
- case IND:
- dateTime = calendar.getTime();
- break;
- case PLAN:
- dateTime = calendar.getTime();
+ dateTime = calculateTime(originalTime, false, columnItem.getDataLength() + 1, columnItem.getGranularity());
break;
default:
break;
@@ -147,7 +137,7 @@
* @return
* @throws Exception
*/
- protected Integer getGranularity(ColumnItem columnItem,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) {
+ protected Integer getGranularity(ColumnItem columnItem,Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap,Map<String, ApiIndItemDTO> indMap) {
// 默认60s
Integer granularity = 60;
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
@@ -160,7 +150,8 @@
granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
break;
case IND:
- ApiIndItemDTO indItemDTO = indItemApi.getInfoById(columnItem.getParamId());
+ case IND_ASCII:
+ ApiIndItemDTO indItemDTO = indMap.get(columnItem.getParamId());
granularity = TimeGranularitySecEnum.getEumByCode(indItemDTO.getTimeGranularity()).getValue();;
break;
case PLAN:
@@ -187,7 +178,7 @@
if (backward) {
timeLength = (-1) * dataLength;
} else {
- timeLength = dataLength - 1;
+ timeLength = dataLength;
}
Date desTime = originalTime;
Calendar calendar = Calendar.getInstance();
--
Gitblit v1.9.3