feat(REQ-4418) - 测试服务端与客户端枚举不一致的问题

workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java

@@ -42,7 +42,6 @@ import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
 import cn.axzo.workflow.common.model.response.bpmn.process.doc.DocPendingVO;
 import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskButtonVo;
 import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskInstanceLogVO;
-import cn.axzo.workflow.common.model.response.category.CategoryItemVO;
 import cn.axzo.workflow.common.valid.group.ValidGroup;
 import cn.axzo.workflow.core.engine.cmd.CustomGetModelDocsCmd;
 import cn.axzo.workflow.core.repository.entity.ExtAxProcessLog;
@@ -88,7 +87,6 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -96,7 +94,6 @@ import java.util.stream.Stream;
 import static cn.axzo.workflow.common.code.BpmnInstanceRespCode.PROCESS_DOC_ID_NOT_IN_MODEL;
 import static cn.axzo.workflow.common.code.BpmnInstanceRespCode.PROCESS_DOC_READ_PARAM_ERROR;
 import static cn.axzo.workflow.common.code.BpmnInstanceRespCode.PROCESS_EXT_LOG_PARAM_ERROR;
-import static cn.axzo.workflow.common.constant.BpmnConstants.BPM_MODEL_CATEGORY;
 import static cn.azxo.framework.common.model.CommonResponse.success;
 
 /**

workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java

@@ -27,7 +27,6 @@ import cn.axzo.workflow.starter.mq.check.ImplementationReadyChecker;
 import cn.axzo.workflow.starter.mq.monitor.WorkflowEngineStarterDefaultMQMonitor;
 import cn.axzo.workflow.starter.mq.monitor.console.WorkflowEngineStarterMQMonitorController;
 import cn.axzo.workflow.starter.selector.MetaFeignClientEnableSelector;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.MixAll;
@@ -38,9 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -164,9 +161,9 @@ public class WorkflowEngineStarterAutoConfiguration {
         return new ImplementationReadyChecker();
     }
 
-    @Bean
+//    @Bean
-    @ConditionalOnMissingBean(name = "enumUnknownCustomizer")
+//    @ConditionalOnMissingBean(name = "enumUnknownCustomizer")
-    public Jackson2ObjectMapperBuilderCustomizer enumUnKnowCustomizer() {
+//    public Jackson2ObjectMapperBuilderCustomizer enumUnKnowCustomizer() {
-        return builder -> builder.featuresToEnable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE);
+//        return builder -> builder.featuresToEnable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE);
-    }
+//    }
 }

workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java

@@ -1,87 +1,64 @@
 package cn.axzo.workflow.starter.api;
 
-import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
-import cn.axzo.workflow.common.util.ThreadUtil;
-import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.ASYNC;
-import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC;
-import cn.axzo.workflow.client.annotation.WorkflowEngineFeignClient;
 import cn.axzo.workflow.common.annotation.InvokeMode;
-import cn.axzo.workflow.common.annotation.Manageable;
+import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum;
-import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutCallbackDTO;
-import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutTriggerDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivitySetAssigneeDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivityTriggerDTO;
-import cn.azxo.framework.common.model.CommonResponse;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import javax.validation.constraints.NotBlank;
-import cn.axzo.workflow.common.model.request.form.definition.StartFormSearchDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormDetailDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormSearchDTO;
-import cn.axzo.workflow.common.model.response.form.FormVO;
-import cn.axzo.workflow.common.model.response.form.definition.FormDefinitionVO;
-import cn.axzo.workflow.common.model.response.form.instance.FormInstanceVO;
-import java.util.List;
 import cn.axzo.workflow.common.model.dto.SignFileDTO;
 import cn.axzo.workflow.common.model.dto.SimpleDocDTO;
-import cn.axzo.workflow.common.model.request.bpmn.log.LogApproveSearchDTO;
+import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutCallbackDTO;
+import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutTriggerDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BeforeProcessInstanceCreateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAdminPageReqVO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCarbonCopyDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCheckApproverDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCreateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceLogQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceMyPageReqVO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.doc.ApproverReadStatusDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.doc.ChangeApproverReadStatusDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.doc.ProcessDocQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskButtonSearchDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivitySetAssigneeDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivityTriggerDTO;
-import cn.axzo.workflow.common.model.response.BpmPageResult;
-import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceAdminPageItemVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceLogVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstancePageItemVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.ExtProcessLogVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.NodesByModelVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.doc.DocPendingVO;
-import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskButtonVo;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
-import java.util.Map;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnNodeBackSystemOperateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnOptionalNodeDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnRobotTaskCompleteDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnRobotTaskCreateDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAttachmentDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditWithFormDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskBackAuditDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskButtonSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCommentDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCountersignDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskRemindDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskResetApproversDTO;
 import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskTransferDTO;
-import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceGroupVO;
+import cn.axzo.workflow.common.model.request.form.definition.StartFormSearchDTO;
-import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceVO;
+import cn.axzo.workflow.common.model.request.form.instance.FormDetailDTO;
-import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskDonePageItemVO;
+import cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO;
-import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskInstanceVO;
+import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO;
-import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskTodoPageItemVO;
+import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceLogVO;
-import javax.validation.constraints.NotEmpty;
+import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO;
+import cn.axzo.workflow.common.model.response.bpmn.process.NodesByModelVO;
+import cn.axzo.workflow.common.model.response.bpmn.process.doc.DocPendingVO;
+import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskButtonVo;
+import cn.axzo.workflow.common.model.response.form.definition.FormDefinitionVO;
+import cn.axzo.workflow.common.model.response.form.instance.FormInstanceVO;
+import cn.axzo.workflow.common.util.ThreadUtil;
+import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.Map;
+
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.ASYNC;
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC;
 
 /**
  * Workflow Engine Starter Core Service
@@ -93,16 +70,6 @@ import javax.validation.constraints.NotEmpty;
 @org.springframework.cloud.openfeign.FeignClient(name = "workflow-engine", url = "${axzo.service.workflow-engine:http://workflow-engine:8080}", configuration = WorkflowEngineStarterFeignConfiguration.class)
 public interface WorkflowCoreService {
 
-    /**
-     * 业务节点唤醒, 该节点废弃，请换成 {@link ProcessActivityApi#trigger(cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivityTriggerDTO)} 接口
-     * <p>
-     * 当模型中使用了“业务节点”，且设置了“不设置审批人”模式，则当业务监听到 PROCESS_ACTIVITY_START 事件时，可通过该接口推动流程继续运行
-     */
-    @Deprecated
-    @GetMapping("/api/process/activity/trigger")
-    @InvokeMode(SYNC)
-    Boolean trigger(@NotBlank(message = "触发 ID 不能为空") @RequestParam String triggerId);
-
     /**
      * 业务节点唤醒
      *
@@ -170,6 +137,9 @@ public interface WorkflowCoreService {
     @InvokeMode(SYNC)
     FormInstanceVO getFormInstance(@Validated @RequestBody FormDetailDTO dto);
 
+    @GetMapping("/api/process/instance/enum")
+    BpmnProcessInstanceResultEnum getEnum(@RequestParam String value);
+
     /**
      * 创建流程前的节点列表
      * 用于发起人自选
@@ -236,6 +206,17 @@ public interface WorkflowCoreService {
     @InvokeMode(ASYNC)
     BatchOperationResultVO batchAbortProcessInstance(@Validated @RequestBody List<BpmnProcessInstanceAbortDTO> dtos);
 
+    /**
+     * 抄送流程实例（未实现）
+     *
+     * @param dto
+     * @return
+     */
+    @Operation(summary = "抄送流程实例")
+    @PostMapping("/api/process/instance/carbon-copy")
+    @Deprecated
+    Boolean carbonCopyProcessInstance(@Validated @RequestBody BpmnProcessInstanceCarbonCopyDTO dto);
+
     /**
      * 获得流程实例
      *

workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java

@@ -1,74 +1,15 @@
 package cn.axzo.workflow.starter.api;
 
-import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
-import cn.axzo.workflow.common.util.ThreadUtil;
-import cn.axzo.workflow.client.annotation.WorkflowEngineFeignClient;
 import cn.axzo.workflow.common.annotation.InvokeMode;
 import cn.axzo.workflow.common.annotation.Manageable;
 import cn.axzo.workflow.common.model.dto.print.PrintFieldDTO;
-import cn.axzo.workflow.common.model.request.bpmn.print.PrintFieldQueryDTO;
-import cn.azxo.framework.common.model.CommonResponse;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.constraints.NotBlank;
-import java.util.List;
-import java.util.Map;
 import cn.axzo.workflow.common.model.request.admin.ProcessAdminCreateDTO;
 import cn.axzo.workflow.common.model.request.admin.ProcessAdminDeleteDTO;
 import cn.axzo.workflow.common.model.request.admin.ProcessAdminQueryDTO;
-import cn.axzo.workflow.common.model.response.admin.ProcessAdminVo;
-import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutCallbackDTO;
-import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutTriggerDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivitySetAssigneeDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivityTriggerDTO;
-import cn.axzo.workflow.common.model.request.form.definition.StartFormSearchDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormDetailDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormSearchDTO;
-import cn.axzo.workflow.common.model.response.form.FormVO;
-import cn.axzo.workflow.common.model.response.form.definition.FormDefinitionVO;
-import cn.axzo.workflow.common.model.response.form.instance.FormInstanceVO;
-import cn.axzo.workflow.common.model.request.es.InstanceSearchReqDTO;
-import cn.axzo.workflow.common.model.response.BpmPageResult;
-import cn.axzo.workflow.common.model.response.es.ProcessInstanceDocumentVO;
-import cn.axzo.workflow.common.model.dto.SignFileDTO;
-import cn.axzo.workflow.common.model.dto.SimpleDocDTO;
-import cn.axzo.workflow.common.model.request.bpmn.log.LogApproveSearchDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BeforeProcessInstanceCreateDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAdminPageReqVO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCarbonCopyDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCheckApproverDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCreateDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceLogQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceMyPageReqVO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.doc.ApproverReadStatusDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.doc.ChangeApproverReadStatusDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.doc.ProcessDocQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskButtonSearchDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO;
-import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceAdminPageItemVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceLogVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstancePageItemVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.ExtProcessLogVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.NodesByModelVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.doc.DocPendingVO;
-import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskButtonVo;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
-import cn.axzo.workflow.common.model.request.category.*;
-import cn.axzo.workflow.common.model.response.category.CategoryConfigItemVO;
-import cn.axzo.workflow.common.model.response.category.CategoryGroupVarItemVo;
-import cn.axzo.workflow.common.model.response.category.CategoryItemVO;
-import org.springframework.web.bind.annotation.*;
-import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.*;
 import cn.axzo.workflow.common.model.request.bpmn.BpmnButtonMetaInfo;
+import cn.axzo.workflow.common.model.request.bpmn.RestBpmnProcessVariable;
+import cn.axzo.workflow.common.model.request.bpmn.definition.BpmnProcessDefinitionUpdateDTO;
+import cn.axzo.workflow.common.model.request.bpmn.log.LogApproveSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelCreateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelUpdateDTO;
@@ -81,38 +22,70 @@ import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocStatusDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocTenantQueryDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocUpdateDTO;
+import cn.axzo.workflow.common.model.request.bpmn.print.PrintFieldQueryDTO;
 import cn.axzo.workflow.common.model.request.bpmn.print.PrintTemplateConfigQueryDTO;
 import cn.axzo.workflow.common.model.request.bpmn.print.PrintTemplateConfigUpsertDTO;
 import cn.axzo.workflow.common.model.request.bpmn.print.RestPrintTemplateConfigDTO;
+import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessDefinitionPageDTO;
+import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAdminPageReqVO;
+import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceMyPageReqVO;
+import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnNodeBackSystemOperateDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAttachmentDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryConfigCreateDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryConfigSearchDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryCreateDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryGroupVarSearchDto;
+import cn.axzo.workflow.common.model.request.category.CategoryGroupVarUpsertDto;
+import cn.axzo.workflow.common.model.request.category.CategorySearchDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryUpdateDTO;
+import cn.axzo.workflow.common.model.request.es.InstanceSearchReqDTO;
+import cn.axzo.workflow.common.model.request.form.instance.FormSearchDTO;
+import cn.axzo.workflow.common.model.response.BpmPageResult;
+import cn.axzo.workflow.common.model.response.admin.ProcessAdminVo;
 import cn.axzo.workflow.common.model.response.bpmn.model.BpmnModelDetailVO;
 import cn.axzo.workflow.common.model.response.bpmn.model.BpmnModelExtVO;
 import cn.axzo.workflow.common.model.response.bpmn.model.doc.DocBaseVO;
-import cn.axzo.workflow.common.model.response.print.PrintModelDTO;
+import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessDefinitionVO;
-import cn.axzo.workflow.common.model.request.bpmn.RestBpmnProcessVariable;
+import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceAdminPageItemVO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnNodeBackSystemOperateDTO;
+import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstancePageItemVO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnOptionalNodeDTO;
+import cn.axzo.workflow.common.model.response.bpmn.process.ExtProcessLogVO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnRobotTaskCompleteDTO;
+import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnRobotTaskCreateDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAttachmentDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditWithFormDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskBackAuditDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCommentDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCountersignDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskRemindDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskResetApproversDTO;
-import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskTransferDTO;
 import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceGroupVO;
 import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceVO;
 import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskDonePageItemVO;
 import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskInstanceVO;
 import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskTodoPageItemVO;
+import cn.axzo.workflow.common.model.response.category.CategoryConfigItemVO;
+import cn.axzo.workflow.common.model.response.category.CategoryGroupVarItemVo;
+import cn.axzo.workflow.common.model.response.category.CategoryItemVO;
+import cn.axzo.workflow.common.model.response.es.ProcessInstanceDocumentVO;
+import cn.axzo.workflow.common.model.response.form.FormVO;
+import cn.axzo.workflow.common.model.response.print.PrintModelDTO;
+import cn.axzo.workflow.common.util.ThreadUtil;
+import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import cn.axzo.workflow.common.model.request.bpmn.definition.BpmnProcessDefinitionUpdateDTO;
+import javax.validation.constraints.NotNull;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessDefinitionPageDTO;
+import java.util.List;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessDefinitionVO;
+import java.util.Map;
+
 import static cn.axzo.workflow.common.constant.BpmnConstants.NO_TENANT_ID;
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.ASYNC;
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC;
 
 /**
  * Workflow Engine Starter Management Service
@@ -202,6 +175,17 @@ public interface WorkflowManageService {
     @InvokeMode(SYNC)
     Integer batchDeleteProcessAdmin(@RequestBody List<Long> ids);
 
+    /**
+     * 业务节点唤醒, 该节点废弃，请换成 {@link ProcessActivityApi#trigger(cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivityTriggerDTO)} 接口
+     * <p>
+     * 当模型中使用了“业务节点”，且设置了“不设置审批人”模式，则当业务监听到 PROCESS_ACTIVITY_START 事件时，可通过该接口推动流程继续运行
+     */
+    @Deprecated
+    @GetMapping("/api/process/activity/trigger")
+    @Manageable
+    @InvokeMode(SYNC)
+    Boolean trigger(@NotBlank(message = "触发 ID 不能为空") @RequestParam String triggerId);
+
     @PostMapping("/api/form/admin/form/page")
     @InvokeMode(SYNC)
     @Manageable
@@ -221,18 +205,6 @@ public interface WorkflowManageService {
     @Manageable
     Boolean superCancelProcessInstance(@Validated @RequestBody SuperBpmnProcessInstanceCancelDTO dto);
 
-    /**
-     * 抄送流程实例（未实现）
-     *
-     * @param dto
-     * @return
-     */
-    @Operation(summary = "抄送流程实例")
-    @PostMapping("/api/process/instance/carbon-copy")
-    @Deprecated
-    @Manageable
-    Boolean carbonCopyProcessInstance(@Validated @RequestBody BpmnProcessInstanceCarbonCopyDTO dto);
-
     /**
      * 查询所有的审批流
      *