From edf66f68df77254d85f52fedde9eba171c475e20 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 08:40:23 +0800
Subject: [PATCH] 忽略建议
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 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 e69bac2..19268d2 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
@@ -117,9 +117,6 @@
@Autowired
private StScheduleModelSettingService stScheduleModelSettingService;
-
- @Autowired
- private MmPredictAutoAdjustConfigService autoAdjustService;
private int HOUR_MINS = 60;
@Override
@@ -141,6 +138,7 @@
PredictItemTreeDTO chd = new PredictItemTreeDTO();
chd.setLabel(item1.getItemName());
chd.setId(item1.getId());
+ chd.setDisabled(true);
List<PredictItemTreeDTO> chd1 = new ArrayList<>();
List<MmItemOutputEntity> outList = mmItemOutputService.getByItemid(item1.getId());
if (!CollectionUtils.isEmpty(outList)) {
@@ -335,6 +333,7 @@
viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime, reqVO.getPrec()));
}
viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ viewDto.setPreDataL(mmItemResultLastPointService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, 3));
//处理预测累计
if (out.getIscumulant() == 1) {
if (StringUtils.isNotBlank(out.getCumulpoint())) {
@@ -431,7 +430,7 @@
dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat, decimalPlaces));
break;
case TL:
- dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), predictTime, endTime, timeFormat, decimalPlaces));
+ dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat, decimalPlaces));
dataView.setPreDataL(mmItemResultLastPointService.getData(outPut.getId(), startTime, endTime, timeFormat, decimalPlaces));
break;
default:
@@ -457,12 +456,23 @@
if (!CollectionUtils.isEmpty(dataView.getCurData())) {
List<Double> curList = dataView.getCurData().stream().map(t -> {
- return new Double(t[1].toString());
- }).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)).setScale(2, BigDecimal.ROUND_HALF_UP));
- dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum()).setScale(2, BigDecimal.ROUND_HALF_UP));
+ try {
+ return new Double(t[1].toString());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }).filter(Objects::nonNull).collect(Collectors.toList());
+ if (!curList.isEmpty()) {
+ 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)).setScale(2, BigDecimal.ROUND_HALF_UP));
+ dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum()).setScale(2, BigDecimal.ROUND_HALF_UP));
+ } else {
+ dataView.setPreMax(null);
+ dataView.setPreMin(null);
+ dataView.setPreLast(null);
+ dataView.setPreCumulant(null);
+ }
}
String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
@@ -785,6 +795,7 @@
return result;
}
+ @Override
public Map<String, BigDecimal> getPredictLastValue(PredictLastValueReqVO reqVO) {
Map<String, BigDecimal> result = new HashMap<>(reqVO.getItemNos().size());
if (CollectionUtils.isEmpty(reqVO.getItemNos())) {
@@ -807,6 +818,30 @@
}
Date predictTime = predictItem.getLastTime();
List<Object[]> curData = mmItemResultJsonService.getData(outputId, predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ if (CollectionUtils.isEmpty(curData)) {
+ result.put(key, BigDecimal.ZERO);
+ } else {
+ result.put(key, new BigDecimal(curData.get(curData.size() - 1)[1].toString()));
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Map<String, BigDecimal> getPredictValueByTime(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) {
+ String key = itemNo[0] + "," + itemNo[1] + "," + itemNo[2];
+ ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemNo[0]);
+ if (predictItem == null || predictItem.getLastTime() == null) {
+ result.put(key, BigDecimal.ZERO);
+ }
+ MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), itemNo[1], itemNo[2]);
+ List<Object[]> curData = mmItemResultJsonService.getData(outPut.getId(), reqVO.getPredictTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
if (CollectionUtils.isEmpty(curData)) {
result.put(key, BigDecimal.ZERO);
} else {
@@ -945,13 +980,13 @@
}
@Override
- public List<ScheduleSuggestRespDTO> getLastSuggest(Map<String, Object> params) {
- return stScheduleSuggestService.getLastSuggest(params);
+ public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
+ return stScheduleSuggestService.ignoreSuggest(reqVO);
}
@Override
- public Boolean autoAdjustByCode(MmPredictAutoAdjustReqVO reqVO) {
- return autoAdjustService.autoAdjustByCode(reqVO.getConfigCode(), reqVO.getAdjustStartTime());
+ public List<ScheduleSuggestRespDTO> getLastSuggest(Map<String, Object> params) {
+ return stScheduleSuggestService.getLastSuggest(params);
}
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
--
Gitblit v1.9.3