ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 略微修改ModelNode的类型生成规则

Browse Source
This commit is contained in:
lijiarao
2023-12-12 16:17:10 +08:00
parent 4dfde3711d
commit b420334db0
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
+15 -2
View File
@@ -12,6 +12,7 @@ import com.jero.modules.activiti.enums.VariableTypeEnum;
import com.jero.modules.activiti.listener.CompleteListener; import com.jero.modules.activiti.listener.CompleteListener;
import com.jero.modules.activiti.listener.CreateListener; import com.jero.modules.activiti.listener.CreateListener;
import com.jero.modules.activiti.vo.AddTaskVO; import com.jero.modules.activiti.vo.AddTaskVO;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.activiti.bpmn.BpmnAutoLayout; import org.activiti.bpmn.BpmnAutoLayout;
import org.activiti.bpmn.converter.BpmnXMLConverter; import org.activiti.bpmn.converter.BpmnXMLConverter;
@@ -48,7 +49,11 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
@Resource @Resource
private ProcessModelNodeMapper processModelNodeMapper; private ProcessModelNodeMapper processModelNodeMapper;
public static Integer sort = 1; public static Integer sort = 1;
public static List<String> multiInstanceElementVariableList = new ArrayList<>();
@Synchronized
public void generateNode(String modelId) { public void generateNode(String modelId) {
sort = 1;
multiInstanceElementVariableList = new ArrayList<>();
ObjectNode objectNode = null; ObjectNode objectNode = null;
try { try {
objectNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelId)); objectNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelId));
@@ -377,8 +382,13 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
processModelNode.setVariableType(VariableTypeEnum.LIST.getName()); processModelNode.setVariableType(VariableTypeEnum.LIST.getName());
processModelNode.setVariableName(inputDataItem.replace("${","").replace("}","")); processModelNode.setVariableName(inputDataItem.replace("${","").replace("}",""));
}else { }else {
processModelNode.setVariableType(VariableTypeEnum.STRING.getName()); String replace = assignee.replace("${", "").replace("}", "");
processModelNode.setVariableName(assignee.replace("${","").replace("}","")); processModelNode.setVariableName(replace);
if (multiInstanceElementVariableList.contains(replace)) {
processModelNode.setVariableType(VariableTypeEnum.LIST.getName());
}else {
processModelNode.setVariableType(VariableTypeEnum.STRING.getName());
}
} }
processModelNode.setSort(sort++); processModelNode.setSort(sort++);
} else if (flowElement instanceof SequenceFlow) { } else if (flowElement instanceof SequenceFlow) {
@@ -399,6 +409,9 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
} else if (flowElement instanceof SubProcess) { } else if (flowElement instanceof SubProcess) {
SubProcess subProcess = (SubProcess) flowElement; SubProcess subProcess = (SubProcess) flowElement;
MultiInstanceLoopCharacteristics loopCharacteristics = subProcess.getLoopCharacteristics();
String elementVariable = loopCharacteristics.getElementVariable();
multiInstanceElementVariableList.add(elementVariable);
Collection<FlowElement> flowElements1 = subProcess.getFlowElements(); Collection<FlowElement> flowElements1 = subProcess.getFlowElements();
xmlNodeId = subProcess.getId(); xmlNodeId = subProcess.getId();
List<ProcessModelNode> processModelNodes = handlerLawsProcessModelNode(flowElements1, gatewayIdList, modelId, xmlNodeId); List<ProcessModelNode> processModelNodes = handlerLawsProcessModelNode(flowElements1, gatewayIdList, modelId, xmlNodeId);