From bdcb64f0293f27e2dfb3de12a60f6e8412cb962b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 五月 2022 01:45:22 +0800
Subject: [PATCH] 退费修改为 从证书地址中获取
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 175 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 36 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 0fbbbef..31517fa
--- 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,16 +1,19 @@
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.core.smo.common.IWorkflowInnerServiceSMO;
-import com.java110.core.smo.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;
@@ -25,30 +28,35 @@
import org.activiti.bpmn.model.SequenceFlow;
import org.activiti.bpmn.model.StartEvent;
import org.activiti.bpmn.model.UserTask;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.ProcessEngines;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.*;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.history.HistoricActivityInstanceQuery;
import org.activiti.engine.history.HistoricProcessInstance;
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;
import java.util.ArrayList;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -81,6 +89,9 @@
@Autowired
private TaskService taskService;
+
+ @Autowired
+ private ObjectMapper objectMapper;
@Override
public List<WorkflowDto> queryWorkflows(@RequestBody WorkflowDto workflowDto) {
@@ -180,7 +191,7 @@
// 鑾峰彇娴佺▼鍥惧浘鍍忓瓧绗︽祦
ProcessDiagramGenerator pec = processEngine.getProcessEngineConfiguration().getProcessDiagramGenerator();
//閰嶇疆瀛椾綋
- InputStream imageStream = pec.generateDiagram(bpmnModel, "png", executedActivityIdList, flowIds, "瀹嬩綋", "寰蒋闆呴粦", "榛戜綋", null, 2.0);
+ InputStream imageStream = pec.generateDiagram(bpmnModel, "png", executedActivityIdList, flowIds, "瀹嬩綋", "瀹嬩綋", "瀹嬩綋", null, 2.0);
image = Base64Convert.ioToBase64(imageStream);
@@ -251,9 +262,10 @@
public String getWorkflowImage(@RequestBody WorkflowDto workflowDto) {
ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+ String image = "";
List<String> list = processEngine.getRepositoryService()//
.getDeploymentResourceNames(workflowDto.getProcessDefinitionKey());
- String image = "";
+
String resourceName = "";
if (list != null && list.size() > 0) {
for (String name : list) {
@@ -265,6 +277,8 @@
InputStream in = processEngine.getRepositoryService()
.getResourceAsStream(workflowDto.getProcessDefinitionKey(), resourceName);
+
+
try {
image = Base64Convert.ioToBase64(in);
} catch (IOException e) {
@@ -272,6 +286,7 @@
}
return image;
}
+
/**
* @Date锛�2017/11/24
@@ -324,6 +339,7 @@
//缁撴潫鑺傜偣
process.addFlowElement(createEndEvent());
+
//杩炵嚎
for (int y = 0; y < workflowStepDtos.size(); y++) {
WorkflowStepDto step = workflowStepDtos.get(y);
@@ -349,14 +365,18 @@
process.addFlowElement(createSequenceFlow("parallelGateway-fork" + y, "userTask" + y + u, "parallelGateway-fork-userTask" + y + u, ""));
process.addFlowElement(createSequenceFlow("userTask" + y + u, "parallelGateway-join" + y, "userTask-parallelGateway-join", ""));
if (u == (userList.size() - 1)) {
- process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", "${flag=='false'}"));
+ if (y == (workflowStepDtos.size() - 1)) {
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", ""));
+ } else {
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", "${flag=='false'}"));
+ }
process.addFlowElement(createSequenceFlow("repulse" + y, "task" + getNormal(workflowStepDtos, y), "repulse-task" + y, "${flag=='true'}"));
}
}
- //鏈�鍚庝竴涓妭鐐� 骞惰缃戝叧-姹囪仛鍒扮粨鏉熻妭鐐�
- if (y == (workflowStepDtos.size() - 1)) {
- process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "parallelGateway-join-endEvent", "${flag=='false'}"));
- }
+
+
+ process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "parallelGateway-join-endEvent", "${flag=='false'}"));
+
} else {
//鏅�氭祦杞�
//绗竴涓妭鐐�
@@ -375,14 +395,21 @@
}
}
//鏄惁鏈�鍚庝竴涓妭鐐�
- if (y == (workflowStepDtos.size() - 1)) {
+ /* if (y == (workflowStepDtos.size() - 1)) {
//瀹℃牳鑺傜偣鍒扮粨鏉熻妭鐐�
process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "task" + y + "endEvent", "${flag=='false'}"));
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'}"));
+ }*/
+ 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, ""));
+ } else {
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
}
+
process.addFlowElement(createSequenceFlow("repulse" + y, "task" + y, "repulse-task" + y, "${flag=='true'}"));
}
}
@@ -510,6 +537,7 @@
/**
* 鏌ヨ瀹℃牳鍘嗗彶
+ *
* @param workflowAuditInfoDto
* @return
*/
@@ -518,35 +546,91 @@
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());
+ if (activityInstance.getEndTime() != null) {
+ tmpWorkflowAuditInfoDto.setAuditTime(DateUtil.getFormatTimeString(activityInstance.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ tmpWorkflowAuditInfoDto.setStateName("瀹屾垚");
+ tmpWorkflowAuditInfoDto.setState(WorkflowAuditInfoDto.STATE_FINISH);
+ } else {
+ tmpWorkflowAuditInfoDto.setStateName("姝ｅ湪澶勭悊");
+ tmpWorkflowAuditInfoDto.setState(WorkflowAuditInfoDto.STATE_NO);
}
+ Long time = activityInstance.getDurationInMillis() == null ? new Date().getTime() - activityInstance.getStartTime().getTime()
+ : activityInstance.getDurationInMillis();
+ tmpWorkflowAuditInfoDto.setDuration(getCostTime(time));
+
//濡傛灉杩樻病缁撴潫鍒欎笉鏀鹃噷闈�
List<Comment> comments = taskService.getTaskComments(activityInstance.getTaskId());
- if (comments == null || comments.size() < 1) {
- continue;
+ String msg = "";
+ if (comments != null && comments.size() > 0) {
+ for (Comment comment : comments) {
+ msg += (comment.getFullMessage() + "/");
+ }
}
- for (Comment comment : comments) {
- tmpWorkflowAuditInfoDto = new WorkflowAuditInfoDto();
- tmpWorkflowAuditInfoDto.setAuditName(activityInstance.getActivityName());
- tmpWorkflowAuditInfoDto.setAuditTime(DateUtil.getFormatTimeString(activityInstance.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
- tmpWorkflowAuditInfoDto.setDuration(activityInstance.getDurationInMillis() + "");
- tmpWorkflowAuditInfoDto.setUserId(comment.getUserId());
- tmpWorkflowAuditInfoDto.setMessage(comment.getFullMessage());
- workflowAuditInfoDtos.add(tmpWorkflowAuditInfoDto);
- }
+ msg = msg.endsWith("/") ? msg.substring(0, msg.length() - 1) : msg;
+ tmpWorkflowAuditInfoDto.setUserId(activityInstance.getAssignee());
+ tmpWorkflowAuditInfoDto.setMessage(msg);
+ workflowAuditInfoDtos.add(tmpWorkflowAuditInfoDto);
}
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
@@ -555,13 +639,15 @@
* @ReturnType:List
* @CreateDate:2014-6-25涓嬪崍5:03:13
* @UseFor :鍦� ACT_HI_ACTINST 琛ㄤ腑鎵惧埌瀵瑰簲娴佺▼瀹炰緥鐨剈serTask鑺傜偣 涓嶅寘鎷瑂tartEvent
+ * <p>
+ * .finished()
*/
private List<HistoricActivityInstance> getHisUserTaskActivityInstanceList(
String processInstanceId) {
List<HistoricActivityInstance> hisActivityInstanceList = ((HistoricActivityInstanceQuery) historyService
.createHistoricActivityInstanceQuery()
.processInstanceId(processInstanceId).activityType("userTask")
- .finished().orderByHistoricActivityInstanceEndTime().desc())
+ .orderByHistoricActivityInstanceStartTime().asc())
.list();
return hisActivityInstanceList;
}
@@ -581,4 +667,21 @@
public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
}
+
+ public String getCostTime(Long time) {
+ if (time == null) {
+ return "00:00";
+ }
+ long hours = time / (1000 * 60 * 60);
+ long minutes = (time - hours * (1000 * 60 * 60)) / (1000 * 60);
+ String diffTime = "";
+ if (minutes < 10) {
+ diffTime = hours + ":0" + minutes;
+ } else {
+ diffTime = hours + ":" + minutes;
+ }
+ return diffTime;
+ }
+
+
}
--
Gitblit v1.8.0