From bffae5a5405060f3facd7a3bc34f22bfa5a6f2ba Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 21:41:10 +0800
Subject: [PATCH] 获取最后预测值
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 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 3dade90..551c335 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
@@ -329,10 +329,10 @@
}
String timeFormat = StringUtils.isBlank(reqVO.getTimeFormat()) ? DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND : reqVO.getTimeFormat();
PreLineTypeEnum lineType = chartParams.get(CommonConstant.LINE_TYPE) == null ? PreLineTypeEnum.TN : PreLineTypeEnum.getEumByCode(chartParams.get(CommonConstant.LINE_TYPE));
- BigDecimal rangeH = chartParams.get(CommonConstant.RANGE_H) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.RANGE_H));
- BigDecimal rangeL = chartParams.get(CommonConstant.RANGE_L) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.RANGE_L));
- BigDecimal limitH = chartParams.get(CommonConstant.LIMIT_H) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.LIMIT_H));
- BigDecimal limitL = chartParams.get(CommonConstant.LIMIT_L) == null ? BigDecimal.ZERO : new BigDecimal(chartParams.get(CommonConstant.LIMIT_L));
+ BigDecimal rangeH = chartParams.get(CommonConstant.RANGE_H) == null ? null : new BigDecimal(chartParams.get(CommonConstant.RANGE_H));
+ BigDecimal rangeL = chartParams.get(CommonConstant.RANGE_L) == null ? null : new BigDecimal(chartParams.get(CommonConstant.RANGE_L));
+ BigDecimal limitH = chartParams.get(CommonConstant.LIMIT_H) == null ? null : new BigDecimal(chartParams.get(CommonConstant.LIMIT_H));
+ BigDecimal limitL = chartParams.get(CommonConstant.LIMIT_L) == null ? null : new BigDecimal(chartParams.get(CommonConstant.LIMIT_L));
int lengthLeft = chartParams.get(CommonConstant.LENGTH_LEFT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_LEFT)).intValue();
int lengthRight = chartParams.get(CommonConstant.LENGTH_RIGHT) == null ? predictItem.getPredictLength() : new BigDecimal(chartParams.get(CommonConstant.LENGTH_RIGHT)).intValue();
@@ -358,6 +358,7 @@
dataView.setRealData(new ArrayList<>());
}
dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
+ dataView.setLineType(lineType.getCode());
switch (lineType) {
case TN:
dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat));
@@ -369,6 +370,10 @@
default:
break;
}
+ if (!CollectionUtils.isEmpty(dataView.getRealData())) {
+ Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1);
+ dataView.setCurrValue(new BigDecimal(rdo[1].toString()));
+ }
if (!CollectionUtils.isEmpty(dataView.getCurData())) {
List<Double> curList = dataView.getCurData().stream().map(t -> {
@@ -376,12 +381,20 @@
}).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));
+ dataView.setPreLast(new BigDecimal(curList.get(curList.size() - 1)));
+ dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum())
+ .divide(new BigDecimal(HOUR_MINS), 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);
+ if (CollectionUtils.isEmpty(alarmList)) {
+ dataView.setAlarmMessage("暂无预警信息");
+ } else {
+ dataView.setAlarmMessage(alarmList.get(0).getContent());
+ }
}
result.setPredictTime(predictTime);
@@ -620,6 +633,30 @@
return result;
}
+ public Map<String, BigDecimal> getPredictLastValue(PredictLastValueReqVO reqVO) {
+ Map<String, BigDecimal> result = new HashMap<>(reqVO.getItemNos().size());
+ if (CollectionUtils.isEmpty(reqVO.getItemNos())) {
+ return result;
+ }
+ List<String[]> itemNos = reqVO.getItemNos();
+ for (String[] itemNo : itemNos) {
+ ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemNo[0]);
+ if (predictItem == null || predictItem.getLastTime() == null) {
+ result.put(itemNo[0], BigDecimal.ZERO);
+ }
+ MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), itemNo[1], itemNo[2]);
+
+ Date predictTime = predictItem.getLastTime();
+ List<Object[]> curData = mmItemResultJsonService.getData(outPut.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ if(CollectionUtils.isEmpty(curData)) {
+ result.put(itemNo[0], BigDecimal.ZERO);
+ } else {
+ result.put(itemNo[0], new BigDecimal(curData.get(curData.size() - 1)[1].toString()));
+ }
+ }
+ 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