现场编制功能适配

yangys

2025-09-17 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java

@@ -13,12 +13,14 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
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.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -35,9 +37,7 @@

   private final StartDispatcher dispatcher;

   private final TaskService taskService;
   private final RuntimeService runtimeService;
   private final FlowProgramFileService flowProgramFileService;


   private final TryFlowCompleteService tryFlowCompleteService;
@@ -57,21 +57,22 @@
         boolean isDuplicate = taskDispatchService.checkIsDuplicate(startVO);

         TaskDispatch dispatch = taskDispatchService.saveTask(startVO,isDuplicate);
         startVO.setCreateUser(dispatch.getCreateUser());
         if(isDuplicate){
            throw new ServiceException("重复派工");
         }

         try {
            String instId = dispatcher.start(startVO);
            FlowStartResult result = dispatcher.start(startVO);
            dispatch.setStatus(TaskDispatch.STATUS_STARTED);
            dispatch.setProcessInstanceId(instId);
            dispatch.setProcessInstanceId(result.getProcessInstanceId());
            dispatch.setProgramNo(result.getProgramNo());
            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() {
@@ -109,7 +110,7 @@
      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));
         String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowVariableContants.IS_TEMP_FLOW));
         if(FlowContants.N.equals(isTempFlow)){
            return tryFlowCompleteService;
         }else{
@@ -171,16 +172,18 @@
      }catch(Exception e){
         return R.fail(e.getMessage());
      }
   }

   @Operation(summary = "编程员现场编制批量处理", description = "编程员现场编制批量处理")
   @PostMapping("batch-program-on-machine")
   public R<Void> batchProgramOnMachine(@RequestBody BatchDispatchVO batchDispatchVO) {
      try {
         dispatchService.batchProgramOnMachine(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);

   }*/
}