From be3e2df347e93e202aa571bdfc72179e30b45ad7 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 13 九月 2021 20:11:36 +0800
Subject: [PATCH] 优化事务
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
index f9b8ab2..9b0bc11 100755
--- a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
@@ -164,9 +164,6 @@
Model modelData = repositoryService.getModel(workflowModelDto.getModelId());
byte[] bpmnBytes = null;
bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
- String encoded = Base64Convert.byteToBase64(bpmnBytes);
- byte[] decoded = Base64Convert.base64ToByte(encoded);
- String xml = new String(decoded);
String processName = modelData.getName() + ".bpmn20.xml";
ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
Deployment deployment = repositoryService.createDeployment().name(oaWorkflowDtos.get(0).getFlowName())
@@ -359,7 +356,9 @@
model.setName(oaWorkflowDtos.get(0).getFlowName());
model.setKey("java110_" + oaWorkflowDtos.get(0).getFlowId());
repositoryService.saveModel(model);
- repositoryService.addModelEditorSource(model.getId(), workflowModelDto.getJson_xml().getBytes("utf-8"));
+ String jsonXml = workflowModelDto.getJson_xml();
+ jsonXml = jsonXml.replaceAll("camunda:assignee", "activiti:assignee");
+ repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8"));
InputStream svgStream = new ByteArrayInputStream(workflowModelDto.getSvg_xml().getBytes("utf-8"));
TranscoderInput input = new TranscoderInput(svgStream);
@@ -410,8 +409,13 @@
for (Element userTask : userTasks) {
Attribute assignee = userTask.attribute("assignee");
if (assignee == null) {
- userTask.addAttribute("activiti:assignee", "${nextUserId}");
+ userTask.addAttribute("camunda:assignee", "${nextUserId}");
}
+ }
+
+ Attribute activiti = rootElement.attribute("activiti");
+ if (activiti == null) {
+ rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
}
Attribute processId = process.attribute("id");
@@ -422,6 +426,8 @@
String processIdValue = processId.getValue();
String newXml = rootElement.asXML();
newXml = newXml.replaceAll(processIdValue, "java110_" + workflowModelDto.getFlowId());
+
+
workflowModelDto.setJson_xml(newXml);
}
@@ -436,13 +442,17 @@
Element rootElement = doc.getRootElement();
Element process = rootElement.element("process");
- List<Element> userTasks = process.elements("userTask1");
+ List<Element> userTasks = process.elements("userTask");
for (Element userTask : userTasks) {
Attribute assignee = userTask.attribute("assignee");
if (assignee == null) {
- userTask.addAttribute("camunda:assignee", "${createUserId}");
+ userTask.addAttribute("activiti:assignee", "${createUserId}");
}
}
+ Attribute activiti = rootElement.attribute("activiti");
+ if (activiti == null) {
+ rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
+ }
Attribute processId = process.attribute("id");
if (processId == null) {
--
Gitblit v1.8.0