From 2fe27eee95f46825fdeee267a42811a3069991c8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:00 +0800
Subject: [PATCH] local

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |   14 ++++++++++++--
 1 files changed, 12 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 3242912..fa66d48 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
@@ -19,6 +19,7 @@
 import com.iailab.module.model.mcs.pre.service.*;
 import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
 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.mdk.vo.ItemVO;
 import com.iailab.module.model.mpk.service.ChartService;
@@ -79,6 +80,8 @@
     @Autowired
     private MmPredictAlarmConfigService mmPredictAlarmConfigService;
 
+    @Autowired
+    private StScheduleSchemeService stScheduleSchemeService;
 
     private int HOUR_MINS = 60;
 
@@ -299,6 +302,8 @@
         if (resultStr == null) {
             return result;
         }
+        String resultIndex = chartParams.get(CommonConstant.RESULT_INDEX);
+
         ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode);
         if (predictItem == null || predictItem.getLastTime() == null) {
             return result;
@@ -319,7 +324,7 @@
 
         List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat);
         List<String> legend = new ArrayList<>();
-        MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr);
+        MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), resultStr, resultIndex);
         PreDataViewRespDTO dataView = new PreDataViewRespDTO();
         dataView.setItemId(predictItem.getId());
         dataView.setItemName(predictItem.getItemName());
@@ -516,7 +521,7 @@
     }
 
     @Override
-    public List<ScheduleSuggestRespDTO> listScheduleSuggest(ScheduleSuggestReqDTO params) {
+    public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) {
         return Collections.emptyList();
     }
 
@@ -536,6 +541,11 @@
         return true;
     }
 
+    @Override
+    public List<StScheduleSchemeDTO> listScheduleScheme(Map<String, Object> params) {
+        return stScheduleSchemeService.list(params);
+    }
+
 
     private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
         Date[] result = new Date[3];

--
Gitblit v1.9.3