From e690db9517216bea6a19c7c186d35b2ad8d6fd3f Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期一, 26 五月 2025 15:41:14 +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 | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 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 31e43d5..9963fca 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 @@ -16,6 +16,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Date; +import java.util.List; import java.util.UUID; @@ -52,19 +53,21 @@ if (confMain != null){ StSuggestSnapshotRecordSaveReqVO snapshotRecordSaveReqVO = new StSuggestSnapshotRecordSaveReqVO(); snapshotRecordSaveReqVO.setModelId(entity.getModelId()); - StSuggestSnapshotConfDetRespVO confDet = stSuggestSnapshotConfDetService.getByConfId(confMain.getId()); - snapshotRecordSaveReqVO.setDataNo(confDet.getDataNo()); - snapshotRecordSaveReqVO.setDataType(confDet.getDataType()); - snapshotRecordSaveReqVO.setScheduleTime(entity.getScheduleTime()); - //计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度 - LocalDateTime localStartDateTime = entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(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()); - Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant()); - snapshotRecordSaveReqVO.setEndTime(endTime); - stSuggestSnapshotRecordService.create(snapshotRecordSaveReqVO); + List<StSuggestSnapshotConfDetRespVO> confDetList = stSuggestSnapshotConfDetService.getByConfId(confMain.getId()); + confDetList.forEach(confDet -> { + snapshotRecordSaveReqVO.setDataNo(confDet.getDataNo()); + snapshotRecordSaveReqVO.setDataType(confDet.getDataType()); + snapshotRecordSaveReqVO.setScheduleTime(entity.getScheduleTime()); + //计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度 + LocalDateTime localStartDateTime = entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(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()); + Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant()); + snapshotRecordSaveReqVO.setEndTime(endTime); + stSuggestSnapshotRecordService.create(snapshotRecordSaveReqVO); + }); } } -- Gitblit v1.9.3