From ae20cf72c940b6b26a0dd347a04e83b16d2f5270 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 24 八月 2021 21:52:56 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 140 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 129 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 d4e7e9b..0864512 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,7 @@
package com.java110.common.bmo.workflow.impl;
-import com.fasterxml.jackson.databind.JsonNode;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
@@ -10,10 +11,12 @@
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
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.IOaWorkflowFormInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowXmlInnerServiceSMO;
import com.java110.intf.user.IOrgInnerServiceSMO;
@@ -24,10 +27,7 @@
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;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.ProcessEngines;
@@ -71,6 +71,9 @@
@Autowired
private IOaWorkflowXmlInnerServiceSMO oaWorkflowXmlInnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
@Autowired
private RepositoryService repositoryService;
@@ -149,14 +152,14 @@
Assert.listOnlyOne(oaWorkflowDtos, "鏈寘鍚祦绋�");
+ //琛ㄥ崟 閮ㄧ讲
+ deployForm(oaWorkflowDtos.get(0));
+
String deploymentid = "";
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);
+ bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
String encoded = Base64Convert.byteToBase64(bpmnBytes);
byte[] decoded = Base64Convert.base64ToByte(encoded);
String xml = new String(decoded);
@@ -166,7 +169,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
@@ -192,7 +195,114 @@
// }
// deployHistoryRepository.update(deployHistoryEntity);
// }
+
+
return ResultVo.success();
+ }
+
+ /**
+ * 閮ㄧ讲琛ㄥ崟
+ *
+ * @param oaWorkflowDto
+ */
+ private void deployForm(OaWorkflowDto oaWorkflowDto) {
+ if (StringUtil.isEmpty(oaWorkflowDto.getCurFormId())) {
+ throw new IllegalArgumentException("鏈缃〃鍗�");
+ }
+ OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+ oaWorkflowFormDto.setFormId(oaWorkflowDto.getCurFormId());
+ oaWorkflowFormDto.setStoreId(oaWorkflowDto.getStoreId());
+ List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+ Assert.listOnlyOne(oaWorkflowFormDtos, "鏈缃〃鍗�");
+ //鏌ヨ琛ㄦ槸鍚﹀瓨鍦�
+
+// int count = oaWorkflowFormInnerServiceSMOImpl.hasTable(oaWorkflowFormDtos.get(0).getTableName());
+// if (count > 0) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
+// return;
+// }
+
+ String formJson = oaWorkflowFormDtos.get(0).getFormJson();
+
+ Assert.isJsonObject(formJson, "琛ㄥ崟璁捐鍑洪敊锛岃閲嶆柊璁捐");
+
+ JSONObject form = JSONObject.parseObject(formJson);
+
+ JSONArray components = form.getJSONArray("components");
+ JSONObject component = null;
+ StringBuffer sql = new StringBuffer("create table if not exists ");
+ sql.append(oaWorkflowFormDtos.get(0).getTableName());
+ sql.append(" (");
+ sql.append("id varchar(30) NOT NULL PRIMARY KEY COMMENT '涓婚敭ID',");
+ boolean isVarchar = false;
+ JSONObject validate = null;
+ for (int componentIndex = 0; componentIndex < components.size(); componentIndex++) {
+ component = components.getJSONObject(componentIndex);
+ if ("text".equals(component.getString("type"))
+ || "button".equals(component.getString("type"))) {
+ continue;
+ }
+ isVarchar = false;
+ sql.append(component.getString("key"));
+ sql.append(" ");
+ if ("number".equals(component.getString("type"))) {
+ sql.append(" bigint");
+ } else if ("textfield".equals(component.getString("type"))) {
+ sql.append(" varchar");
+ isVarchar = true;
+ } else if ("checkbox".equals(component.getString("type"))) {
+ sql.append(" varchar");
+ isVarchar = true;
+ } else if ("radio".equals(component.getString("type"))) {
+ sql.append(" varchar");
+ isVarchar = true;
+ } else if ("select".equals(component.getString("type"))) {
+ sql.append(" varchar");
+ isVarchar = true;
+ } else if ("textarea".equals(component.getString("type"))) {
+ sql.append(" longtext");
+ } else if ("textdate".equals(component.getString("type"))) {
+ sql.append(" date");
+ } else if ("textdatetime".equals(component.getString("type"))) {
+ sql.append(" time");
+ } else {
+ throw new IllegalArgumentException("涓嶆敮鎸佺殑绫诲瀷");
+ }
+
+ if (component.containsKey("validate")) {
+ validate = component.getJSONObject("validate");
+ if (isVarchar && validate.containsKey("maxLength")) {
+ sql.append("(");
+ sql.append(validate.getIntValue("maxLength"));
+ sql.append(") ");
+ }
+ if (isVarchar && !validate.containsKey("maxLength")) {
+ sql.append("(64) ");
+ }
+ if (validate.containsKey("required") && validate.getBoolean("required")) {
+ sql.append(" not null ");
+ }
+ }
+ if (!component.containsKey("validate") && isVarchar) {
+ sql.append("(64) ");
+ }
+
+ sql.append(" comment '");
+ sql.append(component.getString("label"));
+ sql.append("',");
+ }
+ sql.append("store_id varchar(30) not null COMMENT '鍟嗘埛ID',");
+ sql.append("create_user_id varchar(30) not null COMMENT '鍒涘缓浜篒D',");
+ sql.append("create_user_name varchar(64) not null COMMENT '鍒涘缓浜�',");
+ sql.append("create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',");
+ sql.append("status_cd varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥'");
+ sql.append(")");
+ logger.debug("閮ㄧ讲琛ㄥ崟sql" + sql.toString());
+ oaWorkflowFormInnerServiceSMOImpl.createTable(sql.toString());
+
+// int count = oaWorkflowFormInnerServiceSMOImpl.createTable(sqlStr);
+// if (count < 1) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
+// throw new IllegalArgumentException("閮ㄧ讲琛ㄥ崟澶辫触");
+// }
}
@Override
@@ -218,10 +328,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);
}
@@ -259,6 +369,14 @@
throw new ActivitiException("Error saving model", e);
}
+ 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