From 4c1973a3c72a6cb8fdf772c8df14d4d00ea4ee95 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期一, 20 一月 2025 15:21:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java | 6 +
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/IndItemService.java | 3
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleDataConstructor.java | 34 +++++++-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java | 13 +++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java | 3
iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java | 5 +
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java | 12 ++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 8 +
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java | 4
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleDataConstructor.java | 31 +++----
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java | 35 ++++++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 53 +++++++++----
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/xss/SQLFilter.java | 2
13 files changed, 161 insertions(+), 48 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java
index 0fc23d4..0e0fe93 100644
--- a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java
+++ b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Set;
/**
* @author PanZhibao
@@ -33,4 +34,8 @@
@GetMapping(PREFIX + "/info/id/{id}")
@Operation(summary = "根据测点编号查询测点信息")
ApiIndItemDTO getInfoById(@PathVariable("id") String id);
+
+ @PostMapping(PREFIX + "/info/ids")
+ @Operation(summary = "根据多个id查询指标数据信息")
+ List<ApiIndItemDTO> getInfoByIds(@RequestParam("indIds") Set<String> indIds);
}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java
index 93f346f..317e493 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/ind/IndItemApiImpl.java
@@ -5,13 +5,17 @@
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.ind.collection.IndItemCollector;
+import com.iailab.module.data.ind.item.entity.IndItemEntity;
import com.iailab.module.data.ind.item.service.IndItemService;
import com.iailab.module.data.ind.item.vo.IndItemValueVO;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
/**
* @author PanZhibao
@@ -31,17 +35,44 @@
@Override
public List<ApiIndItemValueDTO> queryIndItemDefaultValue(String itemNo){
List<IndItemValueVO> list = indItemCollector.queryValue(itemNo);
- return ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class);
+ List<ApiIndItemValueDTO> result = new ArrayList<>(list.size());
+ list.forEach(item -> {
+ if (item != null) {
+ ApiIndItemValueDTO indItemValueDTO = new ApiIndItemValueDTO();
+ indItemValueDTO.setDataTime(item.getDataTime());
+ indItemValueDTO.setDataValue(item.getDataValue().doubleValue());
+ result.add(indItemValueDTO);
+ }
+ });
+ return result;
}
@Override
public List<ApiIndItemValueDTO> queryIndItemHistoryValue(ApiIndItemQueryDTO dto) {
List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
- return ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class);
+ List<ApiIndItemValueDTO> result = new ArrayList<>(list.size());
+ list.forEach(item -> {
+ if (item != null) {
+ ApiIndItemValueDTO indItemValueDTO = new ApiIndItemValueDTO();
+ indItemValueDTO.setDataTime(item.getDataTime());
+ indItemValueDTO.setDataValue(item.getDataValue().doubleValue());
+ result.add(indItemValueDTO);
+ }
+ });
+ return result;
}
@Override
public ApiIndItemDTO getInfoById(String id) {
return ConvertUtils.sourceToTarget(indItemService.get(id), ApiIndItemDTO.class);
}
+
+ @Override
+ public List<ApiIndItemDTO> getInfoByIds(Set<String> indIds) {
+ if (CollectionUtils.isEmpty(indIds)) {
+ return new ArrayList<>();
+ }
+ List<IndItemEntity> inds = indItemService.getInfoByIds(indIds);
+ return ConvertUtils.sourceToTarget(inds,ApiIndItemDTO.class);
+ }
}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/xss/SQLFilter.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/xss/SQLFilter.java
index 7d2d02d..2dbbc18 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/xss/SQLFilter.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/xss/SQLFilter.java
@@ -54,7 +54,7 @@
String str = new String(orgStr.toLowerCase());
//非法字符
- String[] keywords = {";", "master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"};
+ String[] keywords = {";", "master", "truncate", "insert", "delete", "update", "declare", "alter", "drop"};
//判断是否包含非法字符
for (String keyword : keywords) {
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java
index 51b27f8..d8b98fb 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java
@@ -71,10 +71,10 @@
result = atomItemHandler.queryValue(indItem.getId());
break;
case DER:
- result = derItemHandler.queryValue(itemNo, startTime, endTime);
+ result = derItemHandler.queryValue(indItem.getId(), startTime, endTime);
break;
case CAL:
- result = calItemHandler.queryValue(itemNo, startTime, endTime);
+ result = calItemHandler.queryValue(indItem.getId(), startTime, endTime);
break;
default:
break;
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
index 87fee61..e33849c 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
@@ -139,7 +139,9 @@
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
- whereSql.append("' AND >= '");
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
calendar.add(Calendar.DAY_OF_YEAR, -7);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
whereSql.append("'");
@@ -148,7 +150,9 @@
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
- whereSql.append("' AND >= '");
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
calendar.add(Calendar.DAY_OF_YEAR, -30);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
whereSql.append("'");
@@ -183,10 +187,13 @@
whereSql.append("'");
break;
case THIS_YEAR_MONTH:
- calendar.set(Calendar.MONTH, 11);
+ whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
+ calendar.set(Calendar.MONTH, 11);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
- whereSql.append("' AND >= '");
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
calendar.set(Calendar.MONTH, 0);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
whereSql.append("'");
@@ -248,12 +255,18 @@
// 拼接SELECT
StringBuilder selectSql = new StringBuilder();
- selectSql.append(indItem.getDimension());
- selectSql.append(", ");
- selectSql.append(result.getSelectSql());
- selectSql.append(", ");
- selectSql.append(indItem.getTimeLabel());
- selectSql.append(" data_time");
+ if (StringUtils.isNotBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
+ selectSql.append(indItem.getDimension());
+ selectSql.append(", ");
+ selectSql.append(result.getSelectSql());
+ } else if (StringUtils.isBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
+ selectSql.append(result.getSelectSql());
+ } else {
+ selectSql.append(result.getSelectSql());
+ selectSql.append(", ");
+ selectSql.append(indItem.getTimeLabel());
+ selectSql.append(" data_time");
+ }
result.setSelectSql(selectSql.toString());
// 拼接WHERE
@@ -261,22 +274,28 @@
whereSql.append(" ");
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
- whereSql.append(DateUtils.format(endTime, PATTERN_MON));
- whereSql.append("' AND >= '");
- whereSql.append(DateUtils.format(startTime, PATTERN_MON));
+ whereSql.append(DateUtils.format(endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
+ whereSql.append(DateUtils.format(startTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
whereSql.append("'");
result.setWhereSql(whereSql.toString());
// 拼接GROUP
StringBuilder groupSql = new StringBuilder();
- groupSql.append(" GROUP BY ");
- groupSql.append(indItem.getDimension());
+ if (StringUtils.isNotBlank(indItem.getDimension())) {
+ groupSql.append(indItem.getDimension());
+ }
result.setGroupSql(groupSql.toString());
// 拼接ORDER
StringBuilder orderBySql = new StringBuilder();
- orderBySql.append(indItem.getTimeLabel());
- result.setOrderBySql(orderBySql.toString());
+ if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())) {
+ orderBySql.append(indItem.getTimeLabel());
+ result.setOrderBySql(orderBySql.toString());
+ }
+
return result;
}
}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/IndItemService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/IndItemService.java
index 593bdcd..e320ecc 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/IndItemService.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/IndItemService.java
@@ -8,6 +8,7 @@
import com.iailab.module.data.ind.item.vo.IndItemSaveReqVO;
import java.util.List;
+import java.util.Set;
/**
* @author PanZhibao
@@ -29,4 +30,6 @@
void delete(String id);
List<IndItemRespVO> getList(IndItemPageReqVO reqVO);
+
+ List<IndItemEntity> getInfoByIds(Set<String> indIds);
}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java
index 50ac0c4..6f5da02 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java
@@ -23,6 +23,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
/**
@@ -127,4 +128,9 @@
public List<IndItemRespVO> getList(IndItemPageReqVO reqVO) {
return baseDao.getItemList(reqVO);
}
+
+ @Override
+ public List<IndItemEntity> getInfoByIds(Set<String> indIds) {
+ return baseDao.selectBatchIds(indIds);
+ }
}
\ No newline at end of file
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 9fb4dd6..abdeba2 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,5 +1,10 @@
package com.iailab.module.model.mdk.sample;
+import cn.hutool.core.date.DateUtil;
+import com.iailab.module.data.api.ind.IndItemApi;
+import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
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;
@@ -8,8 +13,6 @@
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;
@@ -21,7 +24,6 @@
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;
@@ -47,6 +49,9 @@
private PlanItemApi planItemApi;
@Autowired
+ private IndItemApi indItemApi;
+
+ @Autowired
private MmItemResultService mmItemResultService;
@Autowired
@@ -70,6 +75,7 @@
List<SampleData> sampleDataList = new ArrayList<>();
Map<String, ApiPointDTO> pointMap = sampleInfo.getPointMap();
Map<String, ApiPlanItemDTO> planMap = sampleInfo.getPlanMap();
+ Map<String, ApiIndItemDTO> indMap = sampleInfo.getIndMap();
//对每个爪分别进行计算
for (ColumnItemPort entry : sampleInfo.getColumnInfo()) {
//先依据爪内数据项的modelParamOrder进行排序——重写comparator匿名函数
@@ -91,7 +97,7 @@
//对每一项依次进行数据查询,然后将查询出的值赋给matrix对应的位置
for (int i = 0; i < entry.getColumnItemList().size(); i++) {
try {
- List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap);
+ List<DataValueVO> dataEntityList = getData(entry.getColumnItemList().get(i), pointMap, planMap,indMap);
//补全数据
ColumnItem columnItem = entry.getColumnItemList().get(i);
dataEntityList = super.completionData(matrix.length, dataEntityList, columnItem.startTime, columnItem.endTime, columnItem.getParamType(),columnItem.getGranularity());
@@ -124,10 +130,11 @@
* @param columnItem
* @param pointMap
* @param planMap
+ * @param indMap
* @return
* @throws Exception
*/
- private List<DataValueVO> getData(ColumnItem columnItem, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap) throws Exception {
+ private List<DataValueVO> getData(ColumnItem columnItem, Map<String, ApiPointDTO> pointMap, Map<String, ApiPlanItemDTO> planMap, Map<String, ApiIndItemDTO> indMap) throws Exception {
List<DataValueVO> dataList = new ArrayList<>();
String paramType = columnItem.getParamType();
switch (ModelParamType.getEumByCode(paramType)) {
@@ -171,6 +178,23 @@
vo.setDataValue(t.getDataValue());
return vo;
}).collect(Collectors.toList());
+ case IND:
+ ApiIndItemQueryDTO queryIndItemDTO = new ApiIndItemQueryDTO();
+ ApiIndItemDTO intItem = indMap.get(columnItem.getParamId());
+ queryIndItemDTO.setItemNo(intItem.getItemNo());
+ queryIndItemDTO.setStart(columnItem.getStartTime());
+ queryIndItemDTO.setEnd(columnItem.getEndTime());
+ List<ApiIndItemValueDTO> indItemValueList = indItemApi.queryIndItemHistoryValue(queryIndItemDTO);
+ if (CollectionUtils.isEmpty(indItemValueList)) {
+ break;
+ }
+
+ dataList = indItemValueList.stream().map(t -> {
+ DataValueVO vo = new DataValueVO();
+ vo.setDataTime(DateUtil.parse(t.getDataTime()));
+ vo.setDataValue(t.getDataValue());
+ return vo;
+ }).collect(Collectors.toList());
default:
break;
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
index 5a162f0..6d93c9f 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/PredictSampleInfoConstructor.java
@@ -1,5 +1,7 @@
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;
@@ -43,6 +45,9 @@
@Autowired
private PlanItemApi planItemApi;
+ @Autowired
+ private IndItemApi indItemApi;
+
/**
* 返回样本矩阵的列数
*
@@ -84,6 +89,10 @@
Set<String> planIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.PLAN)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
List<ApiPlanItemDTO> plans = planItemApi.getInfoByIds(planIds);
Map<String, ApiPlanItemDTO> planMap = plans.stream().collect(Collectors.toMap(ApiPlanItemDTO::getId, Function.identity(), (e1, e2) -> e1));
+ // 统一获取指标数据的信息
+ Set<String> indIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.IND)).map(MmModelParamEntity::getModelparamid).collect(Collectors.toSet());
+ List<ApiIndItemDTO> inds = indItemApi.getInfoByIds(indIds);
+ Map<String, ApiIndItemDTO> indMap = inds.stream().collect(Collectors.toMap(ApiIndItemDTO::getId, Function.identity(), (e1, e2) -> e1));
for (MmModelParamEntity entry : modelInputParamEntityList) {
columnInfo.setParamType(entry.getModelparamtype());
@@ -91,7 +100,7 @@
columnInfo.setDataLength(super.getDataLength(dynamicDataLength, entry.getModelparamportorder(), entry.getDatalength()));
columnInfo.setModelParamOrder(entry.getModelparamorder());
columnInfo.setModelParamPortOrder(entry.getModelparamportorder());
- columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap));
+ columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap,indMap));
columnInfo.setStartTime(getStartTime(columnInfo, predictTime));
columnInfo.setEndTime(getEndTime(columnInfo, predictTime));
@@ -119,6 +128,7 @@
sampleInfo.setColumnInfo(resultList);
sampleInfo.setPointMap(pointMap);
sampleInfo.setPlanMap(planMap);
+ sampleInfo.setIndMap(indMap);
return sampleInfo;
}
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 5c7cda8..6915322 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
@@ -90,28 +90,27 @@
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);
+ // 测点值
+ 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());
+ }
}
//找出缺少项
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 45273aa..48fa7e8 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
@@ -82,9 +82,11 @@
calendar.setTime(originalTime);
switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
case DATAPOINT:
- case IND:
case PLAN:
dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
+ break;
+ case IND:
+ dateTime = calculateTime(originalTime, true, columnItem.getDataLength()-1, columnItem.getGranularity());
break;
case NORMALITEM:
case MERGEITEM:
@@ -131,7 +133,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())) {
@@ -144,7 +146,7 @@
granularity = mmPredictItemService.getItemByOutPutId(columnItem.getParamId()).getGranularity();
break;
case IND:
- ApiIndItemDTO indItemDTO = indItemApi.getInfoById(columnItem.getParamId());
+ ApiIndItemDTO indItemDTO = indMap.get(columnItem.getParamId());
granularity = TimeGranularitySecEnum.getEumByCode(indItemDTO.getTimeGranularity()).getValue();;
break;
case PLAN:
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
index acec837..36683ef 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/ScheduleSampleInfoConstructor.java
@@ -1,9 +1,12 @@
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.model.mcs.pre.entity.MmModelParamEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelParamEntity;
import com.iailab.module.model.mcs.sche.service.StScheduleModelParamService;
import com.iailab.module.model.mdk.common.enums.ModelParamType;
@@ -29,6 +32,9 @@
@Autowired
private PlanItemApi planItemApi;
+
+ @Autowired
+ private IndItemApi indItemApi;
@Override
protected Integer getSampleColumn(String modelId) {
@@ -58,6 +64,10 @@
Set<String> planIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.PLAN)).map(StScheduleModelParamEntity::getModelparamid).collect(Collectors.toSet());
List<ApiPlanItemDTO> plans = planItemApi.getInfoByIds(planIds);
Map<String, ApiPlanItemDTO> planMap = plans.stream().collect(Collectors.toMap(ApiPlanItemDTO::getId, Function.identity(), (e1, e2) -> e1));
+ // 统一获取指标数据的信息
+ Set<String> indIds = modelInputParamEntityList.stream().filter(e -> ModelParamType.getEumByCode(e.getModelparamtype()).equals(ModelParamType.IND)).map(StScheduleModelParamEntity::getModelparamid).collect(Collectors.toSet());
+ List<ApiIndItemDTO> inds = indItemApi.getInfoByIds(indIds);
+ Map<String, ApiIndItemDTO> indMap = inds.stream().collect(Collectors.toMap(ApiIndItemDTO::getId, Function.identity(), (e1, e2) -> e1));
for (StScheduleModelParamEntity entry : modelInputParamEntityList) {
columnInfo.setParamType(entry.getModelparamtype());
@@ -65,7 +75,7 @@
columnInfo.setDataLength(super.getDataLength(dynamicDataLength, entry.getModelparamportorder(), entry.getDatalength()));
columnInfo.setModelParamOrder(entry.getModelparamorder());
columnInfo.setModelParamPortOrder(entry.getModelparamportorder());
- columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap));
+ columnInfo.setGranularity(super.getGranularity(columnInfo, pointMap, planMap,indMap));
columnInfo.setStartTime(getStartTime(columnInfo, predictTime));
columnInfo.setEndTime(getEndTime(columnInfo, predictTime));
@@ -93,6 +103,7 @@
sampleInfo.setColumnInfo(resultList);
sampleInfo.setPointMap(pointMap);
sampleInfo.setPlanMap(planMap);
+ sampleInfo.setIndMap(indMap);
return sampleInfo;
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java
index 39bea32..065002a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java
@@ -1,5 +1,6 @@
package com.iailab.module.model.mdk.sample.dto;
+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;
import lombok.AllArgsConstructor;
@@ -37,4 +38,6 @@
private Map<String, ApiPointDTO> pointMap;
// 所有计划数据信息，避免重复查询
private Map<String, ApiPlanItemDTO> planMap;
+ // 所有计划数据信息，避免重复查询
+ private Map<String, ApiIndItemDTO> indMap;
}
\ No newline at end of file
--
Gitblit v1.9.3