From a709abfd8ffec1524cefff30c3581f4425695433 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 05 十二月 2024 17:05:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..e1d951c 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;
@@ -516,7 +519,7 @@
}
@Override
- public List<ScheduleSuggestRespDTO> listScheduleSuggest(ScheduleSuggestReqDTO params) {
+ public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) {
return Collections.emptyList();
}
@@ -536,6 +539,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