From 24996ea75ec4ca3b7d154387bfe37ec9dd387255 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 29 五月 2025 14:40:05 +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 | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 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 9963fca..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
@@ -2,6 +2,7 @@
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
+import com.iailab.framework.common.util.collection.CollectionUtils;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.model.mcs.sche.dao.StSuggestOperationRecordDao;
import com.iailab.module.model.mcs.sche.entity.StSuggestOperationRecordEntity;
@@ -47,28 +48,37 @@
entity.setId(UUID.randomUUID().toString());
entity.setHandleTime(new Date());
baseDao.insert(entity);
-
- //获取调度建议快照配置表信息
- StSuggestSnapshotConfMainRespVO confMain = stSuggestSnapshotConfMainService.getByModelIdAndScheduleObj(reqVo.getModelId(), reqVo.getSuggestId());
- if (confMain != null){
- StSuggestSnapshotRecordSaveReqVO snapshotRecordSaveReqVO = new StSuggestSnapshotRecordSaveReqVO();
- snapshotRecordSaveReqVO.setModelId(entity.getModelId());
- 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);
- });
+ 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