From f283ee497d7f8e8fd8981b6739f8fcbd6e4aba78 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 22 十一月 2024 13:57:57 +0800
Subject: [PATCH] 预测项输出描述

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 d93a293..3aa0c92 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
@@ -92,7 +92,7 @@
                     outList.forEach(out -> {
                         PredictItemTreeDTO chd2 = new PredictItemTreeDTO();
                         chd2.setId(out.getId());
-                        chd2.setLabel(out.getResultstr());
+                        chd2.setLabel(out.getResultName());
                         chd1.add(chd2);
                     });
                 }
@@ -149,10 +149,11 @@
             if (output == null) {
                 continue;
             }
-            legends.add(output.getResultstr());
+            legends.add(output.getResultName());
             viewDto.setItemId(output.getItemid());
             viewDto.setOutId(outId);
             viewDto.setResultstr(output.getResultstr());
+            viewDto.setResultName(output.getResultName());
             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));
@@ -254,11 +255,11 @@
             return result;
         }
         for (MmItemOutputEntity out : outs) {
-            legend.add(out.getResultstr());
+            legend.add(out.getResultName());
             PreDataSampleViewRespDTO viewDto = new PreDataSampleViewRespDTO();
             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.getResultstr(), viewDto);
+            viewMap.put(out.getResultName(), viewDto);
         }
         result.setStartTime(startTime);
         result.setEndTime(endTime);

--
Gitblit v1.9.3