From 343de424ab52d06c058c9da9dd6ae6f5ffc8ffb6 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 31 三月 2024 15:51:21 +0800
Subject: [PATCH] update 调整流程定义配置注释
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java | 90 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
index 6f75fb9..3d867f0 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
@@ -23,13 +23,10 @@
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.ActHiProcinst;
import org.dromara.workflow.domain.ActHiTaskinst;
-import org.dromara.workflow.domain.vo.MultiInstanceVo;
-import org.dromara.workflow.domain.vo.ParticipantVo;
-import org.dromara.workflow.domain.vo.ProcessInstanceVo;
+import org.dromara.workflow.domain.vo.*;
import org.dromara.workflow.flowable.cmd.UpdateHiTaskInstCmd;
import org.dromara.workflow.mapper.ActHiTaskinstMapper;
-import org.dromara.workflow.service.IActHiProcinstService;
-import org.dromara.workflow.service.IWorkflowUserService;
+import org.dromara.workflow.service.*;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.FlowNode;
import org.flowable.common.engine.api.delegate.Expression;
@@ -44,7 +41,7 @@
import java.util.*;
-import static org.dromara.workflow.common.constant.FlowConstant.PROCESS_INSTANCE_VO;
+import static org.dromara.workflow.common.constant.FlowConstant.*;
/**
* 宸ヤ綔娴佸伐鍏�
@@ -58,6 +55,8 @@
private static final IWorkflowUserService WORKFLOW_USER_SERVICE = SpringUtils.getBean(IWorkflowUserService.class);
private static final IActHiProcinstService ACT_HI_PROCINST_SERVICE = SpringUtils.getBean(IActHiProcinstService.class);
private static final ActHiTaskinstMapper ACT_HI_TASKINST_MAPPER = SpringUtils.getBean(ActHiTaskinstMapper.class);
+ private static final IWfDefinitionConfigService I_WF_DEFINITION_CONFIG_SERVICE = SpringUtils.getBean(IWfDefinitionConfigService.class);
+ private static final IWfFormManageService I_WF_FORM_MANAGE_SERVICE = SpringUtils.getBean(IWfFormManageService.class);
/**
* 鍒涘缓涓�涓柊浠诲姟
@@ -95,6 +94,7 @@
*/
public static void createCopyTask(List<Task> parentTaskList, List<Long> userIds) {
List<Task> list = new ArrayList<>();
+ String tenantId = TenantHelper.getTenantId();
for (Task parentTask : parentTaskList) {
for (Long userId : userIds) {
TaskEntity newTask = (TaskEntity) PROCESS_ENGINE.getTaskService().newTask();
@@ -104,7 +104,7 @@
newTask.setProcessDefinitionId(parentTask.getProcessDefinitionId());
newTask.setProcessInstanceId(parentTask.getProcessInstanceId());
newTask.setTaskDefinitionKey(parentTask.getTaskDefinitionKey());
- newTask.setTenantId(TenantHelper.getTenantId());
+ newTask.setTenantId(tenantId);
list.add(newTask);
}
}
@@ -117,7 +117,7 @@
actHiTaskinst.setProcDefId(processDefinitionId);
actHiTaskinst.setProcInstId(processInstanceId);
actHiTaskinst.setScopeType(TaskStatusEnum.COPY.getStatus());
- actHiTaskinst.setTenantId(TenantHelper.getTenantId());
+ actHiTaskinst.setTenantId(tenantId);
LambdaUpdateWrapper<ActHiTaskinst> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(ActHiTaskinst::getId, taskIds);
ACT_HI_TASKINST_MAPPER.update(actHiTaskinst, updateWrapper);
@@ -169,11 +169,10 @@
List<String> nickNames = StreamUtils.toList(sysUsers, SysUserVo::getNickName);
participantVo.setCandidate(userIds);
participantVo.setCandidateName(nickNames);
- if (StringUtils.isBlank(task.getAssignee()) && CollUtil.isNotEmpty(candidateList) && candidateList.size() > 1) {
- participantVo.setClaim(false);
- }
- if (!StringUtils.isBlank(task.getAssignee()) && CollUtil.isNotEmpty(candidateList) && candidateList.size() > 1) {
- participantVo.setClaim(true);
+ // 鍒ゆ柇褰撳墠浠诲姟鏄惁鍏锋湁澶氫釜鍔炵悊浜�
+ if (CollUtil.isNotEmpty(candidateList) && candidateList.size() > 1) {
+ // 濡傛灉 assignee 瀛樺湪锛屽垯璁剧疆褰撳墠浠诲姟宸茬粡琚棰�
+ participantVo.setClaim(StringUtils.isNotBlank(task.getAssignee()));
}
}
}
@@ -241,7 +240,7 @@
* @param businessKey 涓氬姟id
*/
public static void setProcessInstanceVo(Object obj, String businessKey) {
- if (StringUtils.isBlank(businessKey)) {
+ if (StringUtils.isBlank(businessKey) || obj == null) {
return;
}
ActHiProcinst actHiProcinst = ACT_HI_PROCINST_SERVICE.selectByBusinessKey(businessKey);
@@ -264,7 +263,7 @@
* @param fieldName 涓婚敭灞炴�у悕绉�
*/
public static void setProcessInstanceListVo(Object obj, List<String> idList, String fieldName) {
- if (CollUtil.isEmpty(idList)) {
+ if (CollUtil.isEmpty(idList) || obj == null) {
return;
}
List<ActHiProcinst> actHiProcinstList = ACT_HI_PROCINST_SERVICE.selectByBusinessKeyIn(idList);
@@ -292,6 +291,40 @@
}
}
}
+
+ /**
+ * 璁剧疆娴佺▼娴佺▼瀹氫箟閰嶇疆
+ *
+ * @param obj 涓氬姟瀵硅薄
+ * @param idList 娴佺▼瀹氫箟id
+ * @param fieldName 娴佺▼瀹氫箟ID灞炴�у悕绉�
+ */
+ public static void setWfDefinitionConfigVo(Object obj, List<String> idList, String fieldName) {
+ if (CollUtil.isEmpty(idList) || obj == null) {
+ return;
+ }
+ List<WfDefinitionConfigVo> wfDefinitionConfigVoList = I_WF_DEFINITION_CONFIG_SERVICE.queryList(idList);
+ if (CollUtil.isNotEmpty(wfDefinitionConfigVoList)) {
+ List<Long> formIds = StreamUtils.toList(wfDefinitionConfigVoList, WfDefinitionConfigVo::getFormId);
+ List<WfFormManageVo> wfFormManageVos = I_WF_FORM_MANAGE_SERVICE.queryByIds(formIds);
+ if (CollUtil.isNotEmpty(wfFormManageVos)) {
+ for (WfDefinitionConfigVo wfDefinitionConfigVo : wfDefinitionConfigVoList) {
+ wfFormManageVos.stream().filter(e -> ObjectUtil.equals(wfDefinitionConfigVo.getFormId(), e.getId())).findFirst().ifPresent(wfDefinitionConfigVo::setWfFormManageVo);
+ }
+ }
+ }
+ if (obj instanceof Collection<?> collection) {
+ for (Object o : collection) {
+ String fieldValue = ReflectUtils.invokeGetter(o, fieldName).toString();
+ if (!CollUtil.isEmpty(wfDefinitionConfigVoList)) {
+ wfDefinitionConfigVoList.stream().filter(e -> e.getDefinitionId().equals(fieldValue)).findFirst().ifPresent(e -> {
+ ReflectUtils.invokeSetter(o, WF_DEFINITION_CONFIG_VO, BeanUtil.toBean(e, WfDefinitionConfigVo.class));
+ });
+ }
+ }
+ }
+ }
+
/**
* 鍙戦�佹秷鎭�
@@ -322,17 +355,22 @@
if (CollUtil.isNotEmpty(userIds)) {
List<SysUserVo> sysUserVoList = WORKFLOW_USER_SERVICE.getUserListByIds(new ArrayList<>(userIds));
for (String code : messageType) {
- if (code.equals(MessageTypeEnum.SYSTEM_MESSAGE.getCode())) {
- WebSocketMessageDto dto = new WebSocketMessageDto();
- dto.setSessionKeys(new ArrayList<>(userIds));
- dto.setMessage(message);
- WebSocketUtils.publishMessage(dto);
- }
- if (code.equals(MessageTypeEnum.EMAIL_MESSAGE.getCode())) {
- MailUtils.sendText(StreamUtils.join(sysUserVoList, SysUserVo::getEmail), "鍗曟嵁瀹℃壒鎻愰啋", message);
- }
- if (code.equals(MessageTypeEnum.SMS_MESSAGE.getCode())) {
- //todo 鐭俊鍙戦��
+ MessageTypeEnum messageTypeEnum = MessageTypeEnum.getByCode(code);
+ if (ObjectUtil.isNotEmpty(messageTypeEnum)) {
+ switch (messageTypeEnum) {
+ case SYSTEM_MESSAGE:
+ WebSocketMessageDto dto = new WebSocketMessageDto();
+ dto.setSessionKeys(new ArrayList<>(userIds));
+ dto.setMessage(message);
+ WebSocketUtils.publishMessage(dto);
+ break;
+ case EMAIL_MESSAGE:
+ MailUtils.sendText(StreamUtils.join(sysUserVoList, SysUserVo::getEmail), "鍗曟嵁瀹℃壒鎻愰啋", message);
+ break;
+ case SMS_MESSAGE:
+ //todo 鐭俊鍙戦��
+ break;
+ }
}
}
}
--
Gitblit v1.9.3