From 0cbbe2c1cbfbf73e02e1796d921c2911c96d370b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:31 +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/api/McsApiImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 3fa6115..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;
@@ -134,7 +135,7 @@
Date predictTime = reqVO.getPredictTime();
if (predictTime == null) {
MmItemOutputEntity output = mmItemOutputService.getOutPutById(reqVO.getOutIds().get(0));
- ItemVO predictItem = mmPredictItemService.getItemById(output.getItemid());
+ ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid());
if (predictItem.getLastTime() != null) {
predictTime = predictItem.getLastTime();
} else {
@@ -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);
}
@@ -303,9 +306,6 @@
return result;
}
String resultIndex = chartParams.get(CommonConstant.RESULT_INDEX);
- if (resultIndex == null) {
- return result;
- }
ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode);
if (predictItem == null || predictItem.getLastTime() == null) {
@@ -327,7 +327,7 @@
List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat);
List<String> legend = new ArrayList<>();
- MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr, Integer.parseInt(resultIndex));
+ MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr, resultIndex);
PreDataViewRespDTO dataView = new PreDataViewRespDTO();
dataView.setItemId(predictItem.getId());
dataView.setItemName(predictItem.getItemName());
@@ -520,6 +520,7 @@
@Override
public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) {
+ stScheduleSuggestService.create(ConvertUtils.sourceToTarget(dto, StScheduleSuggestSaveReqVO.class));
return true;
}
--
Gitblit v1.9.3