From 037fb7228bdcb0909a6c8109adfae861cd9067f1 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期三, 25 十二月 2024 17:03:46 +0800 Subject: [PATCH] double类型特殊处理 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 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..9a6275c 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); } @@ -333,7 +336,11 @@ dataView.setRangeL(rangeL); dataView.setLimitH(limitH); dataView.setLimitL(limitL); - dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat)); + if (StringUtils.isNotBlank(outPut.getPointid())) { + dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat)); + } else { + dataView.setRealData(new ArrayList<>()); + } dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat)); switch (lineType) { case TN: @@ -517,6 +524,7 @@ @Override public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) { + stScheduleSuggestService.create(ConvertUtils.sourceToTarget(dto, StScheduleSuggestSaveReqVO.class)); return true; } -- Gitblit v1.9.3