From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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..8a09886 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
@@ -3,18 +3,22 @@
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;
@@ -66,11 +70,13 @@
private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
@Autowired
+ private IOaWorkflowXmlInnerServiceSMO oaWorkflowXmlInnerServiceSMOImpl;
+
+ @Autowired
private RepositoryService repositoryService;
@Autowired
private ObjectMapper objectMapper;
-
String MODEL_ID = "modelId";
@@ -189,6 +195,7 @@
}
@Override
+ @Java110Transactional
public ResponseEntity<String> saveModel(WorkflowModelDto workflowModelDto) {
//鏍规嵁
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
@@ -196,6 +203,30 @@
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());
@@ -220,7 +251,6 @@
final byte[] result = outStream.toByteArray();
repositoryService.addModelEditorSourceExtra(model.getId(), result);
outStream.close();
-
} catch (Exception e) {
logger.error("Error saving model", e);
--
Gitblit v1.8.0