From 551ad62ae01a166a20ebe981372293b78568d62c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 八月 2022 12:29:51 +0800
Subject: [PATCH] 优化查询bug
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 231 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 198 insertions(+), 33 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 4a94e8a..20555fa 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
@@ -10,20 +10,22 @@
import com.java110.common.dao.IWorkflowStepStaffServiceDao;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
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.org.OrgStaffRelDto;
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.store.IOrgStaffRelV1InnerServiceSMO;
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;
@@ -38,8 +40,11 @@
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.dom4j.Attribute;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -76,6 +81,9 @@
private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
@Autowired
+ private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+ @Autowired
private RepositoryService repositoryService;
@Autowired
@@ -94,7 +102,7 @@
List<Map> workflows = workflowServiceDaoImpl.getWorkflowInfo(BeanConvertUtil.beanCovertMap(workflowDto));
if (workflows == null || workflows.size() < 1) {
- return null;
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌娴佺▼");
}
WorkflowDto tmpWorkflowDto = BeanConvertUtil.covertBean(workflows.get(0), WorkflowDto.class);
@@ -125,17 +133,20 @@
}
Map staffInfo = workflowStepStaffs.get(0);
+ String staffId = staffInfo.get("staffId") + "";
+ OrgStaffRelDto orgDto = new OrgStaffRelDto();
+ if (staffId.startsWith("${")) {
+ return ResultVo.createResponseEntity(orgDto);
+ }
+ orgDto.setStaffId(staffId);
- OrgDto orgDto = new OrgDto();
- orgDto.setStaffId(staffInfo.get("staffId") + "");
-
- List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto);
-
- if (orgDtos == null || orgDtos.size() < 1) {
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(staffId);
+ List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelV1InnerServiceSMOImpl.queryStaffOrgNames(orgStaffRelDto);
+ if (orgStaffRelDtos == null || orgStaffRelDtos.size() < 1) {
return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌鍛樺伐缁勭粐淇℃伅");
}
-
- orgDto = orgDtos.get(0);
+ orgDto = orgStaffRelDtos.get(0);
orgDto.setStaffName(staffInfo.get("staffName") + "");
return ResultVo.createResponseEntity(orgDto);
@@ -160,9 +171,6 @@
Model modelData = repositoryService.getModel(workflowModelDto.getModelId());
byte[] bpmnBytes = null;
bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
- String encoded = Base64Convert.byteToBase64(bpmnBytes);
- byte[] decoded = Base64Convert.base64ToByte(encoded);
- String xml = new String(decoded);
String processName = modelData.getName() + ".bpmn20.xml";
ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
Deployment deployment = repositoryService.createDeployment().name(oaWorkflowDtos.get(0).getFlowName())
@@ -216,11 +224,6 @@
Assert.listOnlyOne(oaWorkflowFormDtos, "鏈缃〃鍗�");
//鏌ヨ琛ㄦ槸鍚﹀瓨鍦�
-// int count = oaWorkflowFormInnerServiceSMOImpl.hasTable(oaWorkflowFormDtos.get(0).getTableName());
-// if (count > 0) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
-// return;
-// }
-
String formJson = oaWorkflowFormDtos.get(0).getFormJson();
Assert.isJsonObject(formJson, "琛ㄥ崟璁捐鍑洪敊锛岃閲嶆柊璁捐");
@@ -232,6 +235,7 @@
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++) {
@@ -258,7 +262,7 @@
sql.append(" varchar");
isVarchar = true;
} else if ("textarea".equals(component.getString("type"))) {
- sql.append(" longtext");
+ sql.append(" longtext CHARACTER SET utf8");
} else if ("textdate".equals(component.getString("type"))) {
sql.append(" date");
} else if ("textdatetime".equals(component.getString("type"))) {
@@ -273,30 +277,45 @@
sql.append("(");
sql.append(validate.getIntValue("maxLength"));
sql.append(") ");
- } else if (isVarchar) {
+ }
+ 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("'");
-
- if (componentIndex != components.size() - 1) {
- sql.append(",");
- }
+ sql.append("',");
}
- 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("state varchar(12) not null COMMENT '鐘舵�� 1001 鐢宠 1002 寰呭鏍� 1003 閫�鍥� 1004 濮旀墭 1005 鍔炵粨',");
+ 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(") DEFAULT CHARSET=utf8");
logger.debug("閮ㄧ讲琛ㄥ崟sql" + sql.toString());
- int count = oaWorkflowFormInnerServiceSMOImpl.createTable(sql.toString());
- if (count < 1) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
- throw new IllegalArgumentException("閮ㄧ讲琛ㄥ崟澶辫触");
- }
+ oaWorkflowFormInnerServiceSMOImpl.createTable(sql.toString());
+
+// int count = oaWorkflowFormInnerServiceSMOImpl.createTable(sqlStr);
+// if (count < 1) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
+// throw new IllegalArgumentException("閮ㄧ讲琛ㄥ崟澶辫触");
+// }
}
+ /**
+ * 鍒涘缓model
+ * 寰俊 17797173942
+ *
+ * @param workflowModelDto
+ * @return
+ */
@Override
@Java110Transactional
public ResponseEntity<String> saveModel(WorkflowModelDto workflowModelDto) {
@@ -306,6 +325,10 @@
List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
Assert.listOnlyOne(oaWorkflowDtos, "鏈寘鍚祦绋�");
+ workflowModelDto.setFlowId(oaWorkflowDtos.get(0).getFlowId());
+
+ //杩欓噷鍐冲畾瀵筨pmn xml 鏂囦欢鍋氳繃婊ゅ鐞�
+ dealBpmnXml(workflowModelDto);
OaWorkflowXmlPo oaWorkflowXmlPo = new OaWorkflowXmlPo();
oaWorkflowXmlPo.setStoreId(oaWorkflowDtos.get(0).getStoreId());
@@ -313,7 +336,6 @@
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());
@@ -339,8 +361,11 @@
modelJson.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion() + 1);
model.setMetaInfo(modelJson.toString());
model.setName(oaWorkflowDtos.get(0).getFlowName());
+ model.setKey("java110_" + oaWorkflowDtos.get(0).getFlowId());
repositoryService.saveModel(model);
- repositoryService.addModelEditorSource(model.getId(), workflowModelDto.getJson_xml().getBytes("utf-8"));
+ String jsonXml = workflowModelDto.getJson_xml();
+ jsonXml = jsonXml.replaceAll("camunda:assignee", "activiti:assignee");
+ repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8"));
InputStream svgStream = new ByteArrayInputStream(workflowModelDto.getSvg_xml().getBytes("utf-8"));
TranscoderInput input = new TranscoderInput(svgStream);
@@ -372,4 +397,144 @@
return ResultVo.success();
}
+ /**
+ * 杩囨护BpmnXml
+ *
+ * @param workflowModelDto
+ */
+ private void dealBpmnXml(WorkflowModelDto workflowModelDto) {
+ String bpmnXml = workflowModelDto.getJson_xml();
+ Document doc = null;
+ try {
+ doc = DocumentHelper.parseText(bpmnXml);
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
+ }
+ Element rootElement = doc.getRootElement();
+ Element process = rootElement.element("process");
+ List<Element> userTasks = process.elements("userTask");
+ for (Element userTask : userTasks) {
+ Attribute assignee = userTask.attribute("assignee");
+ if (assignee == null) {
+ userTask.addAttribute("camunda:assignee", "${nextUserId}");
+ }
+ }
+
+ Attribute activiti = rootElement.attribute("activiti");
+ if (activiti == null) {
+ rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
+ }
+
+ Attribute processId = process.attribute("id");
+ if (processId == null) {
+ workflowModelDto.setJson_xml(rootElement.asXML());
+ return;
+ }
+ String processIdValue = processId.getValue();
+ String newXml = rootElement.asXML();
+ newXml = newXml.replaceAll(processIdValue, "java110_" + workflowModelDto.getFlowId());
+
+
+ workflowModelDto.setJson_xml(newXml);
+ }
+
+ public static void main(String[] args) {
+ String xml = getXml();
+ Document doc = null;
+ try {
+ doc = DocumentHelper.parseText(xml);
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ Element rootElement = doc.getRootElement();
+ Element process = rootElement.element("process");
+ List<Element> userTasks = process.elements("userTask");
+ for (Element userTask : userTasks) {
+ Attribute assignee = userTask.attribute("assignee");
+ if (assignee == null) {
+ userTask.addAttribute("activiti:assignee", "${createUserId}");
+ }
+ }
+ Attribute activiti = rootElement.attribute("activiti");
+ if (activiti == null) {
+ rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
+ }
+
+ Attribute processId = process.attribute("id");
+ if (processId == null) {
+ return;
+ }
+ String processIdValue = processId.getValue();
+ String newXml = rootElement.asXML();
+ newXml = newXml.replaceAll(processIdValue, "浣犲ソ鍏勫紵");
+
+
+ System.out.printf("xml=\n" + newXml);
+
+
+ }
+
+ private static String getXml() {
+ return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<bpmn2:definitions xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:bpmn2=\"http://www.omg.org/spec/BPMN/20100524/MODEL\" xmlns:bpmndi=\"http://www.omg.org/spec/BPMN/20100524/DI\" xmlns:dc=\"http://www.omg.org/spec/DD/20100524/DC\" xmlns:di=\"http://www.omg.org/spec/DD/20100524/DI\" id=\"sample-diagram\" targetNamespace=\"http://bpmn.io/schema/bpmn\" xsi:schemaLocation=\"http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd\">\n" +
+ " <bpmn2:process id=\"java110_752021081769600001\" name=\"璇峰亣娴佺▼\" isExecutable=\"true\">\n" +
+ " <bpmn2:sequenceFlow id=\"Flow_1gyk5nu\" sourceRef=\"StartEvent_1\" targetRef=\"Activity_0d63gnp\" />\n" +
+ " <bpmn2:userTask id=\"Activity_0d63gnp\" name=\"娴嬭瘯瀹℃牳\">\n" +
+ " <bpmn2:incoming>Flow_1gyk5nu</bpmn2:incoming>\n" +
+ " <bpmn2:outgoing>Flow_0vajlrg</bpmn2:outgoing>\n" +
+ " </bpmn2:userTask>\n" +
+ " <bpmn2:endEvent id=\"Event_1wbhsi9\" name=\"缁撴潫鑺傜偣\">\n" +
+ " <bpmn2:incoming>Flow_1pn6kje</bpmn2:incoming>\n" +
+ " <bpmn2:terminateEventDefinition id=\"TerminateEventDefinition_05gt98d\" />\n" +
+ " </bpmn2:endEvent>\n" +
+ " <bpmn2:startEvent id=\"StartEvent_1\" name=\"寮�濮媆">\n" +
+ " <bpmn2:outgoing>Flow_1gyk5nu</bpmn2:outgoing>\n" +
+ " </bpmn2:startEvent>\n" +
+ " <bpmn2:task id=\"Activity_0zilrzy\" name=\"浼樺寲\">\n" +
+ " <bpmn2:incoming>Flow_0vajlrg</bpmn2:incoming>\n" +
+ " <bpmn2:outgoing>Flow_1pn6kje</bpmn2:outgoing>\n" +
+ " </bpmn2:task>\n" +
+ " <bpmn2:sequenceFlow id=\"Flow_0vajlrg\" sourceRef=\"Activity_0d63gnp\" targetRef=\"Activity_0zilrzy\" />\n" +
+ " <bpmn2:sequenceFlow id=\"Flow_1pn6kje\" sourceRef=\"Activity_0zilrzy\" targetRef=\"Event_1wbhsi9\" />\n" +
+ " </bpmn2:process>\n" +
+ " <bpmndi:BPMNDiagram id=\"BPMNDiagram_1\">\n" +
+ " <bpmndi:BPMNPlane id=\"BPMNPlane_1\" bpmnElement=\"java110_752021081769600001\">\n" +
+ " <bpmndi:BPMNEdge id=\"Flow_1pn6kje_di\" bpmnElement=\"Flow_1pn6kje\">\n" +
+ " <di:waypoint x=\"760\" y=\"370\" />\n" +
+ " <di:waypoint x=\"922\" y=\"370\" />\n" +
+ " </bpmndi:BPMNEdge>\n" +
+ " <bpmndi:BPMNEdge id=\"Flow_0vajlrg_di\" bpmnElement=\"Flow_0vajlrg\">\n" +
+ " <di:waypoint x=\"600\" y=\"258\" />\n" +
+ " <di:waypoint x=\"630\" y=\"258\" />\n" +
+ " <di:waypoint x=\"630\" y=\"370\" />\n" +
+ " <di:waypoint x=\"660\" y=\"370\" />\n" +
+ " </bpmndi:BPMNEdge>\n" +
+ " <bpmndi:BPMNEdge id=\"Flow_1gyk5nu_di\" bpmnElement=\"Flow_1gyk5nu\">\n" +
+ " <di:waypoint x=\"448\" y=\"258\" />\n" +
+ " <di:waypoint x=\"500\" y=\"258\" />\n" +
+ " </bpmndi:BPMNEdge>\n" +
+ " <bpmndi:BPMNShape id=\"Activity_1kyok5a_di\" bpmnElement=\"Activity_0d63gnp\">\n" +
+ " <dc:Bounds x=\"500\" y=\"218\" width=\"100\" height=\"80\" />\n" +
+ " </bpmndi:BPMNShape>\n" +
+ " <bpmndi:BPMNShape id=\"Event_09dr7i8_di\" bpmnElement=\"Event_1wbhsi9\">\n" +
+ " <dc:Bounds x=\"922\" y=\"352\" width=\"36\" height=\"36\" />\n" +
+ " <bpmndi:BPMNLabel>\n" +
+ " <dc:Bounds x=\"919\" y=\"395\" width=\"43\" height=\"14\" />\n" +
+ " </bpmndi:BPMNLabel>\n" +
+ " </bpmndi:BPMNShape>\n" +
+ " <bpmndi:BPMNShape id=\"Event_1ng8kt4_di\" bpmnElement=\"StartEvent_1\">\n" +
+ " <dc:Bounds x=\"412\" y=\"240\" width=\"36\" height=\"36\" />\n" +
+ " <bpmndi:BPMNLabel>\n" +
+ " <dc:Bounds x=\"419\" y=\"283\" width=\"22\" height=\"14\" />\n" +
+ " </bpmndi:BPMNLabel>\n" +
+ " </bpmndi:BPMNShape>\n" +
+ " <bpmndi:BPMNShape id=\"Activity_0zilrzy_di\" bpmnElement=\"Activity_0zilrzy\">\n" +
+ " <dc:Bounds x=\"660\" y=\"330\" width=\"100\" height=\"80\" />\n" +
+ " </bpmndi:BPMNShape>\n" +
+ " </bpmndi:BPMNPlane>\n" +
+ " </bpmndi:BPMNDiagram>\n" +
+ "</bpmn2:definitions>";
+ }
+
}
--
Gitblit v1.8.0