From 5b952f77058a9da5af5e143a6c2c7ba195aa736d Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 26 十一月 2024 16:08:10 +0800
Subject: [PATCH] 预测消息配置
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 68 insertions(+), 33 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 c86dc27..cd5f3f0 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,16 +1,21 @@
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.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.DataPointFreq;
-import com.iailab.module.model.mdk.factory.ItemEntityFactory;
+import com.iailab.module.data.enums.DataPointFreqEnum;
+import com.iailab.module.data.enums.TimeGranularityEnum;
+import com.iailab.module.data.enums.TimeGranularitySecEnum;
+import com.iailab.module.model.mcs.pre.service.MmPredictItemService;
+import com.iailab.module.model.mdk.common.enums.ModelParamType;
import com.iailab.module.model.mdk.sample.dto.ColumnItem;
import com.iailab.module.model.mdk.sample.dto.ColumnItemPort;
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -26,7 +31,13 @@
private DataPointApi dataPointApi;
@Autowired
- private ItemEntityFactory itemEntityFactory;
+ private PlanItemApi planItemApi;
+
+ @Autowired
+ private IndItemApi indItemApi;
+
+ @Autowired
+ private MmPredictItemService mmPredictItemService;
/**
* prepareSampleInfo
@@ -66,21 +77,21 @@
Date dateTime = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(originalTime);
- switch (columnItem.getParamType()) {
- case "DATAPOINT":
- ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId());
+ switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
+ case DATAPOINT:
+ ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
if (dataPoint == null) {
return null;
}
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), DataPointFreq.getEumByCode(dataPoint.getMinfreqid()).getValue());
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue());
break;
- case "PREDICTITEM":
+ case PREDICTITEM:
dateTime = calendar.getTime();
break;
- case "IND-HIS":
+ case IND:
dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), 60);
break;
- case "IND-PLAN":
+ case PLAN:
dateTime = calendar.getTime();
break;
default:
@@ -101,22 +112,27 @@
Date dateTime = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(originalTime);
- switch (columnItem.getParamType()) {
- case "DATAPOINT":
- ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId());
+ switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
+ case DATAPOINT:
+ ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
if (dataPoint == null) {
return null;
}
- calendar.add(Calendar.SECOND, DataPointFreq.getEumByCode(dataPoint.getMinfreqid()).getValue() * -1);
- break;
- case "PREDICTITEM":
- dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), 60);
- break;
- case "IND-HIS":
dateTime = calendar.getTime();
break;
- case "IND-PLAN":
- dateTime = calculateTime(originalTime, false, columnItem.getDataLength(), 60);
+ case PREDICTITEM:
+ dateTime = calendar.getTime();
+ 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());
break;
default:
break;
@@ -132,20 +148,23 @@
* @throws Exception
*/
protected Integer getGranularity(ColumnItem columnItem) {
+ // 默认60s
Integer granularity = 60;
- switch (columnItem.getParamType()) {
- case "DATAPOINT":
- ApiPointDTO dataPoint = dataPointApi.getPointById(columnItem.getParamId());
- granularity = DataPointFreq.getEumByCode(dataPoint.getMinfreqid()).getValue();
+ switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
+ case DATAPOINT:
+ ApiPointDTO dataPoint = dataPointApi.getInfoById(columnItem.getParamId());
+ granularity = DataPointFreqEnum.getEumByCode(dataPoint.getMinfreqid()).getValue();
break;
- case "PREDICTITEM":
- granularity = itemEntityFactory.getItemById(columnItem.getParamId()).getGranularity();
+ case PREDICTITEM:
+ granularity = mmPredictItemService.getItemById(columnItem.getParamId()).getGranularity();
break;
- case "IND-HIS":
- granularity = 60;
+ case IND:
+ ApiIndItemDTO indItemDTO = indItemApi.getInfoById(columnItem.getParamId());
+ granularity = TimeGranularitySecEnum.getEumByCode(indItemDTO.getTimeGranularity()).getValue();;
break;
- case "IND-PLAN":
- granularity = 60;
+ case PLAN:
+ ApiPlanItemDTO apiPlanItemDTO = planItemApi.getInfoById(columnItem.getParamId());
+ granularity = TimeGranularitySecEnum.getEumByCode(apiPlanItemDTO.getTimeGranularity()).getValue();
break;
default:
break;
@@ -194,4 +213,20 @@
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