wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove - 移除一些无用的代码

Browse Source
This commit is contained in:
wangli 2023-11-29 15:51:41 +08:00
parent ed5a4e99e6
commit 3744938a29
2 changed files with 117 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -592,20 +592,6 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
}
resultList.add(node);
});
// 处理发起节点
/*List<FlowElement> startNodes =
flowElements.stream().filter(StartEvent.class::isInstance).collect(Collectors.toList());
startNodes.forEach(i -> {
StartEvent startEvent = (StartEvent) i;
ProcessNodeDetailVO node = new ProcessNodeDetailVO()
.setId(startEvent.getId())
.setName(startEvent.getName())
.setFormKey(startEvent.getFormKey());
// FIXME by wangli
// .setNodeMode(BpmnFlowNodeMode.STARTNODE);
resultList.add(0, node);
});*/
return resultList;
}
}

233
workflow-engine-server/src/main/resources/test.json
View File

@ -2,6 +2,7 @@
"name": "新模型",
"description": "极引非东活已运王点越组油门展总想立。年深江亲联热制者条济它部即月。号线信平和者京两马何标这。",
"category": "customCategory",
// "tenantId": "296",
"jsonModel": {
"noticeConf": {
"pendingMessageId": "41",
@ -14,7 +15,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -22,49 +23,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"carbonCopy": [
@ -72,7 +73,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -80,49 +81,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"history": [
@ -130,7 +131,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -138,49 +139,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"current": [
@ -188,7 +189,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -196,49 +197,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
]
},
@ -368,8 +369,8 @@
"approverScope": "entWorkspace",
"approverSpecify": "position",
"specifyValue": [
"{\"name\":\"岗位 1\", \"value\": \"job1\"}",
"{\"name\":\"岗位 2\", \"value\": \"job2\"}"
"job1",
"job2"
],
"isMultiTask": "true",
"multiMode": "AND",
@ -381,7 +382,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -389,49 +390,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"carbonCopy": [
@ -439,7 +440,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -447,49 +448,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"history": [
@ -497,7 +498,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -505,49 +506,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"current": [
@ -555,7 +556,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -563,49 +564,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
]
}
@ -674,8 +675,8 @@
"approverScope": "projectWorkspace",
"approverSpecify": "identity",
"specifyValue": [
"{\"name\": \"工人\", \"value\": \"worker\"}",
"{\"name\": \"班组长\", \"value\": \"team_worker\"}"
"worker",
"team_worker"
],
"isMultiTask": "true",
"multiMode": "AND",
@ -691,8 +692,8 @@
"approverScope": "projectWorkspace",
"approverSpecify": "position",
"specifyValue": [
"{\"name\":\"岗位 1\", \"value\": \"job1\"}",
"{\"name\":\"岗位 2\", \"value\": \"job2\"}"
"job1",
"job2"
],
"isMultiTask": "true",
"multiMode": "AND",
@ -729,8 +730,8 @@
"approverScope": "projectWorkspace",
"approverSpecify": "position",
"specifyValue": [
"{\"name\":\"岗位 1\", \"value\": \"job1\"}",
"{\"name\":\"岗位 2\", \"value\": \"job2\"}"
"job1",
"job2"
],
"isMultiTask": "true",
"multiMode": "AND",
@ -742,7 +743,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -750,49 +751,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"carbonCopy": [
@ -800,7 +801,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -808,49 +809,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"history": [
@ -858,7 +859,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -866,49 +867,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
],
"current": [
@ -916,7 +917,7 @@
"order": 1,
"btnKey": "BPMN_APPROVE",
"checked": true,
"disabled": false,
"disabled": true,
"btnName": "同意"
},
{
@ -924,49 +925,49 @@
"btnKey": "BPMN_REJECT",
"btnName": "拒绝",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 3,
"btnKey": "BPMN_REVOCATION",
"btnName": "撤回",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 4,
"btnKey": "BPMN_FORWARD",
"btnKey": "BPMN_TRANSFER",
"btnName": "转交",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 5,
"btnKey": "BPMN_COUNTERSIGN",
"btnName": "加签",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 6,
"btnKey": "BPMN_COMMENT",
"btnName": "评论",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 7,
"btnKey": "BPMN_ROLLBACK",
"btnName": "回退",
"checked": true,
"disabled": false
"disabled": true
},
{
"order": 8,
"btnKey": "BPMN_COPY",
"btnName": "抄送",
"checked": true,
"disabled": false
"disabled": true
}
]
}