feat(flow): 实现流程删除和更新功能

cjbi · cjbi · commit e3789f1e1c49 · 2025-09-30T12:55:11.000+08:00
- 添加流程删除接口，支持逻辑删除- 实现流程更新功能，提供更新接口
- 查询流程列表时过滤已删除数据- 统计流程数量时排除已删除记录
- 完善流程相关接口的租户和调用者信息
- 增加更新流程的API文档和参数校验- 优化流程定义仓库的查询条件处理
diff --git a/src/main/java/tech/wetech/flexmodel/application/FlowApplicationService.java b/src/main/java/tech/wetech/flexmodel/application/FlowApplicationService.java
@@ -56,7 +56,7 @@ public List<ElementInstance> getHistoryElementList(String flowInstanceId) {
    */
   public PageDTO<FlowModuleResponse> findFlowModuleList(FlowModuleListRequest request) {
     log.info("获取流程模块列表，参数: {}", request);
-    Predicate predicate = Expressions.TRUE;
+    Predicate predicate = Expressions.field(FlowDefinition::getIsDeleted).eq(false);
     if (StringUtils.isNotBlank(request.getFlowModuleId())) {
       predicate = predicate.and(Expressions.field(FlowDefinition::getFlowModuleId).eq(request.getFlowModuleId()));
     }
@@ -130,6 +130,19 @@ public DeployFlowResult deployFlow(DeployFlowParam deployFlowParam) {
     return processService.deployFlow(deployFlowParam);
   }
 
+  /**
+   * 更新流程
+   */
+  public UpdateFlowResult updateFlow(UpdateFlowParam updateFlowParam) {
+    log.info("更新流程，流程模块ID: {}", updateFlowParam.getFlowModuleId());
+    return processService.updateFlow(updateFlowParam);
+  }
+
+  public void deleteFlow(String flowModuleId) {
+    log.info("删除流程，流程模块ID: {}", flowModuleId);
+    processService.deleteFlow(flowModuleId);
+  }
+
   /**
    * 获取流程模块信息
    */
@@ -187,5 +200,4 @@ public FlowInstance findFlowInstance(String flowInstanceId) {
     }
     return flowInstanceService.findById(flowInstanceId);
   }
-
 }
diff --git a/src/main/java/tech/wetech/flexmodel/application/MetricsApplicationService.java b/src/main/java/tech/wetech/flexmodel/application/MetricsApplicationService.java
@@ -6,6 +6,7 @@
 import tech.wetech.flexmodel.application.dto.*;
 import tech.wetech.flexmodel.codegen.entity.ApiDefinition;
 import tech.wetech.flexmodel.codegen.entity.Datasource;
+import tech.wetech.flexmodel.codegen.entity.FlowDefinition;
 import tech.wetech.flexmodel.codegen.entity.JobExecutionLog;
 import tech.wetech.flexmodel.domain.model.api.ApiDefinitionService;
 import tech.wetech.flexmodel.domain.model.api.ApiRequestLogService;
@@ -78,7 +79,7 @@ public FmMetricsResponse getFmMetrics() {
 
       // 获取各种计数
       int reqLogCount = (int) apiLogService.count(TRUE);
-      int flowDefCount = (int) flowDefService.count(TRUE);
+      int flowDefCount = (int) flowDefService.count(Expressions.field(FlowDefinition::getIsDeleted).eq(false));
       int flowInsCount = (int) flowInstanceService.count(TRUE);
       int triggerCount = (int) triggerService.count(TRUE);
       int jobSuccessCount = (int) jobExecutionLogService.count(Expressions.field(JobExecutionLog::getExecutionStatus).eq("SUCCESS"));
diff --git a/src/main/java/tech/wetech/flexmodel/domain/model/flow/processor/DefinitionProcessor.java b/src/main/java/tech/wetech/flexmodel/domain/model/flow/processor/DefinitionProcessor.java
@@ -30,6 +30,7 @@
 import tech.wetech.flexmodel.shared.utils.JsonUtils;
 import tech.wetech.flexmodel.shared.utils.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @ApplicationScoped
@@ -106,6 +107,17 @@ public UpdateFlowResult update(UpdateFlowParam updateFlowParam) {
     return updateFlowResult;
   }
 
+
+  public void delete(String flowModuleId) {
+    if (StringUtils.isBlank(flowModuleId)) {
+      throw new ParamException(ErrorEnum.PARAM_INVALID.getErrNo(), "flowModuleId is null");
+    }
+    FlowDefinition flowDefinition = flowDefinitionRepository.selectByModuleId(flowModuleId);
+    flowDefinition.setIsDeleted(true);
+    flowDefinition.setModifyTime(LocalDateTime.now());
+    flowDefinitionRepository.updateByModuleId(flowDefinition);
+  }
+
   public DeployFlowResult deploy(DeployFlowParam deployFlowParam) {
     DeployFlowResult deployFlowResult = new DeployFlowResult();
     try {
diff --git a/src/main/java/tech/wetech/flexmodel/domain/model/flow/service/ProcessEngineImpl.java b/src/main/java/tech/wetech/flexmodel/domain/model/flow/service/ProcessEngineImpl.java
@@ -110,6 +110,11 @@ public FlowInstanceResult getFlowInstance(String flowInstanceId) {
     return runtimeProcessor.getFlowInstance(flowInstanceId);
   }
 
+  @Override
+  public void deleteFlow(String flowModuleId) {
+    definitionProcessor.delete(flowModuleId);
+  }
+
   @Override
   public InstanceDataListResult getInstanceData(String flowInstanceId, String instanceDataId) {
     return runtimeProcessor.getInstanceData(flowInstanceId, instanceDataId, true);
diff --git a/src/main/java/tech/wetech/flexmodel/domain/model/flow/service/ProcessService.java b/src/main/java/tech/wetech/flexmodel/domain/model/flow/service/ProcessService.java
@@ -238,4 +238,6 @@ public interface ProcessService {
    * @param flowInstanceId
    */
   FlowInstanceResult getFlowInstance(String flowInstanceId);
+
+  void deleteFlow(String flowModuleId);
 }
diff --git a/src/main/java/tech/wetech/flexmodel/infrastructure/persistence/FlowDefinitionFmRepository.java b/src/main/java/tech/wetech/flexmodel/infrastructure/persistence/FlowDefinitionFmRepository.java
@@ -43,6 +43,7 @@ public FlowDefinition selectByModuleId(String flowModuleId) {
   public List<FlowDefinition> find(Predicate filter, Integer page, Integer size) {
     return session.dsl().selectFrom(FlowDefinition.class)
       .page(page, size)
+      .where(filter)
       .orderByDesc("id")
       .execute();
   }
diff --git a/src/main/java/tech/wetech/flexmodel/interfaces/rest/FlowResource.java b/src/main/java/tech/wetech/flexmodel/interfaces/rest/FlowResource.java
@@ -175,6 +175,8 @@ public PageDTO<FlowInstance> findFlowInstanceList(
       )
     )})
   public CreateFlowResult createFlow(CreateFlowParam createFlowParam) {
+    createFlowParam.setTenant("default");
+    createFlowParam.setCaller("admin");
     return flowApplicationService.createFlow(createFlowParam);
   }
 
@@ -205,9 +207,50 @@ public DeployFlowResult deployFlow(
     @PathParam("flowModuleId") String flowModuleId,
     DeployFlowParam deployFlowParam) {
     deployFlowParam.setFlowModuleId(flowModuleId);
+    deployFlowParam.setTenant("default");
+    deployFlowParam.setCaller("admin");
     return flowApplicationService.deployFlow(deployFlowParam);
   }
 
+  @Operation(summary = "更新流程")
+  @PUT
+  @Path("/{flowModuleId}")
+  @RequestBody(
+    name = "请求体",
+    content = {@Content(
+      mediaType = "application/json",
+      schema = @Schema(
+        implementation = UpdateFlowParamSchema.class
+      )
+    )}
+  )
+  @APIResponse(
+    name = "200",
+    responseCode = "200",
+    description = "OK",
+    content = {@Content(
+      mediaType = "application/json",
+      schema = @Schema(
+        implementation = UpdateFlowResultSchema.class
+      )
+    )})
+  public UpdateFlowResult updateFlow(
+    @Parameter(name = "flowModuleId", description = "流程模块ID", in = ParameterIn.PATH)
+    @PathParam("flowModuleId") String flowModuleId,
+    UpdateFlowParam updateFlowParam) {
+    updateFlowParam.setFlowModuleId(flowModuleId);
+    updateFlowParam.setTenant("default");
+    updateFlowParam.setCaller("admin");
+    return flowApplicationService.updateFlow(updateFlowParam);
+  }
+
+  @DELETE
+  @Path("/{flowModuleId}")
+  public void deleteFlow(@Parameter(name = "flowModuleId", description = "流程模块ID", in = ParameterIn.PATH)
+                         @PathParam("flowModuleId") String flowModuleId) {
+    flowApplicationService.deleteFlow(flowModuleId);
+  }
+
   @Operation(summary = "获取流程模块信息")
   @APIResponse(
     name = "200",
@@ -398,6 +441,20 @@ public DeployFlowParamSchema() {
     }
   }
 
+  @Schema(
+    properties = {
+      @SchemaProperty(name = "flowModuleId", examples = {"flow_module_001"}, description = "流程模块ID"),
+      @SchemaProperty(name = "tenant", examples = {"default"}, description = "租户"),
+      @SchemaProperty(name = "caller", examples = {"admin"}, description = "调用者"),
+      @SchemaProperty(name = "operator", examples = {"admin"}, description = "操作者")
+    }
+  )
+  public static class UpdateFlowParamSchema extends DeployFlowParam {
+    public UpdateFlowParamSchema() {
+      super("default", "admin");
+    }
+  }
+
   @Schema(
     properties = {
       @SchemaProperty(name = "errCode", examples = {"0"}, description = "错误码"),
@@ -409,6 +466,16 @@ public DeployFlowParamSchema() {
   public static class DeployFlowResultSchema extends DeployFlowResult {
   }
 
+  @Schema(
+    properties = {
+      @SchemaProperty(name = "errCode", examples = {"0"}, description = "错误码"),
+      @SchemaProperty(name = "errMsg", examples = {"success"}, description = "错误信息"),
+    }
+  )
+  public static class UpdateFlowResultSchema extends UpdateFlowResult {
+
+  }
+
   @Schema(
     properties = {
       @SchemaProperty(name = "errCode", examples = {"0"}, description = "错误码"),
diff --git a/src/main/resources/import.idl b/src/main/resources/import.idl
@@ -138,6 +138,7 @@ model f_em_flow_definition {
   archive: Int @default(0) @comment("归档状态(0未删除，1删除)"),
   tenant: String @comment("租户"),
   caller?: String @comment("调用方"),
+  is_deleted: Boolean @default(0) @comment("删除状态(0未删除，1已删除)"),
 
   @index(name: "IDX_flow_define_module", fields: [flow_module_id])
   @comment("流程定义")
@@ -475,7 +476,7 @@ model f_job_execution_log {
   tenant_id? : String @length("50") @comment("租户ID"),
   created_at : DateTime @default(now()) @comment("创建时间"),
   updated_at : DateTime @default(now()) @comment("更新时间"),
-  
+
   @index(name:"IDX_JOB_EXEC_TRIGGER_ID", unique: false, fields: [trigger_id]),
   @index(name:"IDX_JOB_EXEC_JOB_ID", unique: false, fields: [job_id]),
   @index(name:"IDX_JOB_EXEC_FLOW_INSTANCE", unique: false, fields: [flow_instance_id]),

Original file line number	Diff line number	Diff line change
`@@ -238,4 +238,6 @@ public interface ProcessService {`
`238`	`238`	`* @param flowInstanceId`
`239`	`239`	`*/`
`240`	`240`	`FlowInstanceResult getFlowInstance(String flowInstanceId);`
	`241`	`+`
	`242`	`+ void deleteFlow(String flowModuleId);`
`241`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ public FlowDefinition selectByModuleId(String flowModuleId) {`
`43`	`43`	`public List<FlowDefinition> find(Predicate filter, Integer page, Integer size) {`
`44`	`44`	`return session.dsl().selectFrom(FlowDefinition.class)`
`45`	`45`	`.page(page, size)`
	`46`	`+ .where(filter)`
`46`	`47`	`.orderByDesc("id")`
`47`	`48`	`.execute();`
`48`	`49`	`}`