From dfceba5626e95a5d12faa5a4e2bee9408c464ec3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 十二月 2024 10:43:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 965a3cd..4d965a0 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -21,6 +21,7 @@
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService;
import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
+import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mpk.service.ChartService;
import lombok.extern.slf4j.Slf4j;
@@ -235,7 +236,7 @@
@Override
public PreDataItemChartRespVO getPreDataItemChart(PreDataItemChartReqVO reqVO) {
PreDataItemChartRespVO result = new PreDataItemChartRespVO();
- ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(reqVO.getItemId());
+ ItemVO predictItem = mmPredictItemService.getItemById(reqVO.getItemId());
if (predictItem == null) {
return result;
}
@@ -274,7 +275,9 @@
for (MmItemOutputEntity out : outs) {
legend.add(out.getResultName());
PreDataSampleViewRespDTO viewDto = new PreDataSampleViewRespDTO();
- viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
+ if (StringUtils.isNotBlank(out.getPointid())) {
+ viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
+ }
viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewMap.put(out.getResultName(), viewDto);
}
@@ -517,6 +520,7 @@
@Override
public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) {
+ stScheduleSuggestService.create(ConvertUtils.sourceToTarget(dto, StScheduleSuggestSaveReqVO.class));
return true;
}
--
Gitblit v1.9.3