wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-5965' into dev

Browse Source
This commit is contained in:
wangli 2025-12-03 14:51:36 +08:00
commit b8d5fb8778
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnExpressionTranslator.java
View File

@ -1,8 +1,9 @@
package cn.axzo.workflow.core.common.utils;
import cn.axzo.workflow.common.model.request.bpmn.BpmnCondition;
import cn.axzo.workflow.common.exception.WorkflowEngineException;
import cn.axzo.workflow.common.model.request.bpmn.BpmnCondition;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.math.NumberUtils;
import java.util.List;
import java.util.Objects;
@ -20,7 +21,8 @@ import static cn.axzo.workflow.common.code.ConvertorRespCode.CONVERTOR_OPERATION
* @since 2023/11/16 23:30
*/
public final class BpmnExpressionTranslator {
private BpmnExpressionTranslator() {}
private BpmnExpressionTranslator() {
}
public static String translateString(BpmnCondition condition) {
// ${var:contains('variableName', 'hello')};
@ -88,7 +90,8 @@ public final class BpmnExpressionTranslator {
"('" +
condition.getCode() +
"', " +
condition.getDefaultValue() +
(NumberUtils.isDigits(condition.getDefaultValue()) ? condition.getDefaultValue() : "'" + condition.getDefaultValue() + "'")
+
")";
} else {
throw new WorkflowEngineException(CONVERTOR_OPERATION_RADIO_TYPE_ERROR, condition.getOperator());

10
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
View File

@ -17,6 +17,7 @@ import cn.axzo.workflow.core.engine.cmd.CustomGetProcessInstanceVariablesToObjec
import cn.axzo.workflow.core.repository.entity.ExtAxBpmnFormRelation;
import cn.axzo.workflow.core.service.BpmnProcessInstanceService;
import cn.axzo.workflow.core.service.ExtAxBpmnFormRelationService;
import cn.axzo.workflow.core.service.support.ExpressionConditionCmd;
import cn.axzo.workflow.core.service.support.FlowNodeForecastService;
import cn.axzo.workflow.form.service.FormDefinitionService;
import cn.axzo.workflow.server.common.annotation.RepeatSubmit;
@ -383,6 +384,14 @@ public class TestController {
return CommonResponse.success(value);
}
@GetMapping("/process/expression/testing")
public CommonResponse<String> parseProcessExpression(@RequestParam String processInstanceId, @RequestParam String expression) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
// 自定义命令执行表达式
Object value = commandExecutor.execute(new ExpressionConditionCmd(runtimeService, processEngineConfiguration, processInstanceId, expression));
return CommonResponse.success(Objects.toString(value, ""));
}
@GetMapping("/es/index")
public CommonResponse<String> esIndex(@RequestParam String str) {
esIndexOperationJobHandler.execute(str);
@ -423,5 +432,6 @@ public class TestController {
ServerFileUploadSdkResponse serverFileUploadSdkResponse = serverFileServiceSdk.uploadFile(request);
return CommonResponse.success(JSON.toJSONString(serverFileUploadSdkResponse));
}
}