From e36e8f77581314541b27bcf43dd99bbc2c916255 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 13:36:12 +0800
Subject: [PATCH] fix 修复 satoken dao层获取timeout为秒导致丢失毫秒进度问题(临时修复 等satoken官方解决)
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
index 7906287..7c5377e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java
@@ -156,10 +156,47 @@
if (!(targetFlowElement instanceof UserTask) && !subtask) {
throw new ServerException("寮�濮嬭妭鐐瑰悗绗竴涓妭鐐瑰繀椤绘槸鐢ㄦ埛浠诲姟锛�");
}
-
+ //寮�濮嬭妭鐐瑰悗绗竴涓妭鐐圭敵璇蜂汉鑺傜偣
+ if ((targetFlowElement instanceof UserTask) && !subtask) {
+ UserTask userTask = (UserTask) targetFlowElement;
+ if (StringUtils.isBlank(userTask.getFormKey())) {
+ throw new ServerException("鐢宠浜鸿妭鐐瑰繀椤婚�夋嫨琛ㄥ崟锛�");
+ }
+ }
List<EndEvent> endEventList = flowElements.stream().filter(EndEvent.class::isInstance).map(EndEvent.class::cast).collect(Collectors.toList());
if (CollUtil.isEmpty(endEventList)) {
throw new ServerException(subtask ? "瀛愭祦绋嬪繀椤诲瓨鍦ㄧ粨鏉熻妭鐐癸紒" : "蹇呴』瀛樺湪缁撴潫鑺傜偣锛�");
+ }
+ }
+
+ /**
+ * 鑾峰彇娴佺▼鍏ㄩ儴鐢ㄦ埛鑺傜偣
+ *
+ * @param processDefinitionId 娴佺▼瀹氫箟id
+ */
+ public static List<UserTask> getUserTaskFlowElements(String processDefinitionId) {
+ BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId);
+ List<UserTask> list = new ArrayList<>();
+ List<Process> processes = bpmnModel.getProcesses();
+ Collection<FlowElement> flowElements = processes.get(0).getFlowElements();
+ buildUserTaskFlowElements(flowElements, list);
+ return list;
+ }
+
+ /**
+ * 閫掑綊鑾峰彇鎵�鏈夎妭鐐�
+ *
+ * @param flowElements 鑺傜偣淇℃伅
+ * @param list 闆嗗悎
+ */
+ private static void buildUserTaskFlowElements(Collection<FlowElement> flowElements, List<UserTask> list) {
+ for (FlowElement flowElement : flowElements) {
+ if (flowElement instanceof SubProcess) {
+ Collection<FlowElement> subFlowElements = ((SubProcess) flowElement).getFlowElements();
+ buildUserTaskFlowElements(subFlowElements, list);
+ } else if (flowElement instanceof UserTask) {
+ list.add((UserTask) flowElement);
+ }
}
}
@@ -233,4 +270,20 @@
FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(taskDefinitionKey);
return flowNode instanceof UserTask;
}
+
+ /**
+ * 鑾峰彇鐢宠浜鸿妭鐐�
+ *
+ * @param processDefinitionId 娴佺▼瀹氫箟id
+ * @return 缁撴灉
+ */
+ public static UserTask getApplyUserTask(String processDefinitionId) {
+ BpmnModel bpmnModel = PROCESS_ENGINE.getRepositoryService().getBpmnModel(processDefinitionId);
+ Collection<FlowElement> flowElements = bpmnModel.getMainProcess().getFlowElements();
+ List<StartEvent> startEventList = flowElements.stream().filter(StartEvent.class::isInstance).map(StartEvent.class::cast).collect(Collectors.toList());
+ StartEvent startEvent = startEventList.get(0);
+ List<SequenceFlow> outgoingFlows = startEvent.getOutgoingFlows();
+ FlowElement targetFlowElement = outgoingFlows.get(0).getTargetFlowElement();
+ return (UserTask) targetFlowElement;
+ }
}
--
Gitblit v1.9.3