update 代码开发

workflow-engine-server/pom.xml

@@ -7,12 +7,15 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <flowable.version>6.7.2</flowable.version>
+
 
     <artifactId>workflow-engine-server</artifactId>
     <packaging>jar</packaging>
 
     <name>workflow-engine-server</name>
+    <properties>
+        <flowable.version>6.7.2</flowable.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -70,5 +73,10 @@
             <version>${flowable.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-engine</artifactId>
+            <version>6.7.2</version>
+        </dependency>
     </dependencies>
 </project>

workflow-engine-server/src/main/java/cn/axzo/server/listener/BpmTaskEventListener.java

@@ -0,0 +1,67 @@
+package cn.axzo.server.listener;
+
+import cn.axzo.server.service.BpmTaskService;
+import com.google.common.collect.ImmutableSet;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
+import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
+import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener;
+import org.flowable.engine.delegate.event.FlowableActivityCancelledEvent;
+import org.flowable.engine.history.HistoricActivityInstance;
+import org.flowable.task.api.Task;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Set;
+
+@Component
+@Slf4j
+public class BpmTaskEventListener extends AbstractFlowableEngineEventListener {
+
+    @Resource
+    @Lazy // 解决循环依赖
+    private BpmTaskService taskService;
+
+
+    public static final Set<FlowableEngineEventType> TASK_EVENTS = ImmutableSet.<FlowableEngineEventType>builder()
+            .add(FlowableEngineEventType.TASK_CREATED)
+            .add(FlowableEngineEventType.TASK_ASSIGNED)
+            .add(FlowableEngineEventType.TASK_COMPLETED)
+            .add(FlowableEngineEventType.ACTIVITY_CANCELLED)
+            .build();
+
+    public BpmTaskEventListener() {
+        super(TASK_EVENTS);
+    }
+
+    @Override
+    protected void taskCreated(FlowableEngineEntityEvent event) {
+
+    }
+
+    @Override
+    protected void taskCompleted(FlowableEngineEntityEvent event) {
+
+    }
+
+    @Override
+    protected void taskAssigned(FlowableEngineEntityEvent event) {
+
+    }
+
+    @Override
+    protected void activityCancelled(FlowableActivityCancelledEvent event) {
+        HistoricActivityInstance activity = null;
+        if (activity == null) {
+            log.error("[activityCancelled][使用 executionId({}) 查找不到对应的活动实例]",
+                    event.getExecutionId());
+            return;
+        }
+        if (StringUtils.isEmpty(activity.getTaskId())) {
+            return;
+        }
+
+    }
+}

workflow-engine-server/src/main/java/cn/axzo/server/repository/bpmModel/BpmJsonNode.java

@@ -1,15 +1,17 @@
 package cn.axzo.server.repository.bpmModel;
 
 import java.util.List;
+import java.util.Map;
 
 public class BpmJsonNode {
 
     private String id;
     private String parentId;
-    private String type;
+    private String type; // task, branch,
     private String name;
     private String desc;
+//    private Map<> properties; //ext : Object; 会签/或签
     private BpmJsonNode children;
-    private List<BpmJsonNode> branchs;
+    private List<BpmJsonNode> branches;
 
 }

workflow-engine-server/src/main/java/cn/axzo/server/service/BpmTaskService.java

@@ -1,5 +1,6 @@
 package cn.axzo.server.service;
 
+import cn.axzo.server.service.dto.request.task.BpmTaskAuditDTO;
 import cn.axzo.server.service.dto.request.task.BpmTaskTodoPageDTO;
 import cn.axzo.server.service.dto.response.PageResult;
 import cn.axzo.server.service.dto.response.model.BpmModelPageItemVO;
@@ -15,4 +16,10 @@ public interface BpmTaskService {
     PageResult<BpmTaskDonePageItemVO> getDoneTaskPage(BpmTaskTodoPageDTO taskDonePageD);
 
     PageResult<BpmTaskDonePageItemVO> getOwnTaskPage(BpmTaskTodoPageDTO taskDonePageD);
+
+    Boolean approveTask(BpmTaskAuditDTO taskAuditDTO);
+
+    Boolean rejectTask(BpmTaskAuditDTO taskAuditDTO);
+
+    Boolean withdrawTask(BpmTaskAuditDTO taskAuditDTO);
 }

workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/task/BpmTaskAuditDTO.java

@@ -0,0 +1,27 @@
+package cn.axzo.server.service.dto.request.task;
+
+import org.flowable.engine.task.Comment;
+
+public class BpmTaskAuditDTO {
+
+    private String taskId;
+    /**
+     * 审核人Id
+     * */
+    private String assigneeId;
+
+    /**
+     * 审核人名称
+     * */
+    private String assigneeName;
+
+    /**
+     * 租户Id
+     * */
+    private String tenantId;
+
+    /**
+     * 评论信息
+     * */
+    private Comment comment;
+}

workflow-engine-server/src/main/java/cn/axzo/server/service/impl/BpmTaskServiceImpl.java

@@ -0,0 +1,40 @@
+package cn.axzo.server.service.impl;
+
+import cn.axzo.server.service.BpmTaskService;
+import cn.axzo.server.service.dto.request.task.BpmTaskAuditDTO;
+import cn.axzo.server.service.dto.request.task.BpmTaskTodoPageDTO;
+import cn.axzo.server.service.dto.response.PageResult;
+import cn.axzo.server.service.dto.response.task.BpmTaskDonePageItemVO;
+import cn.axzo.server.service.dto.response.task.BpmTaskTodoPageItemVO;
+
+public class BpmTaskServiceImpl implements BpmTaskService {
+    @Override
+    public PageResult<BpmTaskTodoPageItemVO> getTodoTaskPage(BpmTaskTodoPageDTO taskTodoPageDTO) {
+        return null;
+    }
+
+    @Override
+    public PageResult<BpmTaskDonePageItemVO> getDoneTaskPage(BpmTaskTodoPageDTO taskDonePageD) {
+        return null;
+    }
+
+    @Override
+    public PageResult<BpmTaskDonePageItemVO> getOwnTaskPage(BpmTaskTodoPageDTO taskDonePageD) {
+        return null;
+    }
+
+    @Override
+    public Boolean approveTask(BpmTaskAuditDTO taskAuditDTO) {
+        return null;
+    }
+
+    @Override
+    public Boolean rejectTask(BpmTaskAuditDTO taskAuditDTO) {
+        return null;
+    }
+
+    @Override
+    public Boolean withdrawTask(BpmTaskAuditDTO taskAuditDTO) {
+        return null;
+    }
+}

workflow-engine-server/src/main/java/cn/axzo/server/service/model/BpmModelServiceImpl.java

@@ -7,10 +7,18 @@ import cn.axzo.server.service.dto.request.model.BpmModelUpdateDTO;
 import cn.axzo.server.service.dto.response.PageResult;
 import cn.axzo.server.service.dto.response.model.BpmModelDetailVO;
 import cn.axzo.server.service.dto.response.model.BpmModelPageItemVO;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.repository.Model;
+import org.springframework.context.annotation.Lazy;
+
+import javax.annotation.Resource;
 
 public class BpmModelServiceImpl implements BpmModelService {
 
-    
+    @Resource
+    @Lazy
+    private RepositoryService repositoryService;
+
     @Override
     public PageResult<BpmModelPageItemVO> getModelPage(BpmModelPageDTO modelPageDTO) {
         return null;
@@ -19,6 +27,7 @@ public class BpmModelServiceImpl implements BpmModelService {
     @Override
     public Boolean createBpmModel(BpmModelCreateDTO createDTO) {
 
+        Model model = repositoryService.newModel();
 
 
         return null;