From aedfec0f312d70a57d995132c36dbdc9f6febda4 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Fri, 19 Jul 2024 23:31:07 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2596-=E8=B0=83=E6=95=B4ExtAxProperty?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E5=BC=8F=E4=B8=BA=E7=89=A9=E7=90=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/engine/job/AbstractExecuteWithLockJobHandler.java | 1 + .../axzo/workflow/core/repository/entity/ExtAxProperty.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AbstractExecuteWithLockJobHandler.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AbstractExecuteWithLockJobHandler.java index 8aec1d2e5..406dc44f0 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AbstractExecuteWithLockJobHandler.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AbstractExecuteWithLockJobHandler.java @@ -31,6 +31,7 @@ public abstract class AbstractExecuteWithLockJobHandler extends AbstractJobHandl extAxProperty.setName(processInstanceId); extAxProperty.setValue(jobId); extAxPropertyService.add(extAxProperty); + log.info("job acquire lock success,processInstanceId:{},jobId:{}", processInstanceId, jobId); executeInternal(job, configuration, variableScope, commandContext); } catch (DuplicateKeyException e) { log.error("executeWithLock error,lock by another job,jobId:{},processInstanceId:{}", job.getId(), job.getProcessInstanceId(), e); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxProperty.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxProperty.java index f9cb34980..57caa83cd 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxProperty.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxProperty.java @@ -1,6 +1,7 @@ package cn.axzo.workflow.core.repository.entity; import cn.axzo.framework.data.mybatisplus.model.BaseEntity; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; @@ -38,5 +39,6 @@ public class ExtAxProperty extends BaseEntity { @TableField("value") private String value; - + @TableField(value = "is_delete", fill = FieldFill.INSERT) + private Long isDelete = 0L; }