From cc69f877cb51f4014c664d8002050fa0f9314a81 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 28 五月 2025 15:35:26 +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 | 5 +++--
1 files changed, 3 insertions(+), 2 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 cd80ff6..8e9b090 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
@@ -62,6 +62,7 @@
}
confDetList.forEach(confDet -> {
StSuggestSnapshotRecordSaveReqVO snapshotRecordSaveReqVO = new StSuggestSnapshotRecordSaveReqVO();
+ snapshotRecordSaveReqVO.setSuggestId(reqVo.getSuggestId());
snapshotRecordSaveReqVO.setModelId(entity.getModelId());
snapshotRecordSaveReqVO.setOperationId(entity.getId());
snapshotRecordSaveReqVO.setDataNo(confDet.getDataNo());
@@ -69,11 +70,11 @@
snapshotRecordSaveReqVO.setDataName(confDet.getDataName());
snapshotRecordSaveReqVO.setScheduleTime(entity.getScheduleTime());
//计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度
- LocalDateTime localStartDateTime = entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(confDet.getLeftLength());
+ 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());
+ 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);
--
Gitblit v1.9.3