From 7f0bcd00c556889ba890e5e68c681f1b5d4267e1 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 19 十二月 2024 18:07:20 +0800
Subject: [PATCH] 预测项状态添加模型结果异常
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 203 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 171 insertions(+), 32 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 b358b99..b5abf3a 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,17 +1,26 @@
package com.iailab.module.model.api;
import com.iailab.framework.common.util.date.DateUtils;
+import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.module.data.api.plan.PlanItemApi;
+import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
+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.common.enums.PreLineTypeEnum;
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.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;
import lombok.extern.slf4j.Slf4j;
@@ -59,6 +68,21 @@
@Autowired
private ChartService chartService;
+ @Autowired
+ private MmPredictAlarmMessageService mmPredictAlarmMessageService;
+
+ @Autowired
+ private StScheduleSuggestService stScheduleSuggestService;
+
+ @Autowired
+ private PlanItemApi planItemApi;
+
+ @Autowired
+ private MmPredictAlarmConfigService mmPredictAlarmConfigService;
+
+ @Autowired
+ private StScheduleSchemeService stScheduleSchemeService;
+
private int HOUR_MINS = 60;
@Override
@@ -85,7 +109,7 @@
outList.forEach(out -> {
PredictItemTreeDTO chd2 = new PredictItemTreeDTO();
chd2.setId(out.getId());
- chd2.setLabel(out.getResultstr());
+ chd2.setLabel(out.getResultName());
chd1.add(chd2);
});
}
@@ -110,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 {
@@ -142,10 +166,11 @@
if (output == null) {
continue;
}
- legends.add(output.getResultstr());
+ legends.add(output.getResultName());
viewDto.setItemId(output.getItemid());
viewDto.setOutId(outId);
viewDto.setResultstr(output.getResultstr());
+ viewDto.setResultName(output.getResultName());
viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime));
viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
@@ -247,11 +272,13 @@
return result;
}
for (MmItemOutputEntity out : outs) {
- legend.add(out.getResultstr());
+ 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.getResultstr(), viewDto);
+ viewMap.put(out.getResultName(), viewDto);
}
result.setStartTime(startTime);
result.setEndTime(endTime);
@@ -277,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;
@@ -289,31 +318,15 @@
BigDecimal limitL = chartParams.get(CommonConstant.LIMIT_L) == null ? BigDecimal.ZERO : 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();
- result.setPredictTime(predictItem.getLastTime());
- Date predictTime = predictItem.getLastTime();
- Date startTime = reqVO.getStartTime();
- if (startTime == null) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.MINUTE, -1 * lengthLeft);
- startTime = calendar.getTime();
- }
- Date endTime = reqVO.getEndTime();
- if (endTime == null) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.MINUTE, lengthRight);
- endTime = calendar.getTime();
- }
- if (endTime.getTime() <= startTime.getTime()) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(startTime);
- calendar.add(Calendar.MINUTE, lengthRight);
- endTime = calendar.getTime();
- }
+
+ Date[] timeArray = calResultTime(predictItem, reqVO.getStartTime(), reqVO.getEndTime(), lengthLeft, lengthRight);
+ Date predictTime = timeArray[0];
+ Date startTime = timeArray[1];
+ Date endTime = timeArray[2];
+
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());
@@ -344,11 +357,74 @@
dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
}
+ result.setPredictTime(predictTime);
result.setStartTime(startTime);
result.setEndTime(endTime);
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;
+ }
+
+ @Override
+ public PlanDataSingleChartRespVO getPlanDataSingleChart(PreDataSingleChartReqVO reqVO) {
+ PlanDataSingleChartRespVO result = new PlanDataSingleChartRespVO();
+ Map<String, String> chartParams = chartService.getByChartCode(reqVO.getChartCode());
+ if (CollectionUtils.isEmpty(chartParams)) {
+ return result;
+ }
+ String itemCode = chartParams.get(CommonConstant.ITEM_CODE);
+ if (itemCode == null) {
+ return result;
+ }
+ String planItemStr = chartParams.get(CommonConstant.PLAN_ITEM_LIST);
+ if (planItemStr == null) {
+ return result;
+ }
+ List<String> planItemCodeList = Arrays.asList(planItemStr.split(","));
+
+ ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode);
+ if (predictItem == null || predictItem.getLastTime() == null) {
+ return result;
+ }
+ String timeFormat = StringUtils.isBlank(reqVO.getTimeFormat()) ? DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND : reqVO.getTimeFormat();
+ 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();
+ Date[] timeArray = calResultTime(predictItem, reqVO.getStartTime(), reqVO.getEndTime(), lengthLeft, lengthRight);
+ Date predictTime = timeArray[0];
+ Date startTime = timeArray[1];
+ Date endTime = timeArray[2];
+ List<String> categories = DateUtils.getTimeScale(startTime, endTime, predictItem.getGranularity(), timeFormat);
+ List<String> legend = new ArrayList<>();
+ LinkedHashMap<String, List<PlanDataRecordDTO>> record = new LinkedHashMap<>();
+ ApiDataQueryDTO queryDTO = new ApiDataQueryDTO();
+ queryDTO.setItemNos(planItemCodeList);
+ queryDTO.setStart(startTime);
+ queryDTO.setEnd(endTime);
+ LinkedHashMap<String, List<ApiPlanDataDTO>> planData = planItemApi.queryPlanItemRecordValue(queryDTO);
+ if (CollectionUtils.isEmpty(planData)) {
+ planData.forEach((key, value) -> {
+ record.put(key, ConvertUtils.sourceToTarget(value, PlanDataRecordDTO.class));
+ });
+ }
+ result.setPredictTime(predictTime);
+ result.setStartTime(startTime);
+ result.setEndTime(endTime);
+ result.setCategories(categories);
+ result.setLegend(legend);
+ result.setRecord(record);
return result;
}
@@ -409,9 +485,20 @@
return result;
}
+ /**
+ * 新增预警信息
+ *
+ * @param dto
+ * @return
+ */
@Override
public Boolean createAlarmMessage(AlarmMessageRespDTO dto) {
- return true;
+ try {
+ mmPredictAlarmMessageService.create(ConvertUtils.sourceToTarget(dto, MmPredictAlarmMessageSaveReqVO.class));
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
}
@Override
@@ -420,13 +507,30 @@
}
@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);
+ }
+
+ @Override
public Boolean createScheduleSuggest(ScheduleSuggestRespDTO dto) {
return true;
}
@Override
- public List<ScheduleSuggestRespDTO> listScheduleSuggest(ScheduleSuggestReqDTO params) {
- return null;
+ public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List<ScheduleSuggestRespDTO> getLastLimitScheduleSuggest(String scheduleObj, Integer limit) {
+ List<StScheduleSuggestEntity> list = stScheduleSuggestService.getList(scheduleObj, limit);
+ return ConvertUtils.sourceToTarget(list, ScheduleSuggestRespDTO.class);
}
@Override
@@ -438,4 +542,39 @@
public Boolean modifyScheduleModelSetting(List<ScheduleModelSettingReqDTO> dtos) {
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];
+ Date predictTime = predictItem.getLastTime();
+ Date startTime = startTimeReq;
+ if (startTime == null) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictItem.getLastTime());
+ calendar.add(Calendar.MINUTE, -1 * lengthLeft);
+ startTime = calendar.getTime();
+ }
+ Date endTime = endTimeReq;
+ if (endTime == null) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictItem.getLastTime());
+ calendar.add(Calendar.MINUTE, lengthRight);
+ endTime = calendar.getTime();
+ }
+ if (endTime.getTime() <= startTime.getTime()) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(startTime);
+ calendar.add(Calendar.MINUTE, lengthRight);
+ endTime = calendar.getTime();
+ }
+ result[0] = predictTime;
+ result[1] = startTime;
+ result[2] = endTime;
+ return result;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3