From 5d99227a97b7b244893b748af28e7f78238d2951 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 05 九月 2025 01:15:15 +0800
Subject: [PATCH] 任务提醒，增加导出提醒；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 155 insertions(+), 25 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index 80e0881..8715c3e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -1,56 +1,186 @@
package org.springblade.mdm.flow.controller;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
+import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.service.TaskDispatchService;
+import org.springblade.mdm.flow.service.execute.*;
+import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
import java.util.Map;
@Slf4j
@RestController
+@AllArgsConstructor
@RequestMapping("/flow/dispatch")
@Tag(name = "娲惧伐娴佺▼", description = "娲惧伐娴佺▼")
public class DispatchController {
- @Autowired
- private StartDispatcher dispatcher;
- @Autowired
- private TaskService taskService;
+ private final StartDispatcher dispatcher;
+
+ private final TaskService taskService;
+ private final RuntimeService runtimeService;
+ private final FlowProgramFileService flowProgramFileService;
+
+
+ private final TryFlowCompleteService tryFlowCompleteService;
+ private final DefaultFlowCompleteService defaultFlowCompleteService;
+ private final TaskDispatchService taskDispatchService;
+ private final BatchDispatchService dispatchService;
+ private final ReplaceFlowCompleteService replaceFlowCompleteService;
+ private final TempFlowCompleteService tempFlowCompleteService;
+ private final CureFlowCompleteService cureFlowCompleteService;
/**
- * 鏂板
+ * 鍙戣捣娲惧伐娴佺▼
*/
@PostMapping("/start")
@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
- public R<Boolean> save(@RequestBody TaskAssignVO startVO) {
- dispatcher.start(startVO);
- return R.<Boolean>status(true);
+ public R<Boolean> start(@RequestBody TaskAssignVO startVO) {
+ try {
+ boolean isDuplicate = taskDispatchService.checkIsDuplicate(startVO);
+
+ TaskDispatch dispatch = taskDispatchService.saveTask(startVO,isDuplicate);
+ if(isDuplicate){
+ throw new ServiceException("閲嶅娲惧伐");
+ }
+
+ try {
+ String instId = dispatcher.start(startVO);
+ dispatch.setStatus(TaskDispatch.STATUS_STARTED);
+ dispatch.setProcessInstanceId(instId);
+ taskDispatchService.updateById(dispatch);
+ return R.data(true);
+ } catch (Exception e) {
+ dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
+ dispatch.setErrMsg(e.getMessage());
+ taskDispatchService.updateById(dispatch);
+ //return R.fail("浠诲姟鍚姩寮傚父:"+e.getMessage());
+ return R.fail(new IResultCode() {
+ @Override
+ public String getMessage() {
+ return e.getMessage();
+ }
+
+ @Override
+ public int getCode() {
+ return 201;
+ }
+ });
+ }
+ }catch(Exception e){
+ return R.fail(new IResultCode() {
+ @Override
+ public String getMessage() {
+ return e.getMessage();
+ }
+
+ @Override
+ public int getCode() {
+ return 201;
+ }
+ });
+ }
+
}
- @PostMapping("completeTask")
- public R<Void> completeTask(String taskId, String processInstanceId, String comment, @RequestBody Map<String, Object> variables) {
- // 澧炲姞璇勮
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
+ /**
+ * 鑾峰彇瀹為檯瀹℃壒娴佺▼鎵ц鏈嶅姟
+ * @param processInstanceId
+ * @return
+ */
+ AbstractFlowCompleteService getActualService(String processInstanceId){
+ ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).includeProcessVariables().singleResult();
+ if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)
+ || inst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
+ String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowContants.IS_TEMP_FLOW));
+ if(FlowContants.N.equals(isTempFlow)){
+ return tryFlowCompleteService;
+ }else{
+ return tempFlowCompleteService;
+ }
+ }else if(inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
+ return cureFlowCompleteService;
+ }else if(inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
+ return replaceFlowCompleteService;
+ }else{
+ return defaultFlowCompleteService;
}
- // 闈炵┖鍒ゆ柇
- if (Func.isEmpty(variables)) {
- variables = Kv.create();
- }
- // 瀹屾垚浠诲姟
- taskService.complete(taskId, variables);
- return R.success("娴佺▼鎻愪氦鎴愬姛");
}
+ @Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
+ @PostMapping("completeTask")
+ public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+ try {
+ AbstractFlowCompleteService completeService = getActualService(processInstanceId);
+ completeService.completeTask(taskId, processInstanceId, comment, variables);
+
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+
+ }
+
+ @Operation(summary = "鎵嬪姩鎵归噺娲惧伐", description = "缁勯暱鎵嬪姩鎵归噺娲惧伐")
+ @PostMapping("batchDispatch")
+ public R<Void> batchDispatch(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchDispatchTask(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+
+ @Operation(summary = "鑷姩鎵归噺娲惧伐", description = "缁勯暱鎵归噺娲惧伐锛屽悗绔嚜鍔ㄦ煡鎵惧鐞嗕汉")
+ @PostMapping("batchDispatchAuto")
+ public R<Void> batchDispatchAuto(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchAutoDispatchTask(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+
+ @Operation(summary = "鎵归噺瀹℃壒", description = "楂樺笀鎵归噺瀹℃壒")
+ @PostMapping("batchApprove")
+ public R<Void> batchApprove(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchApprove(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+ /*
+ void addApproveRecord(String taskId,String comment,Map<String, Object> variables){
+ String operateResult = variables.get("approve")+"";
+
+ Task task = taskService.createTaskQuery()
+ .taskId(taskId)
+ .singleResult();
+ approveRecordService.saveApproveRecords(task,operateResult,comment);
+
+ }*/
}
--
Gitblit v1.9.3