Skip to content

Commit bf84975

Browse files
cjbicjbi
committed
refactor(flow):重构ElementInstance字段命名
- 将modelKey字段重命名为key - 将modelName字段重命名为name- 更新所有相关的getter/setter方法- 修改toString方法中的字段引用 - 调整SyncSingleCallActivityExecutor中的字段设置逻辑- 更新RuntimeProcessor中的节点实例构建逻辑 -修正FlowResource接口中的Schema属性定义- 更新测试类中的断言和变量命名
1 parent a047a7a commit bf84975

File tree

7 files changed

+43
-43
lines changed

7 files changed

+43
-43
lines changed

‎src/main/java/tech/wetech/flexmodel/domain/model/flow/dto/bo/ElementInstance.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
public class ElementInstance {
77

8-
private String modelKey;
9-
private String modelName;
8+
private String key;
9+
private String name;
1010
private Map<String, Object> properties;
1111
private int status;
1212
private String nodeInstanceId;
@@ -18,32 +18,32 @@ public ElementInstance() {
1818
super();
1919
}
2020

21-
public ElementInstance(String modelKey, int status) {
22-
this(modelKey, status, null, null);
21+
public ElementInstance(String key, int status) {
22+
this(key, status, null, null);
2323
}
2424

25-
public ElementInstance(String modelKey, int status, String nodeInstanceId, String instanceDataId) {
25+
public ElementInstance(String key, int status, String nodeInstanceId, String instanceDataId) {
2626
super();
27-
this.modelKey = modelKey;
27+
this.key = key;
2828
this.status = status;
2929
this.nodeInstanceId = nodeInstanceId;
3030
this.instanceDataId = instanceDataId;
3131
}
3232

33-
public String getModelKey() {
34-
return modelKey;
33+
public String getKey() {
34+
return key;
3535
}
3636

37-
public void setModelKey(String modelKey) {
38-
this.modelKey = modelKey;
37+
public void setKey(String Key) {
38+
this.key = Key;
3939
}
4040

41-
public String getModelName() {
42-
return modelName;
41+
public String getName() {
42+
return name;
4343
}
4444

45-
public void setModelName(String modelName) {
46-
this.modelName = modelName;
45+
public void setName(String name) {
46+
this.name = name;
4747
}
4848

4949
public Map<String, Object> getProperties() {
@@ -97,8 +97,8 @@ public void setSubElementInstanceList(List<ElementInstance> subElementInstanceLi
9797
@Override
9898
public String toString() {
9999
return "ElementInstance{" +
100-
"modelKey='" + modelKey + '\'' +
101-
", modelName='" + modelName + '\'' +
100+
"Key='" + key + '\'' +
101+
", name='" + name + '\'' +
102102
", properties=" + properties +
103103
", status=" + status +
104104
", nodeInstanceId='" + nodeInstanceId + '\'' +

‎src/main/java/tech/wetech/flexmodel/domain/model/flow/executor/callactivity/SyncSingleCallActivityExecutor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ private RuntimeResult buildCallActivityFirstUserTaskRuntimeResult(FlowInstance s
221221
tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance nodeInstance = JsonUtils.getInstance().convertValue(nodeInstancePO, tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance.class);
222222
nodeInstance.setCreateTime(null);
223223
nodeInstance.setModifyTime(null);
224-
nodeInstance.setModelKey(nodeInstancePO.getNodeKey());
224+
nodeInstance.setKey(nodeInstancePO.getNodeKey());
225225
FlowElement flowElement = subFlowElementMap.get(nodeInstancePO.getNodeKey());
226-
nodeInstance.setModelName(FlowModelUtil.getElementName(flowElement));
226+
nodeInstance.setName(FlowModelUtil.getElementName(flowElement));
227227
nodeInstance.setProperties(flowElement.getProperties());
228228

229229
runtimeResult.setActiveTaskInstance(nodeInstance);

‎src/main/java/tech/wetech/flexmodel/domain/model/flow/processor/RuntimeProcessor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ public NodeInstanceListResult getHistoryUserTaskList(String flowInstanceId, bool
304304
//build effective userTask instance
305305
tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance nodeInstance = JsonUtils.getInstance().convertValue(nodeInstancePO, tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance.class);
306306
FlowElement flowElement = FlowModelUtil.getFlowElement(flowElementMap, nodeInstancePO.getNodeKey());
307-
nodeInstance.setModelKey(flowElement.getKey());
308-
nodeInstance.setModelName(FlowModelUtil.getElementName(flowElement));
307+
nodeInstance.setKey(flowElement.getKey());
308+
nodeInstance.setName(FlowModelUtil.getElementName(flowElement));
309309
Map<String, Object> props = flowElement.getProperties();
310310
if (props != null && !props.isEmpty()) {
311311
nodeInstance.setProperties(props);
@@ -436,8 +436,8 @@ public NodeInstanceResult getNodeInstance(String flowInstanceId, String nodeInst
436436
Map<String, FlowElement> flowElementMap = getFlowElementMap(flowDeployId);
437437
tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance nodeInstance = JsonUtils.getInstance().convertValue(nodeInstancePO, tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance.class);
438438
FlowElement flowElement = FlowModelUtil.getFlowElement(flowElementMap, nodeInstancePO.getNodeKey());
439-
nodeInstance.setModelKey(flowElement.getKey());
440-
nodeInstance.setModelName(FlowModelUtil.getElementName(flowElement));
439+
nodeInstance.setKey(flowElement.getKey());
440+
nodeInstance.setName(FlowModelUtil.getElementName(flowElement));
441441
Map<String, Object> props = flowElement.getProperties();
442442
if (props != null && !props.isEmpty()) {
443443
nodeInstance.setProperties(props);
@@ -572,9 +572,9 @@ private RuntimeResult fillRuntimeResult(RuntimeResult runtimeResult, RuntimeCont
572572

573573
private tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance buildActiveTaskInstance(NodeInstanceBO nodeInstanceBO, RuntimeContext runtimeContext) {
574574
tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance activeNodeInstance = JsonUtils.getInstance().convertValue(nodeInstanceBO, tech.wetech.flexmodel.domain.model.flow.dto.bo.NodeInstance.class);
575-
activeNodeInstance.setModelKey(nodeInstanceBO.getNodeKey());
575+
activeNodeInstance.setKey(nodeInstanceBO.getNodeKey());
576576
FlowElement flowElement = runtimeContext.getFlowElementMap().get(nodeInstanceBO.getNodeKey());
577-
activeNodeInstance.setModelName(FlowModelUtil.getElementName(flowElement));
577+
activeNodeInstance.setName(FlowModelUtil.getElementName(flowElement));
578578
activeNodeInstance.setProperties(flowElement.getProperties());
579579
activeNodeInstance.setFlowElementType(flowElement.getType());
580580
activeNodeInstance.setSubNodeResultList(runtimeContext.getCallActivityRuntimeResultList());

‎src/main/java/tech/wetech/flexmodel/infrastructure/persistence/NodeInstanceFmRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public List<NodeInstance> selectByFlowInstanceId(String flowInstanceId) {
108108
public List<NodeInstance> selectDescByFlowInstanceId(String flowInstanceId) {
109109
return session.dsl().selectFrom(NodeInstance.class)
110110
.where(field(NodeInstance::getFlowInstanceId).eq(flowInstanceId))
111-
.orderByDesc(NodeInstance::getId)
111+
.orderBy(NodeInstance::getId)
112112
.execute();
113113
}
114114

‎src/main/java/tech/wetech/flexmodel/interfaces/rest/FlowResource.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ public static class FlowInstanceSchema {
645645
@Schema(
646646
properties = {
647647
@SchemaProperty(name = "nodeInstanceId", examples = {"node_inst_001"}, description = "节点实例ID"),
648-
@SchemaProperty(name = "modelKey", examples = {"user_task_001"}, description = "模型键"),
648+
@SchemaProperty(name = "Key", examples = {"user_task_001"}, description = "模型键"),
649649
@SchemaProperty(name = "modelName", examples = {"用户审批任务"}, description = "模型名称"),
650650
@SchemaProperty(name = "status", examples = {"2"}, description = "节点状态：1-待处理，2-已完成，3-已跳过，4-已禁用"),
651651
@SchemaProperty(name = "flowElementType", examples = {"1"}, description = "流程元素类型：1-用户任务，2-服务任务，3-网关，4-事件"),
@@ -663,8 +663,8 @@ public static class NodeInstanceSchema extends NodeInstance {
663663

664664
@Schema(
665665
properties = {
666-
@SchemaProperty(name = "modelKey", examples = {"start_event_001"}, description = "模型键"),
667-
@SchemaProperty(name = "modelName", examples = {"开始事件"}, description = "模型名称"),
666+
@SchemaProperty(name = "Key", examples = {"start_event_001"}, description = "键"),
667+
@SchemaProperty(name = "name", examples = {"开始事件"}, description = "名称"),
668668
@SchemaProperty(name = "status", examples = {"2"}, description = "元素状态：1-待处理，2-已完成，3-已跳过，4-已禁用"),
669669
@SchemaProperty(name = "properties", description = "元素属性", type = SchemaType.OBJECT),
670670
@SchemaProperty(name = "nodeInstanceId", examples = {"node_inst_001"}, description = "节点实例ID"),

‎src/test/java/tech/wetech/flexmodel/domain/model/flow/executor/ExclusiveGatewayExecutorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public void testDoExecute() {
6969
public void testGetExecuteExecutor() {
7070
try {
7171
exclusiveGatewayExecutor.getExecuteExecutor(runtimeContext);
72-
String modelKey = runtimeContext.getCurrentNodeModel().getKey();
73-
Assertions.assertEquals("userTask2", modelKey);
72+
String Key = runtimeContext.getCurrentNodeModel().getKey();
73+
Assertions.assertEquals("userTask2", Key);
7474
} catch (Exception e) {
7575
log.error("", e);
7676
}

‎src/test/java/tech/wetech/flexmodel/domain/model/flow/processor/RuntimeProcessorTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private StartProcessResult startProcess() throws Exception {
6262
public void testStartProcess() throws Exception {
6363
StartProcessResult startProcessResult = startProcess();
6464
Assertions.assertEquals(startProcessResult.getErrCode(), ErrorEnum.COMMIT_SUSPEND.getErrNo());
65-
Assertions.assertEquals("BranchUserTask_0scrl8d", startProcessResult.getActiveTaskInstance().getModelKey());
65+
Assertions.assertEquals("BranchUserTask_0scrl8d", startProcessResult.getActiveTaskInstance().getKey());
6666
}
6767

6868
// UserTask -> EndEvent
@@ -80,7 +80,7 @@ public void testNormalCommitToEnd() throws Exception {
8080
CommitTaskResult commitTaskResult = runtimeProcessor.commit(commitTaskParam);
8181
log.info("testCommit.||commitTaskResult={}", commitTaskResult);
8282
Assertions.assertEquals(commitTaskResult.getErrCode(), ErrorEnum.SUCCESS.getErrNo());
83-
Assertions.assertEquals("EndEvent_0s4vsxw", commitTaskResult.getActiveTaskInstance().getModelKey());
83+
Assertions.assertEquals("EndEvent_0s4vsxw", commitTaskResult.getActiveTaskInstance().getKey());
8484
}
8585

8686
// UserTask -> ExclusiveGateway -> UserTask
@@ -98,7 +98,7 @@ public void testNormalCommitToUserTask() throws Exception {
9898
CommitTaskResult commitTaskResult = runtimeProcessor.commit(commitTaskParam);
9999
log.info("testCommit.||commitTaskResult={}", commitTaskResult);
100100
Assertions.assertEquals(commitTaskResult.getErrCode(), ErrorEnum.COMMIT_SUSPEND.getErrNo());
101-
Assertions.assertEquals("UserTask_0uld0u9", commitTaskResult.getActiveTaskInstance().getModelKey());
101+
Assertions.assertEquals("UserTask_0uld0u9", commitTaskResult.getActiveTaskInstance().getKey());
102102
}
103103

104104
// UserTask -> ExclusiveGateway -> UserTask
@@ -119,7 +119,7 @@ public void testRepeatedCommitToUserTask() throws Exception {
119119
log.info("testCommit.||commitTaskResult={}", commitTaskResult);
120120

121121
Assertions.assertEquals(commitTaskResult.getErrCode(), ErrorEnum.COMMIT_SUSPEND.getErrNo());
122-
Assertions.assertEquals("UserTask_0uld0u9", commitTaskResult.getActiveTaskInstance().getModelKey());
122+
Assertions.assertEquals("UserTask_0uld0u9", commitTaskResult.getActiveTaskInstance().getKey());
123123
}
124124

125125
// UserTask -> EndEvent -> Commit again
@@ -184,7 +184,7 @@ public void testRollbackToUserTaskAndCommitOldUserTask() throws Exception {
184184

185185
log.info("testRollbackToUserTaskAndCommitOldUserTask.||commitTaskResult={}", commitTaskResult);
186186
Assertions.assertEquals(commitTaskResult.getErrCode(), ErrorEnum.COMMIT_FAILED.getErrNo());
187-
Assertions.assertEquals("BranchUserTask_0scrl8d", commitTaskResult.getActiveTaskInstance().getModelKey());
187+
Assertions.assertEquals("BranchUserTask_0scrl8d", commitTaskResult.getActiveTaskInstance().getKey());
188188
}
189189

190190
@Test
@@ -212,7 +212,7 @@ public void testRollbackFromMiddleUserTask() throws Exception {
212212
// Ignore current userTask
213213
log.info("testRollbackFromMiddleUserTask.||rollbackTaskResult={}", rollbackTaskResult);
214214
Assertions.assertEquals(rollbackTaskResult.getErrCode(), ErrorEnum.ROLLBACK_SUSPEND.getErrNo());
215-
Assertions.assertEquals("BranchUserTask_0scrl8d", rollbackTaskResult.getActiveTaskInstance().getModelKey());
215+
Assertions.assertEquals("BranchUserTask_0scrl8d", rollbackTaskResult.getActiveTaskInstance().getKey());
216216
}
217217

218218

@@ -239,7 +239,7 @@ public void testRollbackToUserTask() throws Exception {
239239

240240
log.info("testRollback.||rollbackTaskResult={}", rollbackTaskResult);
241241
Assertions.assertEquals(rollbackTaskResult.getErrCode(), ErrorEnum.ROLLBACK_SUSPEND.getErrNo());
242-
Assertions.assertEquals("BranchUserTask_0scrl8d", rollbackTaskResult.getActiveTaskInstance().getModelKey());
242+
Assertions.assertEquals("BranchUserTask_0scrl8d", rollbackTaskResult.getActiveTaskInstance().getKey());
243243
}
244244

245245
// StartEvent <- UserTask
@@ -323,15 +323,15 @@ public void testGetHistoryUserTaskList() throws Exception {
323323
StringBuilder sb = new StringBuilder();
324324
for (NodeInstance elementInstanceResult : nodeInstanceListResult.getNodeInstanceList()) {
325325
sb.append("[");
326-
sb.append(elementInstanceResult.getModelKey());
326+
sb.append(elementInstanceResult.getKey());
327327
sb.append(" ");
328328
sb.append(elementInstanceResult.getStatus());
329329
sb.append("]->");
330330
}
331331
log.info("testGetHistoryUserTaskList.||snapshot={}", sb.toString());
332332

333333
Assertions.assertEquals(2, nodeInstanceListResult.getNodeInstanceList().size());
334-
Assertions.assertEquals("UserTask_0uld0u9", nodeInstanceListResult.getNodeInstanceList().getFirst().getModelKey());
334+
Assertions.assertEquals("UserTask_0uld0u9", nodeInstanceListResult.getNodeInstanceList().getFirst().getKey());
335335
}
336336

337337

@@ -356,15 +356,15 @@ public void testGetFailedHistoryElementList() throws Exception {
356356
StringBuilder sb = new StringBuilder();
357357
for (ElementInstance elementInstanceResult : elementInstanceListResult.getElementInstanceList()) {
358358
sb.append("[");
359-
sb.append(elementInstanceResult.getModelKey());
359+
sb.append(elementInstanceResult.getKey());
360360
sb.append(" ");
361361
sb.append(elementInstanceResult.getStatus());
362362
sb.append("]->");
363363
}
364364
log.info("testGetHistoryElementList.||snapshot={}", sb.toString());
365365

366366
Assertions.assertEquals(5, elementInstanceListResult.getElementInstanceList().size());
367-
Assertions.assertEquals("ExclusiveGateway_0yq2l0s", elementInstanceListResult.getElementInstanceList().get(4).getModelKey());
367+
Assertions.assertEquals("ExclusiveGateway_0yq2l0s", elementInstanceListResult.getElementInstanceList().get(4).getKey());
368368
}
369369

370370
@Test
@@ -385,15 +385,15 @@ public void testGetCompletedHistoryElementList() throws Exception {
385385
StringBuilder sb = new StringBuilder();
386386
for (ElementInstance elementInstanceResult : elementInstanceListResult.getElementInstanceList()) {
387387
sb.append("[");
388-
sb.append(elementInstanceResult.getModelKey());
388+
sb.append(elementInstanceResult.getKey());
389389
sb.append(" ");
390390
sb.append(elementInstanceResult.getStatus());
391391
sb.append("]->");
392392
}
393393
log.info("testGetHistoryElementList.||snapshot={}", sb.toString());
394394

395395
Assertions.assertEquals(5, elementInstanceListResult.getElementInstanceList().size());
396-
Assertions.assertEquals("EndEvent_0s4vsxw", elementInstanceListResult.getElementInstanceList().get(4).getModelKey());
396+
Assertions.assertEquals("EndEvent_0s4vsxw", elementInstanceListResult.getElementInstanceList().get(4).getKey());
397397
}
398398

399399

0 commit comments

Comments
 (0)