From 85b2001c0ec2f1adc598db3bf47ad457dcca7074 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 19 十二月 2024 16:37:53 +0800
Subject: [PATCH] item-chart 空point校验

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 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 c88e4d7..6070178 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;
@@ -76,6 +77,12 @@
     @Autowired
     private PlanItemApi planItemApi;
 
+    @Autowired
+    private MmPredictAlarmConfigService mmPredictAlarmConfigService;
+
+    @Autowired
+    private StScheduleSchemeService stScheduleSchemeService;
+
     private int HOUR_MINS = 60;
 
     @Override
@@ -127,7 +134,7 @@
         Date predictTime = reqVO.getPredictTime();
         if (predictTime == null) {
             MmItemOutputEntity output = mmItemOutputService.getOutPutById(reqVO.getOutIds().get(0));
-            ItemVO predictItem = mmPredictItemService.getItemById(output.getItemid());
+            ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid());
             if (predictItem.getLastTime() != null) {
                 predictTime = predictItem.getLastTime();
             } else {
@@ -228,7 +235,7 @@
     @Override
     public PreDataItemChartRespVO getPreDataItemChart(PreDataItemChartReqVO reqVO) {
         PreDataItemChartRespVO result = new PreDataItemChartRespVO();
-        ItemVO predictItem = mmPredictItemService.getItemById(reqVO.getItemId());
+        ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(reqVO.getItemId());
         if (predictItem == null) {
             return result;
         }
@@ -267,7 +274,9 @@
         for (MmItemOutputEntity out : outs) {
             legend.add(out.getResultName());
             PreDataSampleViewRespDTO viewDto = new PreDataSampleViewRespDTO();
-            viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
+            if (StringUtils.isNotBlank(out.getPointid())) {
+                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.getResultName(), viewDto);
         }
@@ -295,6 +304,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;
@@ -315,7 +326,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());
@@ -352,6 +363,18 @@
         result.setCategories(categories);
         result.setLegend(legend);
         result.setDataView(dataView);
+        return result;
+    }
+
+    @Override
+    public Map<String, List<Object[]>> getPreDataCur(PreDataJsonReqVO reqVO) {
+        Map<String, List<Object[]>> result = new HashMap<>();
+        if (reqVO == null || reqVO.getPredictTime() == null || CollectionUtils.isEmpty(reqVO.getOutputIdList())) {
+            return result;
+        }
+        reqVO.getOutputIdList().forEach(outPutId -> {
+            result.put(outPutId, mmItemResultJsonService.getData(outPutId, reqVO.getPredictTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+        });
         return result;
     }
 
@@ -484,6 +507,11 @@
     }
 
     @Override
+    public List<AlarmConfigRespDTO> listAlarmConfig(Map<String, Object> params) {
+        return mmPredictAlarmConfigService.list(params);
+    }
+
+    @Override
     public AlarmMessageRespDTO getLastAlarmMessage(String alarmObj) {
         MmPredictAlarmMessageEntity entity = mmPredictAlarmMessageService.getLast(alarmObj);
         return ConvertUtils.sourceToTarget(entity, AlarmMessageRespDTO.class);
@@ -492,6 +520,11 @@
     @Override
     public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) {
         return true;
+    }
+
+    @Override
+    public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) {
+        return Collections.emptyList();
     }
 
     @Override
@@ -510,6 +543,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