From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
index ceb4682..6e66aae 100755
--- a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
@@ -7,11 +7,11 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.user.UserDto;
-import com.java110.dto.workflow.WorkflowAuditInfoDto;
-import com.java110.dto.workflow.WorkflowDto;
-import com.java110.dto.workflow.WorkflowModelDto;
-import com.java110.dto.workflow.WorkflowStepDto;
-import com.java110.dto.workflow.WorkflowStepStaffDto;
+import com.java110.dto.oaWorkflow.WorkflowAuditInfoDto;
+import com.java110.dto.oaWorkflow.WorkflowDto;
+import com.java110.dto.oaWorkflow.WorkflowModelDto;
+import com.java110.dto.oaWorkflow.WorkflowStepDto;
+import com.java110.dto.oaWorkflow.WorkflowStepStaffDto;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.Base64Convert;
@@ -39,19 +39,11 @@
import org.activiti.engine.repository.Model;
import org.activiti.engine.task.Comment;
import org.activiti.image.ProcessDiagramGenerator;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.PNGTranscoder;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
@@ -366,7 +358,12 @@
process.addFlowElement(createSequenceFlow("userTask" + y + u, "parallelGateway-join" + y, "userTask-parallelGateway-join", ""));
if (u == (userList.size() - 1)) {
if (y == (workflowStepDtos.size() - 1)) {
- process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", ""));
+ if("Y".equals(workflowDto.getStartNodeFinish())){ //闇�瑕佹彁浜よ�呯‘璁�
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", ""));
+ }else {
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "endEvent", "parallelGateway-join-endEvent" + y, "${flag=='true'}"));
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "tparallelGateway-join-repulse" + y, "${flag=='false'}"));
+ }
} else {
process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", "${flag=='false'}"));
}
@@ -405,7 +402,12 @@
}*/
process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "repulse" + y + "endEvent", "${flag=='false'}"));
if (y == (workflowStepDtos.size() - 1)) {
- process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, ""));
+ if("Y".equals(workflowDto.getStartNodeFinish())){ //闇�瑕佹彁浜よ�呯‘璁�
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, ""));
+ }else {
+ process.addFlowElement(createSequenceFlow("task" + y, "endEvent", "task-endEvent" + y, "${flag=='true'}"));
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
+ }
} else {
process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
}
@@ -421,22 +423,7 @@
Deployment deployment = processEngine.getRepositoryService().createDeployment()
.addBpmnModel(process.getId() + ".bpmn", model).name(process.getId() + "_deployment").deploy();
workflowDto.setProcessDefinitionKey(deployment.getId());
- // // 4. 鍚姩涓�涓祦绋嬪疄渚�
-// ProcessInstance processInstance = processEngine.getRuntimeService().startProcessInstanceByKey(process.getId());
-//
-// // 5. 鑾峰彇娴佺▼浠诲姟
-// List<Task> tasks = processEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).list();
-// try{
-// // 6. 灏嗘祦绋嬪浘淇濆瓨鍒版湰鍦版枃浠�
-// InputStream processDiagram = processEngine.getRepositoryService().getProcessDiagram(processInstance.getProcessDefinitionId());
-// FileUtils.copyInputStreamToFile(processDiagram, new File("/deployments/"+process.getId()+".png"));
-//
-// // 7. 淇濆瓨BPMN.xml鍒版湰鍦版枃浠�
-// InputStream processBpmn = processEngine.getRepositoryService().getResourceAsStream(deployment.getId(), process.getId()+".bpmn");
-// FileUtils.copyInputStreamToFile(processBpmn,new File("/deployments/"+process.getId()+".bpmn"));
-// }catch (Exception e){
-// e.printStackTrace();
-// }
+
} catch (Exception e) {
logger.error("閮ㄧ讲宸ヤ綔娴佸け璐�", e);
}
--
Gitblit v1.8.0