From 874dd8d939b4ae61efbb799855c9ddf328722972 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 十二月 2024 18:08:08 +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/PredictSampleDataConstructor.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
index 9cb12d7..6b61389 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java
@@ -1,14 +1,17 @@
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.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.data.common.ApiDataValueDTO;
+import com.iailab.module.model.common.enums.OutResultType;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
+import com.iailab.module.model.mcs.pre.service.MmItemResultJsonService;
import com.iailab.module.model.mcs.pre.service.MmItemResultService;
import com.iailab.module.model.mcs.pre.service.MmItemTypeService;
import com.iailab.module.model.mdk.common.enums.ModelParamType;
@@ -18,6 +21,7 @@
import com.iailab.module.model.mdk.sample.dto.SampleInfo;
import com.iailab.module.model.mdk.vo.DataValueVO;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +50,9 @@
private MmItemResultService mmItemResultService;
@Autowired
+ private MmItemResultJsonService mmItemResultJsonService;
+
+ @Autowired
private MmItemTypeService mmItemTypeService;
@Autowired
@@ -62,6 +69,7 @@
public List<SampleData> prepareSampleData(SampleInfo sampleInfo) throws Exception {
List<SampleData> sampleDataList = new ArrayList<>();
Map<String, ApiPointDTO> pointMap = sampleInfo.getPointMap();
+ Map<String, ApiPlanItemDTO> planMap = sampleInfo.getPlanMap();
//对每个爪分别进行计算
for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
//先依据爪内数据项的modelParamOrder进行排序——重写comparator匿名函数
@@ -83,11 +91,11 @@
//对每一项依次进行数据查询,然后将查询出的值赋给matrix对应的位置
for (int i = 0; i < entry.getColumnItemList().size(); i++) {
try {
- List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i),pointMap);
+ List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i),pointMap,planMap);
//补全数据
ColumnItem columnItem = entry.getColumnItemList().get(i);
dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime,
- columnItem.paramId, columnItem.getParamType());
+ columnItem.paramId, columnItem.getParamType(),pointMap,planMap);
/** 如果数据取不满，把缺失的数据点放在后面 */
if (dataEntityList != null && dataEntityList.size() != 0) {
@@ -113,10 +121,11 @@
*
* @param columnItem
* @param pointMap
+ * @param planMap
* @return
* @throws Exception
*/
- private List<DataValueVO> getData(ColumnItem columnItem, Map<String, ApiPointDTO> pointMap) throws Exception {
+ private List<DataValueVO> getData(ColumnItem columnItem, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) throws Exception {
List<DataValueVO> dataList = new ArrayList<>();
String paramType = columnItem.getParamType();
switch (ModelParamType.getEumByCode(paramType)) {
@@ -139,7 +148,23 @@
case NORMALITEM:
case MERGEITEM:
MmItemOutputEntity outPut = mmItemOutputService.getOutPutById(columnItem.getParamId());
- List<DataValueVO> predictValue = mmItemResultService.getPredictValue(outPut.getId(), columnItem.getStartTime(), columnItem.getEndTime());
+ OutResultType outResultType = OutResultType.getEumByCode(outPut.getResultType());
+ List<DataValueVO> predictValue = new ArrayList<>();
+
+ // double类型特殊处理
+ if (outResultType.equals(OutResultType.D)) {
+ // columnItem.getStartTime()就是预测时间
+ String doubleData = mmItemResultJsonService.getDoubleData(outPut.getId(), columnItem.getStartTime());
+ if (StringUtils.isNotBlank(doubleData)) {
+ DataValueVO dataValueVO = new DataValueVO();
+ dataValueVO.setDataTime(columnItem.getStartTime());
+ dataValueVO.setDataValue(Double.valueOf(doubleData));
+ predictValue.add(dataValueVO);
+ }
+ } else {
+ predictValue = mmItemResultService.getPredictValue(outPut.getId(), columnItem.getStartTime(), columnItem.getEndTime());
+ }
+
if (CollectionUtils.isEmpty(predictValue)) {
break;
}
@@ -147,7 +172,7 @@
break;
case PLAN:
ApiDataQueryDTO queryPlanItemDto = new ApiDataQueryDTO();
- queryPlanItemDto.setItemNo(columnItem.getParamId());
+ queryPlanItemDto.setItemNo(planMap.get(columnItem.getParamId()).getItemNo());
queryPlanItemDto.setStart(columnItem.getStartTime());
queryPlanItemDto.setEnd(columnItem.getEndTime());
List<ApiDataValueDTO> planValueList = planItemApi.queryPlanItemHistoryValue(queryPlanItemDto);
@@ -163,7 +188,9 @@
default:
break;
}
- log.info("数据获取,columnItem:" + columnItem + ",dataList" + dataList);
+ // 避免生产环境日志过多，分级打印
+ log.debug("数据获取,columnItem:" + columnItem + ",dataList：" + dataList);
+ log.info("数据获取,columnItem:" + columnItem + ",dataListLength：" + dataList.size());
return dataList;
}
}
--
Gitblit v1.9.3