From 2fc8dd46527fbf2efd21e6a95ccc5efb099a7d69 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:19:31 +0800
Subject: [PATCH] 合并master
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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 3827caf..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,27 +1,28 @@
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.api.WorkflowApi;
import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
import com.java110.common.dao.IWorkflowServiceDao;
import com.java110.common.dao.IWorkflowStepServiceDao;
import com.java110.common.dao.IWorkflowStepStaffServiceDao;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
import com.java110.dto.org.OrgDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.dto.workflow.WorkflowModelDto;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowXmlInnerServiceSMO;
import com.java110.intf.user.IOrgInnerServiceSMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.Base64Convert;
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;
@@ -66,11 +67,13 @@
private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
@Autowired
+ private IOaWorkflowXmlInnerServiceSMO oaWorkflowXmlInnerServiceSMOImpl;
+
+ @Autowired
private RepositoryService repositoryService;
@Autowired
private ObjectMapper objectMapper;
-
String MODEL_ID = "modelId";
@@ -147,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);
@@ -160,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
@@ -174,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);
@@ -189,6 +194,7 @@
}
@Override
+ @Java110Transactional
public ResponseEntity<String> saveModel(WorkflowModelDto workflowModelDto) {
//鏍规嵁
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
@@ -196,6 +202,31 @@
List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
Assert.listOnlyOne(oaWorkflowDtos, "鏈寘鍚祦绋�");
+
+ OaWorkflowXmlPo oaWorkflowXmlPo = new OaWorkflowXmlPo();
+ oaWorkflowXmlPo.setStoreId(oaWorkflowDtos.get(0).getStoreId());
+ oaWorkflowXmlPo.setBpmnXml(workflowModelDto.getJson_xml());
+ oaWorkflowXmlPo.setFlowId(oaWorkflowDtos.get(0).getFlowId());
+ oaWorkflowXmlPo.setSvgXml(workflowModelDto.getSvg_xml());
+ //鏌ヨ閮ㄧ讲
+
+ 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) {
+ oaWorkflowXmlPo.setXmlId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_xmlId));
+ flag = oaWorkflowXmlInnerServiceSMOImpl.saveOaWorkflowXml(oaWorkflowXmlPo);
+ } else {
+ oaWorkflowXmlPo.setXmlId(oaWorkflowXmlDtos.get(0).getXmlId());
+ flag = oaWorkflowXmlInnerServiceSMOImpl.updateOaWorkflowXml(oaWorkflowXmlPo);
+ }
+ if (flag < 1) {
+ throw new IllegalArgumentException("娴佺▼鍥惧鐞嗗け璐�");
+ }
+
try {
Model model = repositoryService.getModel(workflowModelDto.getModelId());
ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
@@ -221,13 +252,12 @@
repositoryService.addModelEditorSourceExtra(model.getId(), result);
outStream.close();
-
} catch (Exception e) {
logger.error("Error saving model", e);
throw new ActivitiException("Error saving model", e);
}
- return deployModel(workflowModelDto);
+ return ResultVo.success();
}
}
--
Gitblit v1.8.0