From f5ec1f3326f75e18222859a534ed5a249f5e2cc3 Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期三, 04 六月 2025 17:35:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java | 40 ---------------------------------------- 1 files changed, 0 insertions(+), 40 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java index 8e9b090..06792f9 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java @@ -28,15 +28,6 @@ public class StSuggestOperationRecordServiceImpl extends BaseServiceImpl<StSuggestOperationRecordDao, StSuggestOperationRecordEntity> implements StSuggestOperationRecordService { - @Autowired - private StSuggestSnapshotConfMainService stSuggestSnapshotConfMainService; - - @Autowired - private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService; - - @Autowired - private StSuggestSnapshotRecordService stSuggestSnapshotRecordService; - @Override public PageResult<StSuggestOperationRecordEntity> page(StSuggestOperationRecordPageReqVO reqVO) { return baseDao.selectPage(reqVO); @@ -48,37 +39,6 @@ entity.setId(UUID.randomUUID().toString()); entity.setHandleTime(new Date()); baseDao.insert(entity); - if (!"采纳建议".equals(reqVo.getOperate())){ - return; - } - //获取调度建议快照配置表信息 - StSuggestSnapshotConfMainRespVO confMain = stSuggestSnapshotConfMainService.getByModelIdAndScheduleObj(reqVo.getModelId(), reqVo.getScheduleObj()); - if (confMain == null) { - return; - } - List<StSuggestSnapshotConfDetRespVO> confDetList = stSuggestSnapshotConfDetService.getByConfId(confMain.getId()); - if (CollectionUtils.isAnyEmpty(confDetList)) { - return; - } - confDetList.forEach(confDet -> { - StSuggestSnapshotRecordSaveReqVO snapshotRecordSaveReqVO = new StSuggestSnapshotRecordSaveReqVO(); - snapshotRecordSaveReqVO.setSuggestId(reqVo.getSuggestId()); - snapshotRecordSaveReqVO.setModelId(entity.getModelId()); - snapshotRecordSaveReqVO.setOperationId(entity.getId()); - snapshotRecordSaveReqVO.setDataNo(confDet.getDataNo()); - snapshotRecordSaveReqVO.setDataType(confDet.getDataType()); - snapshotRecordSaveReqVO.setDataName(confDet.getDataName()); - snapshotRecordSaveReqVO.setScheduleTime(entity.getScheduleTime()); - //计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度 - LocalDateTime localStartDateTime = entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(confDet.getLeftLength() == null ? 60 : confDet.getLeftLength()); - Date startTime = Date.from(localStartDateTime.atZone(ZoneId.systemDefault()).toInstant()); - snapshotRecordSaveReqVO.setStartTime(startTime); - //计算结束时间,结束时间为当前调度时间加上快照配置表配置的右侧时间长度 - LocalDateTime localEndDateTime = entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength() == null ? 60 : confDet.getLeftLength()); - Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant()); - snapshotRecordSaveReqVO.setEndTime(endTime); - stSuggestSnapshotRecordService.create(snapshotRecordSaveReqVO); - }); } } \ No newline at end of file -- Gitblit v1.9.3