增加临时流程处理

yangys

2025-08-20 51054f0da5dd4718212064510fff045815388b90

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

@@ -5,29 +5,24 @@
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 固化流程服务
@@ -40,74 +35,85 @@
   private final RuntimeService runtimeService;

   private final HistoryService historyService;

   private final TaskService taskService;
   private final IdentityService identityService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;
   private final ProduceDivisionService produceDivisionService;
   private final MachineService machineService;


   /**
    * 固化流程的key
    * 启动固化流程
    */
   private static final String PROCESS_KEY = "program-cure";



   @Transactional
   public void startCure(List<NcNode> programPackageList) {
      //根据分组启动流程，并插入关联表
      programPackageList.forEach(this::startOne);
   public void startCureNew(Map<Long, List<FlowProgramFile>> pkgIdFileMap) {
      pkgIdFileMap.forEach(this::startOneNew);
   }

   /**
    * 启动一个数控程序的固化流程
    * @param programPackage 程序包名 节点实体
    * 启动一调程序的固化流程
    * @param nodeId
    * @param fileList
    */
   public void startOne(NcNode programPackage) {
      Map<String, Object> vars = null;
      //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      if(programPackage.getProcessInstanceId() != null) {
         //获取审批用户
         HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
            .processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            vars = new HashMap<>(instance.getProcessVariables());
         }
   private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
      Map<String, Object> vars = new HashMap<>();
      NcNode programPackage = this.ncNodeService.getById(nodeId);

      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //机床型号
      //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
      //机床型号
      Machine machine = machineService.getByCode(programPackage.getMachineCode());
      if(machine != null) {
         vars.put(FlowContants.MACHINE_MODE,machine.getName());
      }
      if(vars == null){
         vars = new HashMap<>();
      }
      /*
      String programmer = null;
      String checker = null;
      String senior = null;

      for (HistoricTaskInstance task : historicTasks) {
         // 获取任务的办理人
         if(task.getTaskDefinitionKey().equals("programmingTask")){
            //编制
            programmer = task.getAssignee();
         }else if(task.getTaskDefinitionKey().equals("check")){
            //校对
            checker = task.getAssignee();
         }else if(task.getTaskDefinitionKey().equals("senior")){
            //审核
            senior = task.getAssignee();
         }
      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
      vars.put(FlowContants.WORKSHOP,workshop);

      }*/
      //vars.put("programmer",programmer);
      //vars.put("checker",checker);
      //vars.put("senior",senior);
      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION, programPackage.getCraftEdition());
      vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());

      String businessKey = "0";//业务表key
      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());

      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());

      ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
      vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
      vars.put(FlowContants.CHECKER,div.getCheckerId());
      vars.put(FlowContants.SENIOR,div.getSeniorId());
      vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());

      vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());


      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
      log.info("启动固化流程完成，实例id={}", pinst.getId());
      //这里需要新建一个同名程序包名，和下属的文件吗，不需要，在dncSendbackService中新建的，这里不处理

      vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题

      vars.put(FlowContants.MY_PROCESS_NAME, "固化流程");

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);

      //更新程序包名节点的流程实例id
      programPackage.setProcessInstanceId(inst.getProcessInstanceId());
      ncNodeService.updateById(programPackage);

      for(FlowProgramFile flowProgramFile : fileList){
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
      }
      this.flowProgramFileService.saveBatch(fileList);

      log.info("启动固化流程完成，实例id={}", inst.getId());
   }

   /**
    * 将程序按照机器代码分组
    * @param ncProgramIdList