From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 60a98c8..8834de9 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
@@ -1,6 +1,5 @@
package com.java110.common.bmo.workflow.impl;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
@@ -24,8 +23,6 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import org.activiti.bpmn.converter.BpmnXMLConverter;
-import org.activiti.bpmn.model.BpmnModel;
import org.activiti.editor.constants.ModelDataJsonConstants;
import org.activiti.editor.language.json.converter.BpmnJsonConverter;
import org.activiti.engine.ActivitiException;
@@ -153,10 +150,11 @@
try {
Model modelData = repositoryService.getModel(workflowModelDto.getModelId());
byte[] bpmnBytes = null;
- JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(workflowModelDto.getModelId()));
- BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
- BpmnModel model = jsonConverter.convertToBpmnModel(editorNode);
- bpmnBytes = new BpmnXMLConverter().convertToXML(model);
+ //JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(workflowModelDto.getModelId()));
+ //BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+ //BpmnModel model = jsonConverter.convertToBpmnModel(editorNode);
+ //bpmnBytes = new BpmnXMLConverter().convertToXML(model);
+ bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
String encoded = Base64Convert.byteToBase64(bpmnBytes);
byte[] decoded = Base64Convert.base64ToByte(encoded);
String xml = new String(decoded);
@@ -218,10 +216,10 @@
List<OaWorkflowXmlDto> oaWorkflowXmlDtos = oaWorkflowXmlInnerServiceSMOImpl.queryOaWorkflowXmls(oaWorkflowXmlDto);
int flag = 0;
- if(oaWorkflowXmlDtos == null || oaWorkflowXmlDtos.size() < 1){
+ if (oaWorkflowXmlDtos == null || oaWorkflowXmlDtos.size() < 1) {
oaWorkflowXmlPo.setXmlId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_xmlId));
flag = oaWorkflowXmlInnerServiceSMOImpl.saveOaWorkflowXml(oaWorkflowXmlPo);
- }else{
+ } else {
oaWorkflowXmlPo.setXmlId(oaWorkflowXmlDtos.get(0).getXmlId());
flag = oaWorkflowXmlInnerServiceSMOImpl.updateOaWorkflowXml(oaWorkflowXmlPo);
}
--
Gitblit v1.8.0