GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(1.3.0-beta1.1): 修复重试场景保存失败问题

Browse Source
This commit is contained in:
opensnail 2025-01-02 22:39:02 +08:00
parent c6c8c5bb80
commit 8fde82c067
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java
View File

@ -191,7 +191,7 @@ public class WorkflowHandler {
WorkflowRequestVO.NodeConfig childNode = nodeInfo.getChildNode(); WorkflowRequestVO.NodeConfig childNode = nodeInfo.getChildNode();
if (Objects.nonNull(childNode) && CollUtil.isNotEmpty(childNode.getConditionNodes())) { if (Objects.nonNull(childNode) && CollUtil.isNotEmpty(childNode.getConditionNodes())) {
buildGraph(Lists.newArrayList(workflowNode.getId()), buildGraph(Lists.newArrayList(workflowNode.getId()),
tempDeque, Objects.isNull(tempDeque) ? deque : tempDeque,
groupName, workflowId, childNode, graph, version); groupName, workflowId, childNode, graph, version);
} else { } else {
if (WorkflowNodeTypeEnum.DECISION.getType() == nodeConfig.getNodeType()) { if (WorkflowNodeTypeEnum.DECISION.getType() == nodeConfig.getNodeType()) {

6
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java
View File

@ -125,7 +125,9 @@ public class SceneConfigServiceImpl implements SceneConfigService {
RetrySceneConfig retrySceneConfig = SceneConfigConverter.INSTANCE.toRetrySceneConfig(requestVO); RetrySceneConfig retrySceneConfig = SceneConfigConverter.INSTANCE.toRetrySceneConfig(requestVO);
retrySceneConfig.setCreateDt(LocalDateTime.now()); retrySceneConfig.setCreateDt(LocalDateTime.now());
retrySceneConfig.setNamespaceId(namespaceId); retrySceneConfig.setNamespaceId(namespaceId);
retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(requestVO.getNotifyIds()));
retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(requestVO.getNotifyIds()).orElse(Sets.newHashSet())));
if (requestVO.getBackOff() == WaitStrategies.WaitStrategyEnum.DELAY_LEVEL.getType()) { if (requestVO.getBackOff() == WaitStrategies.WaitStrategyEnum.DELAY_LEVEL.getType()) {
retrySceneConfig.setTriggerInterval(StrUtil.EMPTY); retrySceneConfig.setTriggerInterval(StrUtil.EMPTY);
} }
@ -153,7 +155,7 @@ public class SceneConfigServiceImpl implements SceneConfigService {
retrySceneConfig.setTriggerInterval( retrySceneConfig.setTriggerInterval(
Optional.ofNullable(retrySceneConfig.getTriggerInterval()).orElse(StrUtil.EMPTY)); Optional.ofNullable(retrySceneConfig.getTriggerInterval()).orElse(StrUtil.EMPTY));
retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(requestVO.getNotifyIds())); retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(requestVO.getNotifyIds()).orElse(Sets.newHashSet())));
Assert.isTrue(1 == accessTemplate.getSceneConfigAccess().update(retrySceneConfig, Assert.isTrue(1 == accessTemplate.getSceneConfigAccess().update(retrySceneConfig,
new LambdaUpdateWrapper<RetrySceneConfig>() new LambdaUpdateWrapper<RetrySceneConfig>()
.eq(RetrySceneConfig::getNamespaceId, namespaceId) .eq(RetrySceneConfig::getNamespaceId, namespaceId)