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

fix(sj_1.1.0-beta2): 新增决策的节点在线校验内容

Browse Source
This commit is contained in:
opensnail 2024-07-01 15:52:46 +08:00
parent df9bb043e8
commit fda6fda5b1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/dto/DecisionConfig.java
View File

@ -34,6 +34,9 @@ public class DecisionConfig {
*/ */
private Integer defaultDecision; private Integer defaultDecision;
private Map<String, Object> check; /**
* 决策节点校验内容
*/
private String checkContent;
} }

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

@ -314,7 +314,7 @@ public class WorkflowServiceImpl implements WorkflowService {
Assert.notNull(realExpressionEngine, () -> new SnailJobServerException("表达式引擎不存在")); Assert.notNull(realExpressionEngine, () -> new SnailJobServerException("表达式引擎不存在"));
ExpressionInvocationHandler invocationHandler = new ExpressionInvocationHandler(realExpressionEngine); ExpressionInvocationHandler invocationHandler = new ExpressionInvocationHandler(realExpressionEngine);
ExpressionEngine expressionEngine = ExpressionFactory.getExpressionEngine(invocationHandler); ExpressionEngine expressionEngine = ExpressionFactory.getExpressionEngine(invocationHandler);
expressionEngine.eval(decisionConfig.getNodeExpression(), StrUtil.EMPTY); expressionEngine.eval(decisionConfig.getNodeExpression(), decisionConfig.getCheckContent());
} catch (Exception e) { } catch (Exception e) {
SnailJobLog.LOCAL.error("表达式异常. [{}]", decisionConfig.getNodeExpression(), e); SnailJobLog.LOCAL.error("表达式异常. [{}]", decisionConfig.getNodeExpression(), e);
return Pair.of(StatusEnum.NO.getStatus(), e.getMessage()); return Pair.of(StatusEnum.NO.getStatus(), e.getMessage());