From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceAuditFlowCmd.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceAuditFlowCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceAuditFlowCmd.java
index 878406c..023c22c 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceAuditFlowCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceAuditFlowCmd.java
@@ -18,15 +18,24 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflow.WorkflowModelDto;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowXmlInnerServiceSMO;
import com.java110.intf.store.IResourceAuditFlowV1InnerServiceSMO;
-import com.java110.po.resourceAuditFlow.ResourceAuditFlowPo;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.po.oaWorkflow.OaWorkflowXmlPo;
+import com.java110.po.resource.ResourceAuditFlowPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.BpmnXml;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
@@ -52,20 +61,65 @@
@Autowired
private IResourceAuditFlowV1InnerServiceSMO resourceAuditFlowV1InnerServiceSMOImpl;
+ @Autowired
+ private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowXmlInnerServiceSMO oaWorkflowXmlInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "flowType", "璇锋眰鎶ユ枃涓湭鍖呭惈flowType");
-Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+ Assert.hasKeyAndValue(reqJson, "auditType", "璇锋眰鎶ユ枃涓湭鍖呭惈flowType");
+ Assert.hasKeyAndValue(reqJson, "flowName", "璇锋眰鎶ユ枃涓湭鍖呭惈flowType");
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
- ResourceAuditFlowPo resourceAuditFlowPo = BeanConvertUtil.covertBean(reqJson, ResourceAuditFlowPo.class);
+ OaWorkflowPo oaWorkflowPo = new OaWorkflowPo();
+ oaWorkflowPo.setStoreId(storeId);
+ oaWorkflowPo.setFlowId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_flowId));
+ oaWorkflowPo.setFlowName(reqJson.getString("flowName"));
+ oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_RESOURCE);
+
+ //鍒涘缓model
+ WorkflowModelDto workflowModelDto = new WorkflowModelDto();
+ workflowModelDto.setName(oaWorkflowPo.getFlowName());
+ workflowModelDto.setKey(oaWorkflowPo.getFlowId());
+ workflowModelDto = workflowInnerServiceSMOImpl.createModel(workflowModelDto);
+
+ oaWorkflowPo.setModelId(workflowModelDto.getModelId());
+ oaWorkflowPo.setFlowKey(workflowModelDto.getKey());
+ oaWorkflowPo.setState(OaWorkflowDto.STATE_WAIT);
+ int flag = oaWorkflowInnerServiceSMOImpl.saveOaWorkflow(oaWorkflowPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ }
+
+ //榛樿 娴佺▼鍥句互闃茬敾閿�
+ OaWorkflowXmlPo oaWorkflowXmlPo = new OaWorkflowXmlPo();
+ oaWorkflowXmlPo.setStoreId(oaWorkflowPo.getStoreId());
+ oaWorkflowXmlPo.setFlowId(oaWorkflowPo.getFlowId());
+ oaWorkflowXmlPo.setXmlId(GenerateCodeFactory.getGeneratorId("79"));
+ oaWorkflowXmlPo.setSvgXml("");
+ oaWorkflowXmlPo.setBpmnXml(BpmnXml.getResourceBpmnXml(oaWorkflowPo.getFlowId()));
+
+ flag = oaWorkflowXmlInnerServiceSMOImpl.saveOaWorkflowXml(oaWorkflowXmlPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨妯″瀷鏁版嵁澶辫触");
+ }
+
+ ResourceAuditFlowPo resourceAuditFlowPo = BeanConvertUtil.covertBean(reqJson, ResourceAuditFlowPo.class);
+ resourceAuditFlowPo.setStoreId(storeId);
resourceAuditFlowPo.setRafId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
- int flag = resourceAuditFlowV1InnerServiceSMOImpl.saveResourceAuditFlow(resourceAuditFlowPo);
+ resourceAuditFlowPo.setFlowId(oaWorkflowPo.getFlowId());
+ flag = resourceAuditFlowV1InnerServiceSMOImpl.saveResourceAuditFlow(resourceAuditFlowPo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
--
Gitblit v1.8.0