清除无用的显示ncprogram的内容代码

yangys

2025-08-05 4f91b953e8f0ae7c63aea01a57367b6b57639a7f

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

@@ -11,6 +11,7 @@
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.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
@@ -43,6 +44,10 @@

   private final IdentityService identityService;

   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;

   /**
    * 固化流程的key
    */
@@ -51,16 +56,18 @@


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

   /**
    * 启动一个数控程序的固化流程
    * @param programPackage 程序包名 节点实体
    */
   public void startOne(NcNode programPackage) {
   public void startOne(NcNode programPackage,List<FlowProgramFile> flowProgramFiles) {
      Map<String, Object> vars = null;
      //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      if(programPackage.getProcessInstanceId() != null) {
@@ -70,45 +77,76 @@
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            vars = new HashMap<>(instance.getProcessVariables());
            vars.remove("proessInstanceId");
         }

      }
      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();
         }
      //查找历史实际的审批人
      List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
         .orderByTaskCreateTime().desc().processInstanceId(programPackage.getProcessInstanceId())
         .list();
      fillHistoryAssignees(vars, historicTasks);

      }*/
      //vars.put("programmer",programmer);
      //vars.put("checker",checker);
      //vars.put("senior",senior);

      String businessKey = "0";//业务表key

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

      //更新文件的流程实例id，并入库
      flowProgramFiles.forEach(flowProgramFile -> {
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
         this.flowProgramFileService.save(flowProgramFile);
      });
      log.info("启动固化流程完成，实例id={}", inst.getId());
   }

   /**
    * 填充历史审批人，从试切流程中查找
    * @param vars 找到审批人后填充的map
    * @param historicTasks 历史任务集合
    */
   void fillHistoryAssignees(Map<String, Object> vars,List<HistoricTaskInstance> historicTasks){
      String programmer = null;
      String checker = null;
      String senior = null;

      //找不到工艺员，那么查询最后一个审批的工艺员

      for (HistoricTaskInstance task : historicTasks) {
         // 获取任务的办理人
         if (task.getTaskDefinitionKey().equals("programmingTask")) {
            //编制
            if (programmer == null) {
               programmer = task.getAssignee();
            }
         } else if (task.getTaskDefinitionKey().equals("check")) {
            //校对
            if (checker == null) {
               checker = task.getAssignee();
            }

         } else if (task.getTaskDefinitionKey().equals("approveTask")) {
            //审核
            if (senior == null) {
               senior = task.getAssignee();
            }
         }

      }

      vars.put("programmer",programmer);
      vars.put("checker",checker);
      vars.put("senior",senior);
   }
   /**
    * 将程序按照机器代码分组
    * @param ncProgramIdList
    * @return