From a18b5861d452adc4d5a1c25bd2e1cd6abbc5fda5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 22 八月 2021 17:55:21 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 8a09886..ad1feb4 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);
@@ -166,7 +164,7 @@
.addInputStream(processName, in).deploy();
deploymentid = deployment.getId();
} catch (Exception e) {
- System.out.println(e);
+ throw new IllegalArgumentException(e);
}
Assert.isTrue(!StringUtil.isEmpty(deploymentid), "娴佺▼閮ㄧ讲鍑洪敊");
ProcessDefinition processDefinition = repositoryService
@@ -180,6 +178,7 @@
oaWorkflowPo.setFlowId(oaWorkflowDtos.get(0).getFlowId());
oaWorkflowPo.setStoreId(oaWorkflowDtos.get(0).getStoreId());
oaWorkflowPo.setProcessDefinitionKey(deploymentid);
+ oaWorkflowPo.setState(OaWorkflowDto.STATE_COMPLAINT);
oaWorkflowInnerServiceSMOImpl.updateOaWorkflow(oaWorkflowPo);
// //閮ㄧ讲鍘嗗彶琛�
// List<DeployHistoryEntity> deployHistoryEntities = deployHistoryRepository.getDeployHistoryByDeptWithProcessKeyId(deptWithProcessKeyId);
@@ -214,12 +213,13 @@
OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
oaWorkflowXmlDto.setFlowId(oaWorkflowDtos.get(0).getFlowId());
oaWorkflowXmlDto.setStoreId(oaWorkflowDtos.get(0).getStoreId());
+
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);
}
@@ -257,7 +257,15 @@
throw new ActivitiException("Error saving model", e);
}
- return deployModel(workflowModelDto);
+ OaWorkflowPo oaWorkflowPo = new OaWorkflowPo();
+ oaWorkflowPo.setFlowId(oaWorkflowDtos.get(0).getFlowId());
+ oaWorkflowPo.setState(OaWorkflowDto.STATE_WAIT);
+ flag = oaWorkflowInnerServiceSMOImpl.updateOaWorkflow(oaWorkflowPo);
+ if (flag < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+ }
+
+ return ResultVo.success();
}
}
--
Gitblit v1.8.0