Merge branch 'hotfix/timer_alter' into feature/REQ-4624

This commit is contained in:
wangli 2025-08-06 18:04:40 +08:00
commit b42ed0b38c

View File

@ -8,7 +8,6 @@ import cn.axzo.workflow.core.conf.SupportRefreshProperties;
import cn.axzo.workflow.core.listener.Alter; import cn.axzo.workflow.core.listener.Alter;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.common.engine.impl.interceptor.CommandContext;
import org.flowable.engine.RuntimeService; import org.flowable.engine.RuntimeService;
@ -50,11 +49,11 @@ public class AsyncTermNodeAlterJobHandler extends AbstractJobHandler implements
public void execute(JobEntity job, String configuration, VariableScope variableScope, CommandContext commandContext) { public void execute(JobEntity job, String configuration, VariableScope variableScope, CommandContext commandContext) {
log.warn("AsyncTermNodeAlterJobHandler exec start..."); log.warn("AsyncTermNodeAlterJobHandler exec start...");
ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext); ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
JSONObject jsonObject = JSON.parseObject(job.getJobHandlerConfiguration()); // JSONObject jsonObject = JSON.parseObject(job.getJobHandlerConfiguration());
if (!jsonObject.containsKey("activityId")) { // if (!jsonObject.containsKey("activityId")) {
return; // return;
} // }
String activityId = jsonObject.getString("activityId"); String activityId = job.getJobHandlerConfiguration();
RuntimeService runtimeService = processEngineConfiguration.getRuntimeService(); RuntimeService runtimeService = processEngineConfiguration.getRuntimeService();
TermNodePausingDTO dto = runtimeService.getVariable(job.getProcessInstanceId(), BIZ_NODE_ALTER + activityId, TermNodePausingDTO.class); TermNodePausingDTO dto = runtimeService.getVariable(job.getProcessInstanceId(), BIZ_NODE_ALTER + activityId, TermNodePausingDTO.class);
TaskService taskService = processEngineConfiguration.getTaskService(); TaskService taskService = processEngineConfiguration.getTaskService();