From 0809aa554fc906e73a383c34f88bb4153bb69b00 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 14 一月 2025 14:24:08 +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 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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 8ea2538..3dade90 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,13 +12,19 @@
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.DataTypeEnum;
import com.iailab.module.model.enums.CommonConstant;
import com.iailab.module.model.common.enums.PreLineTypeEnum;
+import com.iailab.module.model.influxdb.pojo.InfluxModelResultByOutPutIdsPOJO;
+import com.iailab.module.model.influxdb.service.InfluxDBService;
+import com.iailab.module.model.influxdb.vo.InfluxModelResultVO;
import com.iailab.module.model.mcs.pre.entity.DmModuleEntity;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.entity.MmPredictAlarmMessageEntity;
import com.iailab.module.model.mcs.pre.service.*;
+import com.iailab.module.model.mcs.pre.vo.MmItemOutputRespVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
+import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
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;
@@ -34,7 +41,9 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @author PanZhibao
@@ -87,6 +96,9 @@
@Autowired
private ChartParamService chartParamService;
+
+ @Autowired
+ private InfluxDBService influxDBService;
private int HOUR_MINS = 60;
@@ -252,20 +264,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();
}
@@ -364,6 +376,12 @@
}).collect(Collectors.toList());
dataView.setPreMax(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
+ }
+
+ String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
+ if (StringUtils.isNotBlank(alarmObj)) {
+ List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class);
+ dataView.setAlarmList(alarmList);
}
result.setPredictTime(predictTime);
@@ -569,6 +587,39 @@
return chartParamService.list(chartCode);
}
+ @Override
+ public PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(StAlarmAndSuggestPageReqVO reqVO) {
+ return stScheduleSchemeService.getAlarmAndSuggestPage(reqVO);
+ }
+
+ @Override
+ public Map<String, Map<String, Double>> getPreDoubleData(PreDoubleDataReqVO reqVO) {
+ List<MmPredictItemRespVO> doubleItemOutPuts = mmPredictItemService.getDoubleOutPutsByItemNos(reqVO.getItemNos());
+
+ //<itemNo,<resultStr,double>>
+ Map<String, Map<String, Double>> result = new HashMap<>(reqVO.getItemNos().size());
+
+ for (MmPredictItemRespVO mmPredictItemRespVO : doubleItemOutPuts) {
+ List<String> outPutIds = mmPredictItemRespVO.getOutPuts().stream().map(MmItemOutputRespVO::getId).collect(Collectors.toList());
+ InfluxModelResultByOutPutIdsPOJO pojo = new InfluxModelResultByOutPutIdsPOJO();
+ pojo.setOutPutIds(outPutIds);
+ pojo.setType(DataTypeEnum.FLOAT.getCode());
+ Map<String, List<InfluxModelResultVO>> outPutIdDoubles = influxDBService.queryModelResultsByOutPutIds(pojo, mmPredictItemRespVO.getLastTime(), mmPredictItemRespVO.getLastTime());
+ Map<String, Double> outPutIdDouble = new HashMap<>(outPutIds.size());
+ for (MmItemOutputRespVO outPut : mmPredictItemRespVO.getOutPuts()) {
+ String outPutId = outPut.getId();
+ if (outPutIdDoubles.containsKey(outPutId)) {
+ List<InfluxModelResultVO> influxModelResultVOS = outPutIdDoubles.get(outPutId);
+ if (!CollectionUtils.isEmpty(influxModelResultVOS)) {
+ outPutIdDouble.put(outPut.getResultstr(),Double.valueOf(influxModelResultVOS.get(0).getValue().toString()));
+ }
+ }
+ }
+ result.put(mmPredictItemRespVO.getItemno(),outPutIdDouble);
+ }
+ return result;
+ }
+
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