fix #80

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/domain/UrgeInterval.java

@@ -21,6 +21,6 @@ public class UrgeInterval {
     public UrgeInterval(FlowRecord flowRecord) {
         this.processId = flowRecord.getProcessId();
         this.recordId = flowRecord.getId();
-        this.createTime = flowRecord.getCreateTime();
+        this.createTime = System.currentTimeMillis();
     }
 }

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

@@ -114,7 +114,7 @@ public static FlowStateException nodeNotSupportRevoke() {
      *
      * @return exception
      */
-    public static FlowStateException recordNotSupportUrge() {
-        return new FlowStateException("record.notSupportUrge", "record not support urge");
+    public static FlowStateException recordLimitUrgeError() {
+        return new FlowStateException("record.urge.limit", "record urge limit error");
     }
 }

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

@@ -210,7 +210,7 @@ public class FlowRecord {
     private long timeoutTime;
     /**
      * 是否可合并
-     * {@link FlowRecord#getMergeKey()}
+     * {@link FlowRecord#getTodoKey()}
      */
     private boolean mergeable;
     /**
@@ -247,7 +247,7 @@ public class FlowRecord {
      * 数据合并的依据,当开启时值为固定值，否则为随机数据
      * 相同的 {@link FlowRecord#currentOperatorId} {@link FlowRecord#workRuntimeId} {@link FlowRecord#nodeId}字段的数据合并到一条记录上。
      */
-    public String getMergeKey() {
+    public String getTodoKey() {
         if (mergeable) {
             return String.format("%s-%s-%s", currentOperatorId, workRuntimeId, nodeId);
         } else {

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

@@ -80,7 +80,7 @@ public class FlowTodoRecord {
 
     /**
      * 合并记录id,当存在合并记录数据时待办记录数量不会增加，内容会更新至最新的待办数据信息。
-     * {@link FlowRecord#getMergeKey()}
+     * {@link FlowRecord#getTodoKey()}
      */
     private String mergeKey;
 
@@ -126,7 +126,7 @@ public void update(FlowRecord flowRecord) {
         this.createTime = flowRecord.getCreateTime();
         this.createOperatorId = flowRecord.getCreateOperatorId();
         this.createOperatorName = flowRecord.getCreateOperatorName();
-        this.mergeKey = flowRecord.getMergeKey();
+        this.mergeKey = flowRecord.getTodoKey();
         this.mergeable = flowRecord.isMergeable();
         this.recordId = flowRecord.getId();
         this.timeoutTime = flowRecord.getTimeoutTime();

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

@@ -8,7 +8,7 @@ public interface FlowTodoRecordRepository {
 
     void saveAll(List<FlowTodoRecord> margeRecords);
 
-    FlowTodoRecord getByMergeKey(String key);
+    FlowTodoRecord getByTodoKey(String key);
 
     void delete(FlowTodoRecord margeRecord);
 

flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowRecordSaveService.java

@@ -44,7 +44,7 @@ private void saveTodoMargeRecords() {
         List<FlowTodoRecord> flowTodoRecords = new ArrayList<>();
         for (FlowRecord flowRecord : flowRecords) {
             if (flowRecord.isTodo()) {
-                FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
+                FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
                 if (todoMargeRecord == null) {
                     todoMargeRecord = new FlowTodoRecord(flowRecord);
                 } else {
@@ -83,7 +83,7 @@ private void removeTodoMergeRecords() {
         for (FlowRecord flowRecord : flowRecords) {
             if (flowRecord.isDone()) {
                 if (flowRecord.isMergeable()) {
-                    FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
+                    FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
                     if (todoMargeRecord != null) {
                         List<FlowTodoMerge> margeRelations = flowTodoMergeRepository.findByTodoId(todoMargeRecord.getId());
                         if (margeRelations != null && !margeRelations.isEmpty()) {
@@ -101,7 +101,14 @@ private void removeTodoMergeRecords() {
                         }
                     }
                 } else {
-                    FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
+                    FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
+                    if (flowTodoRecord != null) {
+                        flowTodoRecordRepository.delete(flowTodoRecord);
+                    }
+                }
+            }else {
+                if(flowRecord.isRevoked()){
+                    FlowTodoRecord flowTodoRecord = flowTodoRecordRepository.getByTodoKey(flowRecord.getTodoKey());
                     if (flowTodoRecord != null) {
                         flowTodoRecordRepository.delete(flowTodoRecord);
                     }

flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowRecordService.java

@@ -48,7 +48,7 @@ public void saveFlowRecord(FlowRecord flowRecord) {
      * @return 流程合并记录
      */
     public List<FlowRecord> getMergeRecord(String mergeKey){
-        FlowTodoRecord todoRecord = flowTodoRecordRepository.getByMergeKey(mergeKey);
+        FlowTodoRecord todoRecord = flowTodoRecordRepository.getByTodoKey(mergeKey);
         List<FlowTodoMerge> todoMerges = flowTodoMergeRepository.findByTodoId(todoRecord.getId());
         return this.findFlowRecordByIds(todoMerges.stream().map(FlowTodoMerge::getRecordId).toList());
     }

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDetailService.java

@@ -87,7 +87,7 @@ private void loadWorkflow(){
         private void loadTodoFlowRecords(){
             if(this.flowRecord!=null){
                 if(this.flowRecord.isMergeable() && this.flowRecord.isTodo()){
-                    List<FlowRecord> margeRecords = flowRecordService.getMergeRecord(flowRecord.getMergeKey());
+                    List<FlowRecord> margeRecords = flowRecordService.getMergeRecord(flowRecord.getTodoKey());
                     this.flowContent.pushRecords(this.flowRecord, margeRecords);
                 }else {
                     this.flowContent.pushRecords(this.flowRecord,List.of(this.flowRecord));

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowUrgeService.java

@@ -71,7 +71,7 @@ public void urge() {
             if (strategyManager.isEnableUrge()) {
                 UrgeStrategy urgeStrategy = strategyManager.getStrategy(UrgeStrategy.class);
                 if (!urgeStrategy.hasUrge(urgeInterval)) {
-                    throw FlowStateException.recordNotSupportUrge();
+                    throw FlowStateException.recordLimitUrgeError();
                 }
             }
         }

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/workflow/UrgeStrategy.java

@@ -56,7 +56,7 @@ public static UrgeStrategy fromMap(Map<String, Object> map) {
     }
 
     /**
-     * 是否有催办
+     * 是否可催办
      */
     public boolean hasUrge(UrgeInterval urgeInterval) {
         long interval = this.interval * 1000L;