lbqms.git - Gitblit

			@@ -3,11 +3,12 @@
			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.codec.Base64;
			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.convert.Convert;
			import cn.hutool.core.io.IoUtil;
			import cn.hutool.core.util.ObjectUtil;
			import lombok.RequiredArgsConstructor;
			import lombok.SneakyThrows;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.io.IOUtils;
			import org.dromara.common.core.exception.ServiceException;
			import org.dromara.common.core.utils.StreamUtils;
			import org.dromara.common.core.utils.StringUtils;
			@@ -52,7 +53,6 @@
			import org.springframework.transaction.annotation.Transactional;

			import java.awt.*;
			import java.io.IOException;
			import java.io.InputStream;
			import java.nio.charset.StandardCharsets;
			import java.util.List;
			@@ -236,7 +236,7 @@
			BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
			CustomDefaultProcessDiagramGenerator diagramGenerator = new CustomDefaultProcessDiagramGenerator();
			InputStream inputStream = diagramGenerator.generateDiagram(bpmnModel, "png", highLightedNodeList, highLightedFlows, activityFontName, labelFontName, annotationFontName, null, 1.0, true);
			return Base64.encode(IOUtils.toByteArray(inputStream));
			return Base64.encode(IoUtil.readBytes(inputStream));
			}

			/**
			@@ -282,14 +282,9 @@
			map.put("taskList", taskList);
			List<ActHistoryInfoVo> historyTaskList = getHistoryTaskList(processInstanceId);
			map.put("historyList", historyTaskList);
			InputStream inputStream;
			try {
			inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
			xml.append(IOUtils.toString(inputStream, String.valueOf(StandardCharsets.UTF_8)));
			map.put("xml", xml.toString());
			} catch (IOException e) {
			e.printStackTrace();
			}
			InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
			xml.append(IoUtil.read(inputStream, StandardCharsets.UTF_8));
			map.put("xml", xml.toString());
			return map;
			}

			@@ -306,7 +301,6 @@
			for (HistoricTaskInstance historicTaskInstance : list) {
			ActHistoryInfoVo actHistoryInfoVo = new ActHistoryInfoVo();
			BeanUtils.copyProperties(historicTaskInstance, actHistoryInfoVo);
			actHistoryInfoVo.setAssignee(StringUtils.isNotBlank(historicTaskInstance.getAssignee()) ? Long.valueOf(historicTaskInstance.getAssignee()) : null);
			actHistoryInfoVo.setStatus(actHistoryInfoVo.getEndTime() == null ? "待处理" : "已处理");
			if (ObjectUtil.isNotEmpty(historicTaskInstance.getDurationInMillis())) {
			actHistoryInfoVo.setRunDuration(getDuration(historicTaskInstance.getDurationInMillis()));
			@@ -324,6 +318,12 @@
			historyInfoVo.setStartTime(e.getStartTime());
			historyInfoVo.setEndTime(null);
			historyInfoVo.setRunDuration(null);
			if (ObjectUtil.isEmpty(e.getAssignee())) {
			ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(e.getId());
			if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) {
			historyInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr));
			}
			}
			});
			historyInfoVoList.add(historyInfoVo);
			}
			@@ -362,16 +362,18 @@
			if (ObjectUtil.isNotEmpty(historicTaskInstance.getDurationInMillis())) {
			actHistoryInfoVo.setRunDuration(getDuration(historicTaskInstance.getDurationInMillis()));
			}
			try {
			actHistoryInfoVo.setAssignee(StringUtils.isNotBlank(historicTaskInstance.getAssignee()) ? Long.valueOf(historicTaskInstance.getAssignee()) : null);
			} catch (NumberFormatException ignored) {
			log.warn("当前任务【{}】,办理人转换人员ID【{}】异常！", historicTaskInstance.getName(), historicTaskInstance.getAssignee());
			}
			//附件
			if (CollUtil.isNotEmpty(attachmentList)) {
			List<Attachment> attachments = attachmentList.stream().filter(e -> e.getTaskId().equals(historicTaskInstance.getId())).collect(Collectors.toList());
			if (CollUtil.isNotEmpty(attachments)) {
			actHistoryInfoVo.setAttachmentList(attachments);
			}
			}
			//设置人员id
			if (ObjectUtil.isEmpty(historicTaskInstance.getAssignee())) {
			ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(historicTaskInstance.getId());
			if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) {
			actHistoryInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr));
			}
			}
			actHistoryInfoVoList.add(actHistoryInfoVo);
			@@ -389,10 +391,6 @@
			Map<String, List<ActHistoryInfoVo>> groupByKey = StreamUtils.groupByKey(actHistoryInfoVoList, ActHistoryInfoVo::getTaskDefinitionKey);
			for (Map.Entry<String, List<ActHistoryInfoVo>> entry : groupByKey.entrySet()) {
			ActHistoryInfoVo actHistoryInfoVo = BeanUtil.toBean(entry.getValue().get(0), ActHistoryInfoVo.class);
			String nickName = entry.getValue().stream().filter(e -> StringUtils.isNotBlank(e.getNickName()) && e.getEndTime() == null).map(ActHistoryInfoVo::getNickName).toList().stream().distinct().collect(Collectors.joining(StringUtils.SEPARATOR));
			if (StringUtils.isNotBlank(nickName)) {
			actHistoryInfoVo.setNickName(nickName);
			}
			actHistoryInfoVoList.stream().filter(e -> e.getTaskDefinitionKey().equals(entry.getKey()) && e.getEndTime() != null).findFirst()
			.ifPresent(e -> {
			actHistoryInfoVo.setStatus("已处理");