fix node record

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/EndNode.java

@@ -42,9 +42,7 @@ public List<FlowRecord> generateCurrentRecords(FlowSession session) {
 
     @Override
     public void fillNewRecord(FlowSession session, FlowRecord flowRecord) {
-        flowRecord.setTitle("over");
-        flowRecord.setCurrentOperatorId(-1);
-
+        flowRecord.over();
         IFlowAction currentAction = session.getCurrentAction();
         // 标记当前流程结束
         FlowRecord latestRecord = session.getCurrentRecord();

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

@@ -59,6 +59,12 @@ public class FlowRecord {
      * 节点类型
      */
     private String nodeType;
+
+    /**
+     * 节点名称
+     */
+    private String nodeName;
+
     /**
      * 来源id
      */
@@ -254,6 +260,7 @@ public FlowRecord(FlowSession flowSession, int nodeOrder) {
         this.workBackupId = flowSession.getBackupId();
         this.nodeId = flowSession.getCurrentNodeId();
         this.nodeType = flowSession.getCurrentNodeType();
+        this.nodeName = flowSession.getCurrentNodeName();
         this.formData = flowSession.getFormData().toMapData();
         this.nodeOrder = nodeOrder;
         this.processId = RandomUtils.generateStringId();
@@ -580,4 +587,21 @@ public FlowSession createFlowSession( Workflow workflow,
                 advice
         );
     }
+
+    /**
+     * 设置为已读
+     */
+    public void read() {
+        this.readTime = System.currentTimeMillis();
+    }
+
+    /**
+     * 流程结束
+     */
+    public void over() {
+        this.title = "-";
+        this.readTime = System.currentTimeMillis();
+        this.currentOperatorId = -1;
+        this.recordState = SATE_RECORD_DONE;
+    }
 }

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

@@ -40,6 +40,11 @@ public class FlowTodoRecord {
      */
     private String nodeType;
 
+    /**
+     * 节点名称
+     */
+    private String nodeName;
+
     /**
      * 消息标题
      */
@@ -113,6 +118,7 @@ public void update(FlowRecord flowRecord) {
         this.workCode = flowRecord.getWorkCode();
         this.nodeId = flowRecord.getNodeId();
         this.nodeType = flowRecord.getNodeType();
+        this.nodeName = flowRecord.getNodeName();
         this.title = flowRecord.getTitle();
         this.readTime = flowRecord.getReadTime();
         this.currentOperatorId = flowRecord.getCurrentOperatorId();

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

@@ -51,6 +51,12 @@ public FlowContent detail() {
                 throw FlowNotFoundException.workflow(flowRecord.getWorkBackupId() + " not found");
             }
             Workflow workflow = workflowBackup.toWorkflow();
+
+            if(!flowRecord.isReadable()){
+                flowRecord.read();
+                RepositoryHolderContext.getInstance().saveRecord(flowRecord);
+            }
+
             return new FlowContentFactory(workflow, flowRecord,currentOperator).create();
         }
     }

flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java

@@ -177,6 +177,10 @@ public String getCurrentNodeType() {
         return currentNode.getType();
     }
 
+    public String getCurrentNodeName() {
+        return currentNode.getName();
+    }
+
     /**
      * 获取下一节点列表
      *

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/FlowRecordConvertor.java

@@ -17,6 +17,7 @@ public static FlowRecord convert(FlowRecordEntity entity) {
                 entity.getWorkCode(),
                 entity.getNodeId(),
                 entity.getNodeType(),
+                entity.getNodeName(),
                 entity.getFromId(),
                 entity.getParentId(),
                 mapConvertor.convertToEntityAttribute(entity.getFormData()),
@@ -67,6 +68,7 @@ public static FlowRecordEntity convert(FlowRecord record) {
         entity.setWorkCode(record.getWorkCode());
         entity.setNodeId(record.getNodeId());
         entity.setNodeType(record.getNodeType());
+        entity.setNodeName(record.getNodeName());
         entity.setFromId(record.getFromId());
         entity.setParentId(record.getParentId());
         entity.setFormData(mapConvertor.convertToDatabaseColumn(record.getFormData()));

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/FlowTodoRecordConvertor.java

@@ -16,6 +16,7 @@ public static FlowTodoRecord convert(FlowTodoRecordEntity entity){
                 entity.getWorkCode(),
                 entity.getNodeId(),
                 entity.getNodeType(),
+                entity.getNodeName(),
                 entity.getTitle(),
                 entity.getReadTime(),
                 entity.getCurrentOperatorId(),
@@ -46,6 +47,7 @@ public static FlowTodoRecordEntity convert(FlowTodoRecord record){
         entity.setWorkCode(record.getWorkCode());
         entity.setNodeId(record.getNodeId());
         entity.setNodeType(record.getNodeType());
+        entity.setNodeName(record.getNodeName());
         entity.setTitle(record.getTitle());
         entity.setReadTime(record.getReadTime());
         entity.setCurrentOperatorId(record.getCurrentOperatorId());

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/FlowRecordEntity.java

@@ -29,6 +29,10 @@ public class FlowRecordEntity {
      * 节点类型
      */
     private String nodeType;
+    /**
+     * 节点名称
+     */
+    private String nodeName;
     /**
      * 来源id
      */

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/FlowTodoRecordEntity.java

@@ -38,6 +38,10 @@ public class FlowTodoRecordEntity {
      * 节点类型
      */
     private String nodeType;
+    /**
+     * 节点名称
+     */
+    private String nodeName;
 
     /**
      * 消息标题

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/pojo/FlowRecordContent.java

@@ -31,6 +31,11 @@ public class FlowRecordContent {
      */
     private String nodeType;
 
+    /**
+     * 节点名称
+     */
+    private String nodeName;
+
     /**
      * 消息标题
      */
@@ -112,6 +117,7 @@ public static FlowRecordContent convert(FlowTodoRecordEntity todoRecord){
         content.setWorkCode(todoRecord.getWorkCode());
         content.setNodeId(todoRecord.getNodeId());
         content.setNodeType(todoRecord.getNodeType());
+        content.setNodeName(todoRecord.getNodeName());
         content.setTitle(todoRecord.getTitle());
         content.setReadTime(todoRecord.getReadTime());
         content.setCurrentOperatorId(todoRecord.getCurrentOperatorId());
@@ -138,6 +144,7 @@ public static FlowRecordContent convert(FlowRecordEntity record){
         content.setWorkCode(record.getWorkCode());
         content.setNodeId(record.getNodeId());
         content.setNodeType(record.getNodeType());
+        content.setNodeName(record.getNodeName());
         content.setTitle(record.getTitle());
         content.setReadTime(record.getReadTime());
         content.setCurrentOperatorId(record.getCurrentOperatorId());