From a709abfd8ffec1524cefff30c3581f4425695433 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期四, 05 十二月 2024 17:05:09 +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 | 68 ++++++++++++++++++++++++++++++++- 1 files changed, 65 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 3aa0c92..e1d951c 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 @@ -15,7 +15,12 @@ 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; @@ -64,7 +69,19 @@ 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; @@ -346,6 +363,18 @@ } @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()); @@ -452,9 +481,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 @@ -463,13 +503,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 @@ -482,6 +539,11 @@ 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]; -- Gitblit v1.9.3