From ca56f2da24aa48464b5aa23fb96162e213eeb4fd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 11 二月 2025 14:43:27 +0800
Subject: [PATCH] 数据分析接口修改

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |    5 +++--
 1 files changed, 3 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 87cbea9..2750fc1 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
@@ -127,6 +127,7 @@
             PredictItemTreeDTO moduleOpt = new PredictItemTreeDTO();
             moduleOpt.setId(item.getId());
             moduleOpt.setLabel(item.getModulename());
+            moduleOpt.setDisabled(true);
             List<PredictItemTreeDTO> children = new ArrayList<>();
             List<ItemVO> itemList = mmPredictItemService.getByModuleId(item.getId());
             itemList.forEach(item1 -> {
@@ -170,7 +171,7 @@
                     break;
                 }
             }
-            ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid());
+            ItemVO predictItem = mmPredictItemService.getItemById(output.getItemid());
             if (predictItem.getLastTime() != null) {
                 predictTime = predictItem.getLastTime();
             } else {
@@ -210,7 +211,7 @@
             viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime));
             viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
             viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-            viewDto.setCurData(mmItemResultJsonService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+            viewDto.setCurData(mmItemResultJsonService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, 3));
             List<Double> values = new ArrayList<>();
             if (!CollectionUtils.isEmpty(viewDto.getRealData())) {
                 List<Double> hisValues = new ArrayList<>();

--
Gitblit v1.9.3