From ec50954c8c9d244a2ff259b653aaaa7bfeabe79b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 21 三月 2025 14:45:52 +0800
Subject: [PATCH] 数据分析页面显示预警信息 调度建议

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 8cf7c27..4c97c0a 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
@@ -439,7 +439,8 @@
 
         String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
         if (StringUtils.isNotBlank(alarmObj)) {
-            List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class);
+            String alarmTitle = chartParams.get(CommonConstant.ALARM_TITLE);
+            List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime, alarmTitle), AlarmMessageRespDTO.class);
             dataView.setAlarmList(alarmList);
             if (CollectionUtils.isEmpty(alarmList)) {
                 dataView.setAlarmMessage("暂无预警信息");
@@ -843,6 +844,26 @@
         return true;
     }
 
+    @Override
+    public MmItemOutputDTO getItemOutputByItemid(String itemid, String resultstr, String resultIndex) {
+        return ConvertUtils.sourceToTarget(mmItemOutputService.getByItemid(itemid,resultstr,resultIndex),MmItemOutputDTO.class);
+    }
+
+    @Override
+    public List<Object[]> getItemResult(String outputid, Date startTime, Date endTime, String timeFormat) {
+        return mmItemResultService.getData(outputid,startTime,endTime,timeFormat);
+    }
+
+    @Override
+    public PredictItemVO getPredictItemByItemNo(String itemNo) {
+        return ConvertUtils.sourceToTarget(mmPredictItemService.getItemByItemNo(itemNo),PredictItemVO.class);
+    }
+
+    @Override
+    public List<Object[]> getItemResultLastPoint(String outputid, Date startTime, Date endTime, String timeFormat) {
+        return mmItemResultLastPointService.getData(outputid,startTime,endTime,timeFormat);
+    }
+
     private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
         Date[] result = new Date[3];
         Date predictTime = predictItem.getLastTime();

--
Gitblit v1.9.3