From e691b98e02153c9c439d7f5acb468924572d75d9 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 09 一月 2025 17:31:17 +0800
Subject: [PATCH] item动态时间粒度

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 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 4d965a0..fcf9866 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
@@ -1,5 +1,6 @@
 package com.iailab.module.model.api;
 
+import com.iailab.framework.common.pojo.PageResult;
 import com.iailab.framework.common.util.date.DateUtils;
 import com.iailab.framework.common.util.object.ConvertUtils;
 import com.iailab.module.data.api.plan.PlanItemApi;
@@ -11,7 +12,7 @@
 import com.iailab.module.data.common.ApiDataQueryDTO;
 import com.iailab.module.model.api.mcs.McsApi;
 import com.iailab.module.model.api.mcs.dto.*;
-import com.iailab.module.model.common.enums.CommonConstant;
+import com.iailab.module.model.enums.CommonConstant;
 import com.iailab.module.model.common.enums.PreLineTypeEnum;
 import com.iailab.module.model.mcs.pre.entity.DmModuleEntity;
 import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
@@ -23,6 +24,7 @@
 import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
 import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
 import com.iailab.module.model.mdk.vo.ItemVO;
+import com.iailab.module.model.mpk.service.ChartParamService;
 import com.iailab.module.model.mpk.service.ChartService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -46,6 +48,9 @@
 public class McsApiImpl implements McsApi {
 
     @Autowired
+    private DataPointApi dataPointApi;
+
+    @Autowired
     private DmModuleService dmModuleService;
 
     @Autowired
@@ -59,9 +64,6 @@
 
     @Autowired
     private MmItemResultLastPointService mmItemResultLastPointService;
-
-    @Autowired
-    private DataPointApi dataPointApi;
 
     @Autowired
     private MmItemResultJsonService mmItemResultJsonService;
@@ -83,6 +85,9 @@
 
     @Autowired
     private StScheduleSchemeService stScheduleSchemeService;
+
+    @Autowired
+    private ChartParamService chartParamService;
 
     private int HOUR_MINS = 60;
 
@@ -248,20 +253,20 @@
         if (startTime == null) {
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(predictItem.getLastTime());
-            calendar.add(Calendar.MINUTE, -1 * predictItem.getPredictLength());
+            calendar.add(Calendar.SECOND, -1 * predictItem.getPredictLength() * predictItem.getGranularity());
             startTime = calendar.getTime();
         }
         Date endTime = reqVO.getEndTime();
         if (endTime == null) {
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(predictItem.getLastTime());
-            calendar.add(Calendar.MINUTE, predictItem.getPredictLength());
+            calendar.add(Calendar.SECOND, predictItem.getPredictLength() * predictItem.getGranularity());
             endTime = calendar.getTime();
         }
         if (endTime.getTime() <= startTime.getTime()) {
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(startTime);
-            calendar.add(Calendar.MINUTE, predictItem.getPredictLength());
+            calendar.add(Calendar.SECOND, predictItem.getPredictLength() * predictItem.getGranularity());
             endTime = calendar.getTime();
         }
 
@@ -336,7 +341,11 @@
         dataView.setRangeL(rangeL);
         dataView.setLimitH(limitH);
         dataView.setLimitL(limitL);
-        dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat));
+        if (StringUtils.isNotBlank(outPut.getPointid())) {
+            dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat));
+        } else {
+            dataView.setRealData(new ArrayList<>());
+        }
         dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
         switch (lineType) {
             case TN:
@@ -546,10 +555,25 @@
     }
 
     @Override
-    public List<StScheduleSchemeDTO> listScheduleScheme(Map<String, Object> params) {
+    public List<StScheduleSchemeDTO> listScheduleScheme(String triggerMethod, String triggerCondition) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("triggerMethod", triggerMethod);
+        params.put("triggerCondition", triggerCondition);
         return stScheduleSchemeService.list(params);
     }
 
+    @Override
+    public List<ChartParamDTO> getChartParamList(String chartCode) {
+        if (StringUtils.isBlank(chartCode)) {
+            return null;
+        }
+        return chartParamService.list(chartCode);
+    }
+
+    @Override
+    public PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(StAlarmAndSuggestPageReqVO reqVO) {
+        return stScheduleSchemeService.getAlarmAndSuggestPage(reqVO);
+    }
 
     private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
         Date[] result = new Date[3];

--
Gitblit v1.9.3