Merge pull request #73 from codingapi/dev

Dev

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/context/RepositoryHolderContext.java

@@ -1,13 +1,14 @@
 package com.codingapi.flow.context;
 
-import com.codingapi.flow.context.service.FlowRecordSaveService;
 import com.codingapi.flow.domain.DelayTask;
 import com.codingapi.flow.exception.FlowStateException;
 import com.codingapi.flow.gateway.FlowOperatorGateway;
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.repository.*;
+import com.codingapi.flow.service.FlowRecordService;
 import com.codingapi.flow.service.FlowService;
+import com.codingapi.flow.service.WorkflowService;
 import com.codingapi.flow.service.impl.FlowActionService;
 import com.codingapi.flow.service.impl.FlowDelayTriggerService;
 import com.codingapi.flow.session.FlowSession;
@@ -27,15 +28,9 @@ private RepositoryHolderContext() {
     }
 
     @Getter
-    private WorkflowRepository workflowRepository;
+    private WorkflowService workflowService;
     @Getter
-    private WorkflowBackupRepository workflowBackupRepository;
-    @Getter
-    private FlowRecordRepository flowRecordRepository;
-    @Getter
-    private FlowTodoRecordRepository flowTodoRecordRepository;
-    @Getter
-    private FlowTodoMergeRepository flowTodoMergeRepository;
+    private FlowRecordService flowRecordService;
     @Getter
     private FlowOperatorGateway flowOperatorGateway;
     @Getter
@@ -51,12 +46,9 @@ private RepositoryHolderContext() {
     public boolean isRegistered() {
         return parallelBranchRepository != null
                 && delayTaskRepository != null
-                && workflowBackupRepository != null
-                && flowRecordRepository != null
-                && flowTodoRecordRepository != null
-                && flowTodoMergeRepository != null
+                && workflowService != null
+                && flowRecordService != null
                 && flowOperatorGateway != null
-                && workflowRepository != null
                 && urgeIntervalRepository != null;
     }
 
@@ -67,20 +59,14 @@ public void verify() {
         }
     }
 
-    public void register(WorkflowRepository workflowRepository,
-                         WorkflowBackupRepository workflowBackupRepository,
-                         FlowRecordRepository flowRecordRepository,
-                         FlowTodoRecordRepository flowTodoRecordRepository,
-                         FlowTodoMergeRepository flowTodoMergeRepository,
+    public void register(WorkflowService workflowService,
+                         FlowRecordService flowRecordService,
                          FlowOperatorGateway flowOperatorGateway,
                          ParallelBranchRepository parallelBranchRepository,
                          DelayTaskRepository delayTaskRepository,
                          UrgeIntervalRepository urgeIntervalRepository) {
-        this.workflowRepository = workflowRepository;
-        this.workflowBackupRepository = workflowBackupRepository;
-        this.flowRecordRepository = flowRecordRepository;
-        this.flowTodoRecordRepository = flowTodoRecordRepository;
-        this.flowTodoMergeRepository = flowTodoMergeRepository;
+        this.workflowService = workflowService;
+        this.flowRecordService = flowRecordService;
         this.flowOperatorGateway = flowOperatorGateway;
         this.parallelBranchRepository = parallelBranchRepository;
         this.delayTaskRepository = delayTaskRepository;
@@ -98,8 +84,8 @@ public FlowDelayTriggerService createDelayTriggerService(DelayTask task) {
         this.verify();
         return new FlowDelayTriggerService(task,
                 flowOperatorGateway,
-                flowRecordRepository,
-                workflowBackupRepository);
+                flowRecordService,
+                workflowService);
     }
 
 
@@ -122,19 +108,17 @@ public FlowActionService createFlowActionService(FlowSession flowSession) {
      */
     public FlowService createFlowService() {
         this.verify();
-        return new FlowService(workflowRepository,
+        return new FlowService(
+                workflowService,
                 flowOperatorGateway,
-                flowRecordRepository,
-                flowTodoRecordRepository,
-                flowTodoMergeRepository,
-                workflowBackupRepository,
+                flowRecordService,
                 parallelBranchRepository,
                 delayTaskRepository,
                 urgeIntervalRepository);
     }
 
     public FlowRecord getRecordById(long id) {
-        return flowRecordRepository.get(id);
+        return flowRecordService.getFlowRecord(id);
     }
 
     public List<IFlowOperator> findOperatorByIds(List<Long> ids) {
@@ -157,25 +141,23 @@ public void deleteDelayTask(DelayTask delayTask) {
 
 
     public void saveRecords(List<FlowRecord> flowRecords) {
-        FlowRecordSaveService flowRecordSaveService = new FlowRecordSaveService(flowRecords);
-        flowRecordSaveService.saveAll();
+        flowRecordService.saveFlowRecords(flowRecords);
     }
 
     public void saveRecord(FlowRecord flowRecord) {
-        FlowRecordSaveService flowRecordSaveService = new FlowRecordSaveService(flowRecord);
-        flowRecordSaveService.saveAll();
+        flowRecordService.saveFlowRecord(flowRecord);
     }
 
     public List<FlowRecord> findCurrentNodeRecords(long fromId, String nodeId) {
-        return flowRecordRepository.findCurrentNodeRecords(fromId, nodeId);
+        return flowRecordService.findFlowRecordCurrentNodeRecords(fromId, nodeId);
     }
 
     public List<FlowRecord> findProcessRecords(String processId) {
-        return flowRecordRepository.findProcessRecords(processId);
+        return flowRecordService.findFlowRecordByProcessId(processId);
     }
 
     public List<FlowRecord> findAfterRecords(String processId, long currentId) {
-        return flowRecordRepository.findAfterRecords(processId, currentId);
+        return flowRecordService.findFlowRecordAfterRecords(processId, currentId);
     }
 
     public int getParallelBranchTriggerCount(String parallelId) {

flow-engine-framework/src/main/java/com/codingapi/flow/exception/FlowExecutionException.java

@@ -54,6 +54,16 @@ public static FlowExecutionException routerNodeNotFound(String nodeId) {
                 String.format("Router node not found: %s", nodeId));
     }
 
+    /**
+     * remove version error
+     *
+     * @return exception
+     */
+    public static FlowExecutionException removeWorkflowError() {
+        return new FlowExecutionException("execution.workflowVersion.removeError",
+                "current version don't remove.");
+    }
+
     /**
      * Create record size error
      *

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java

@@ -47,7 +47,7 @@ public class FlowRecord {
     /**
      * 工作id
      */
-    private long workBackupId;
+    private long workRuntimeId;
     /**
      * 流程编码
      */
@@ -245,11 +245,11 @@ public class FlowRecord {
 
     /**
      * 数据合并的依据,当开启时值为固定值，否则为随机数据
-     * 相同的 {@link FlowRecord#currentOperatorId} {@link FlowRecord#workBackupId} {@link FlowRecord#nodeId}字段的数据合并到一条记录上。
+     * 相同的 {@link FlowRecord#currentOperatorId} {@link FlowRecord#workRuntimeId} {@link FlowRecord#nodeId}字段的数据合并到一条记录上。
      */
     public String getMergeKey() {
         if (mergeable) {
-            return String.format("%s-%s-%s", currentOperatorId, workBackupId, nodeId);
+            return String.format("%s-%s-%s", currentOperatorId, workRuntimeId, nodeId);
         } else {
             return String.valueOf(id);
         }
@@ -263,7 +263,7 @@ public FlowRecord(FlowSession flowSession, int nodeOrder) {
         // 获取转交之后的审批人
         IFlowOperator currentOperator = flowSession.loadFinalForwardOperator(sourceOperator);
         this.workCode = flowSession.getWorkCode();
-        this.workBackupId = flowSession.getBackupId();
+        this.workRuntimeId = flowSession.getBackupId();
         this.nodeId = flowSession.getCurrentNodeId();
         this.nodeType = flowSession.getCurrentNodeType();
         this.nodeName = flowSession.getCurrentNodeName();
@@ -591,7 +591,7 @@ public FlowSession createFlowSession( Workflow workflow,
                 formData,
                 this,
                 currentRecords,
-                this.workBackupId,
+                this.workRuntimeId,
                 advice
         );
     }

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoRecord.java

@@ -114,7 +114,7 @@ public FlowTodoRecord(FlowRecord flowRecord) {
 
     public void update(FlowRecord flowRecord) {
         this.processId = flowRecord.getProcessId();
-        this.workBackupId = flowRecord.getWorkBackupId();
+        this.workBackupId = flowRecord.getWorkRuntimeId();
         this.workCode = flowRecord.getWorkCode();
         this.nodeId = flowRecord.getNodeId();
         this.nodeType = flowRecord.getNodeType();

flow-engine-framework/src/main/java/com/codingapi/flow/repository/FlowTodoMergeRepository.java

@@ -8,7 +8,7 @@ public interface FlowTodoMergeRepository {
 
     void saveAll(List<FlowTodoMerge> list);
 
-    void remove(FlowTodoMerge todoMerge);
+    void delete(FlowTodoMerge todoMerge);
 
     List<FlowTodoMerge> findByTodoId(long todoId);
 

flow-engine-framework/src/main/java/com/codingapi/flow/repository/FlowTodoRecordRepository.java

@@ -10,7 +10,7 @@ public interface FlowTodoRecordRepository {
 
     FlowTodoRecord getByMergeKey(String key);
 
-    void remove(FlowTodoRecord margeRecord);
+    void delete(FlowTodoRecord margeRecord);
 
     void save(FlowTodoRecord margeRecord);
 

flow-engine-framework/src/main/java/com/codingapi/flow/repository/WorkflowBackupRepository.java

@@ -11,6 +11,6 @@ public interface WorkflowRepository {
 
     Workflow get(String id);
 
-    void delete(Workflow workflow);
+    void delete(String id);
 
 }

flow-engine-framework/src/main/java/com/codingapi/flow/repository/WorkflowRepository.java

@@ -0,0 +1,18 @@
+package com.codingapi.flow.repository;
+
+import com.codingapi.flow.workflow.runtime.WorkflowRuntime;
+
+/**
+ * 运行时流程仓库
+ */
+public interface WorkflowRuntimeRepository {
+
+    void save(WorkflowRuntime workflowRuntime);
+
+    WorkflowRuntime get(long id);
+
+    WorkflowRuntime getByWorkId(String workId, long workVersion);
+
+    void delete(WorkflowRuntime backup);
+
+}

flow-engine-framework/src/main/java/com/codingapi/flow/repository/WorkflowRuntimeRepository.java

@@ -0,0 +1,24 @@
+package com.codingapi.flow.repository;
+
+import com.codingapi.flow.workflow.WorkflowVersion;
+
+import java.util.List;
+
+/**
+ * 工作流版本仓库
+ */
+public interface WorkflowVersionRepository {
+
+    WorkflowVersion get(long id);
+
+    void delete(String workId);
+
+    List<WorkflowVersion> findVersion(String workId);
+
+    void saveAll(List<WorkflowVersion> versionList);
+
+    void save(WorkflowVersion workflowVersion);
+
+    void delete(long id);
+
+}