From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 122 ++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 30 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
old mode 100644
new mode 100755
index b874fd8..314b6bc
--- 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
@@ -1,23 +1,34 @@
package com.java110.common.smo.impl;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.java110.common.dao.IWorkflowServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.intf.common.IWorkflowInnerServiceSMO;
-import com.java110.intf.user.IUserInnerServiceSMO;
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.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.activiti.bpmn.BpmnAutoLayout;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.bpmn.model.EndEvent;
+import org.activiti.bpmn.model.ExclusiveGateway;
+import org.activiti.bpmn.model.FlowNode;
+import org.activiti.bpmn.model.ParallelGateway;
import org.activiti.bpmn.model.Process;
-import org.activiti.bpmn.model.*;
+import org.activiti.bpmn.model.SequenceFlow;
+import org.activiti.bpmn.model.StartEvent;
+import org.activiti.bpmn.model.UserTask;
+import org.activiti.editor.constants.ModelDataJsonConstants;
import org.activiti.engine.*;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.history.HistoricActivityInstanceQuery;
@@ -25,14 +36,22 @@
import org.activiti.engine.impl.RepositoryServiceImpl;
import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
import org.activiti.engine.repository.Deployment;
+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.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+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;
@@ -70,6 +89,9 @@
@Autowired
private TaskService taskService;
+
+ @Autowired
+ private ObjectMapper objectMapper;
@Override
public List<WorkflowDto> queryWorkflows(@RequestBody WorkflowDto workflowDto) {
@@ -344,7 +366,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'}"));
}
@@ -383,7 +410,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'}"));
}
@@ -399,22 +431,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);
}
@@ -524,18 +541,18 @@
HistoricProcessInstance hisProcessInstance = (HistoricProcessInstance) historyService
.createHistoricProcessInstanceQuery()
.processInstanceBusinessKey(workflowAuditInfoDto.getBusinessKey()).singleResult();
- // 璇ユ祦绋嬪疄渚嬬殑鎵�鏈夎妭鐐瑰鎵硅褰�
- List<HistoricActivityInstance> hisActInstList = getHisUserTaskActivityInstanceList(hisProcessInstance
- .getId());
+ List<HistoricActivityInstance> hisActInstList = new ArrayList<>();
+ if (hisProcessInstance != null) {
+ // 璇ユ祦绋嬪疄渚嬬殑鎵�鏈夎妭鐐瑰鎵硅褰�
+ hisActInstList = getHisUserTaskActivityInstanceList(hisProcessInstance
+ .getId());
+ }
List<WorkflowAuditInfoDto> workflowAuditInfoDtos = new ArrayList<>();
WorkflowAuditInfoDto tmpWorkflowAuditInfoDto = null;
for (Iterator iterator = hisActInstList.iterator(); iterator.hasNext(); ) {
// 闇�瑕佽浆鎹㈡垚HistoricActivityInstance
HistoricActivityInstance activityInstance = (HistoricActivityInstance) iterator
.next();
-// if (activityInstance.getEndTime() == null) {
-// continue;
-// }
tmpWorkflowAuditInfoDto = new WorkflowAuditInfoDto();
tmpWorkflowAuditInfoDto.setAuditName(activityInstance.getActivityName());
@@ -566,6 +583,49 @@
}
return workflowAuditInfoDtos;
}
+
+ @Override
+ public WorkflowModelDto createModel(@RequestBody WorkflowModelDto workflowModelDto) {
+ logger.info("鍒涘缓妯″瀷鍏ュ弬name锛歿},key:{}", workflowModelDto.getName(), workflowModelDto.getKey());
+ Model model = repositoryService.newModel();
+ ObjectNode modelNode = objectMapper.createObjectNode();
+ modelNode.put(ModelDataJsonConstants.MODEL_NAME, workflowModelDto.getName());
+ modelNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, "");
+ modelNode.put(ModelDataJsonConstants.MODEL_REVISION, 1);
+ model.setName(workflowModelDto.getName());
+ model.setKey(workflowModelDto.getKey());
+ model.setMetaInfo(modelNode.toString());
+ repositoryService.saveModel(model);
+ createObjectNode(model.getId());
+ logger.info("鍒涘缓妯″瀷缁撴潫锛岃繑鍥炴ā鍨婭D锛歿}", model.getId());
+ workflowModelDto.setModelId(model.getId());
+ return workflowModelDto;
+ }
+
+
+ /**
+ * 鍒涘缓妯″瀷鏃跺畬鍠凪odelEditorSource
+ *
+ * @param modelId
+ */
+ @SuppressWarnings("deprecation")
+ private void createObjectNode(String modelId) {
+ logger.info("鍒涘缓妯″瀷瀹屽杽ModelEditorSource鍏ュ弬妯″瀷ID锛歿}", modelId);
+ ObjectNode editorNode = objectMapper.createObjectNode();
+ editorNode.put("id", "canvas");
+ editorNode.put("resourceId", "canvas");
+ ObjectNode stencilSetNode = objectMapper.createObjectNode();
+ stencilSetNode.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
+ editorNode.put("stencilset", stencilSetNode);
+ try {
+ repositoryService.addModelEditorSource(modelId, editorNode.toString().getBytes("utf-8"));
+ } catch (Exception e) {
+ logger.info("鍒涘缓妯″瀷鏃跺畬鍠凪odelEditorSource鏈嶅姟寮傚父锛歿}", e);
+ }
+ logger.info("鍒涘缓妯″瀷瀹屽杽ModelEditorSource缁撴潫");
+ }
+
+
/**
* @param processInstanceId
@@ -617,4 +677,6 @@
}
return diffTime;
}
+
+
}
--
Gitblit v1.8.0