From 9904da747fbf3d5c3746f351620f038392e3684b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 12 一月 2025 21:13:48 +0800
Subject: [PATCH] 预警列表
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 96 +++++++++++-------------------------------------
1 files changed, 22 insertions(+), 74 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 129b8da..cf9ea58 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;
@@ -8,24 +9,22 @@
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.api.point.dto.ApiPointValueWriteDTO;
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.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.StScheduleModelOutEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
-import com.iailab.module.model.mcs.sche.service.StScheduleModelOutService;
import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService;
import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
import com.iailab.module.model.mdk.vo.ItemVO;
+import com.iailab.module.model.mpk.service.ChartParamService;
import com.iailab.module.model.mpk.service.ChartService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -88,7 +87,7 @@
private StScheduleSchemeService stScheduleSchemeService;
@Autowired
- private StScheduleModelOutService stScheduleModelOutService;
+ private ChartParamService chartParamService;
private int HOUR_MINS = 60;
@@ -254,20 +253,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();
}
@@ -366,6 +365,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.setAlarmeList(alarmList);
}
result.setPredictTime(predictTime);
@@ -564,73 +569,16 @@
}
@Override
- public Boolean scheduleModelOut(MdkScheduleRespDTO dto) {
- String modelId = stScheduleSchemeService.getByCode(dto.getScheduleCode()).getModelId();
- Map<String,Object> result = dto.getResult();
- List<StScheduleModelOutDTO> list = stScheduleModelOutService.list(modelId);
- try{
- list.forEach(
- item -> {
- double value = 0;
- //判断点位是否下发以及返回结果是否存在
- if(item.getIsWrite()==1){
- if(result.get(item.getResultKey())==null){
- log.error(result.get(item.getResultKey()) + "resultKey匹配失败");
- }
- Object resultValue = result.get(item.getResultKey());
- //判断解析方式
- if(item.getResultType().equals("double")){
- if(resultValue instanceof Double) {
- value = (Double) resultValue;
- }
- }else if(item.getResultType().equals("double[]")){
- ArrayList<Double> doubleList = (ArrayList<Double>) resultValue;
- double[] array = new double[doubleList.size()];
- for (int i = 0; i < doubleList.size(); i++) {
- array[i] = doubleList.get(i);
- }
- if(array!= null && item.getResultPort() < array.length){
- value = array[item.getResultPort()];
- }else{
- log.error(result.get(item.getResultKey()) + "下角标超限");
- }
-
- }else if(item.getResultType().equals("double[][]")){
- if (item.getResultType().equals("double[][]")) {
- if (resultValue instanceof ArrayList) {
- ArrayList<ArrayList<Double>> doubleListList = (ArrayList<ArrayList<Double>>) resultValue;
- double[][] array = new double[doubleListList.size()][];
- for (int i = 0; i < doubleListList.size(); i++) {
- ArrayList<Double> doubleList = doubleListList.get(i);
- array[i] = new double[doubleList.size()];
- for (int j = 0; j < doubleList.size(); j++) {
- array[i][j] = doubleList.get(j);
- }
- }
- if (array != null && item.getResultPort() < array.length && item.getResultIndex() < array[item.getResultPort()].length) {
- value = array[item.getResultPort()][item.getResultIndex()];
- } else {
- log.error(result.get(item.getResultKey()) + "下标超限");
- }
- }
- }
- }
- //下发到point点位
- ApiPointValueWriteDTO ApiPointValueWriteDTO = new ApiPointValueWriteDTO();
- ApiPointValueWriteDTO.setPointNo(item.getPointNo());
- ApiPointValueWriteDTO.setValue(value);
- if (!dataPointApi.writePointRealValue(ApiPointValueWriteDTO)) {
- log.error(result.get(item.getResultKey()) + "下发数据异常");
- }
-
- }
- }
- );
- }catch (Exception ex){
- log.error("下发数据异常");
- ex.printStackTrace();
+ public List<ChartParamDTO> getChartParamList(String chartCode) {
+ if (StringUtils.isBlank(chartCode)) {
+ return null;
}
- return true;
+ return chartParamService.list(chartCode);
+ }
+
+ @Override
+ public PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(StAlarmAndSuggestPageReqVO reqVO) {
+ return stScheduleSchemeService.getAlarmAndSuggestPage(reqVO);
}
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
--
Gitblit v1.9.3