From 62a2e9de3754141baeb6fe31909a965b5f7fe125 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 03 六月 2024 15:52:58 +0800
Subject: [PATCH] update 优化 去除WorkflowUtils 工具类无用方法
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java | 81 +++-------------------------------------
1 files changed, 7 insertions(+), 74 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 a620289..d5597fb 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
@@ -1,6 +1,5 @@
package org.dromara.workflow.utils;
-import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -13,21 +12,17 @@
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.reflect.ReflectUtils;
import org.dromara.common.mail.utils.MailUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.websocket.dto.WebSocketMessageDto;
import org.dromara.common.websocket.utils.WebSocketUtils;
import org.dromara.workflow.common.constant.FlowConstant;
-import org.dromara.workflow.common.enums.BusinessStatusEnum;
import org.dromara.workflow.common.enums.MessageTypeEnum;
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.flowable.cmd.UpdateHiTaskInstCmd;
import org.dromara.workflow.mapper.ActHiTaskinstMapper;
import org.dromara.workflow.service.IActHiProcinstService;
@@ -45,8 +40,6 @@
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
import java.util.*;
-
-import static org.dromara.workflow.common.constant.FlowConstant.PROCESS_INSTANCE_VO;
/**
* 宸ヤ綔娴佸伐鍏�
@@ -228,70 +221,11 @@
/**
* 鑾峰彇褰撳墠娴佺▼鐘舵��
*
- * @param processInstanceId 娴佺▼瀹炰緥id
- */
- public static String getBusinessStatus(String processInstanceId) {
- HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInstanceId).singleResult();
- return historicProcessInstance.getBusinessStatus();
- }
-
- /**
- * 璁剧疆娴佺▼瀹炰緥瀵硅薄
- *
- * @param obj 涓氬姟瀵硅薄
* @param businessKey 涓氬姟id
*/
- public static void setProcessInstanceVo(Object obj, String businessKey) {
- if (StringUtils.isBlank(businessKey) || obj == null) {
- return;
- }
- ActHiProcinst actHiProcinst = ACT_HI_PROCINST_SERVICE.selectByBusinessKey(businessKey);
- if (actHiProcinst == null) {
- ProcessInstanceVo processInstanceVo = new ProcessInstanceVo();
- processInstanceVo.setBusinessStatus(BusinessStatusEnum.DRAFT.getStatus());
- ReflectUtils.invokeSetter(obj, PROCESS_INSTANCE_VO, processInstanceVo);
- return;
- }
- ProcessInstanceVo processInstanceVo = BeanUtil.toBean(actHiProcinst, ProcessInstanceVo.class);
- processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(processInstanceVo.getBusinessStatus()));
- ReflectUtils.invokeSetter(obj, PROCESS_INSTANCE_VO, processInstanceVo);
- }
-
- /**
- * 璁剧疆娴佺▼瀹炰緥瀵硅薄
- *
- * @param obj 涓氬姟瀵硅薄
- * @param idList 涓氬姟id
- * @param fieldName 涓婚敭灞炴�у悕绉�
- */
- public static void setProcessInstanceListVo(Object obj, List<String> idList, String fieldName) {
- if (CollUtil.isEmpty(idList) || obj == null) {
- return;
- }
- List<ActHiProcinst> actHiProcinstList = ACT_HI_PROCINST_SERVICE.selectByBusinessKeyIn(idList);
- if (obj instanceof Collection<?> collection) {
- for (Object o : collection) {
- String fieldValue = ReflectUtils.invokeGetter(o, fieldName).toString();
- if (CollUtil.isEmpty(actHiProcinstList)) {
- ProcessInstanceVo processInstanceVo = new ProcessInstanceVo();
- processInstanceVo.setBusinessStatus(BusinessStatusEnum.DRAFT.getStatus());
- processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(processInstanceVo.getBusinessStatus()));
- ReflectUtils.invokeSetter(o, PROCESS_INSTANCE_VO, processInstanceVo);
- } else {
- ActHiProcinst actHiProcinst = actHiProcinstList.stream().filter(e -> e.getBusinessKey().equals(fieldValue)).findFirst().orElse(null);
- if (ObjectUtil.isNotEmpty(actHiProcinst)) {
- ProcessInstanceVo processInstanceVo = BeanUtil.toBean(actHiProcinst, ProcessInstanceVo.class);
- processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(processInstanceVo.getBusinessStatus()));
- ReflectUtils.invokeSetter(o, PROCESS_INSTANCE_VO, processInstanceVo);
- } else {
- ProcessInstanceVo processInstanceVo = new ProcessInstanceVo();
- processInstanceVo.setBusinessStatus(BusinessStatusEnum.DRAFT.getStatus());
- processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(processInstanceVo.getBusinessStatus()));
- ReflectUtils.invokeSetter(o, PROCESS_INSTANCE_VO, processInstanceVo);
- }
- }
- }
- }
+ public static String getBusinessStatus(String businessKey) {
+ HistoricProcessInstance historicProcessInstance = QueryUtils.hisBusinessKeyQuery(businessKey).singleResult();
+ return historicProcessInstance.getBusinessStatus();
}
/**
@@ -346,10 +280,11 @@
/**
* 鏍规嵁浠诲姟id鏌ヨ 褰撳墠鐢ㄦ埛鐨勪换鍔★紝妫�鏌� 褰撳墠浜哄憳 鏄惁鏄 taskId 鐨勫姙鐞嗕汉
+ *
* @param taskId 浠诲姟id
- * @return
+ * @return 缁撴灉
*/
- public static Task getTaskByCurrUser(String taskId){
+ public static Task getTaskByCurrentUser(String taskId) {
TaskQuery taskQuery = QueryUtils.taskQuery();
taskQuery.taskId(taskId).taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId()));
@@ -358,8 +293,6 @@
List<String> groupIds = StreamUtils.toList(roles, e -> String.valueOf(e.getRoleId()));
taskQuery.taskCandidateGroupIn(groupIds);
}
- Task task = taskQuery.singleResult();
-
- return task;
+ return taskQuery.singleResult();
}
}
--
Gitblit v1.9.3