工控网涉密网联调

yangys

2025-09-29 4c7296d45efe849dc70a3b2e2240c905481a91c9

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

@@ -6,14 +6,13 @@
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -32,12 +31,9 @@
   private final RuntimeService runtimeService;

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

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

   /**
@@ -59,37 +55,11 @@
      vars.put(FlowConstant.NODE_ID,programPackage.getId());

      flowCommonService.putFlowVariablesByNode(vars,programPackage);
      /*
      vars.put(FlowVariableContants.MACHINE_CODE,programPackage.getMachineCode());

      //机床型号
      Machine machine = machineService.getByCode(programPackage.getMachineCode());
      if(machine != null) {
         vars.put(FlowVariableContants.MACHINE_MODE,machine.getName());
      }

      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
      vars.put(FlowVariableContants.WORKSHOP,workshop);

      vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
      vars.put(FlowVariableContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowVariableContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowVariableContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowVariableContants.CRAFT_EDITION, programPackage.getCraftEdition());
      vars.put(FlowVariableContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowVariableContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());

      vars.put(FlowVariableContants.PRODUCT_MODEL,programPackage.getProductModel());
      vars.put(FlowVariableContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
      */

      flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
      vars.put(FlowVariableConstant.ASSIGNEE,vars.get(FlowVariableConstant.PROGRAMMER));

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人

      vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());


      if(programPackage.getDeviation() != null) {
         vars.put(FlowVariableConstant.MY_PROCESS_NAME, "临时更改单回传");
@@ -109,16 +79,29 @@
      }
      this.flowProgramFileService.saveBatch(fileList);

      addPreviousOtherFiles(programPackage.getId(),inst.getProcessInstanceId());

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

   /**
    * 将程序按照机器代码分组
    * @param ncProgramIdList
    * @return
    * 复制试切阶段的其他文件给固化流程
    * @param previousNodeId 试切阶段的节点id
    * @param newProcessInstanceId 新的固化流程实例id
    */
   /*
   Map<String,List<NcProgram>> groupProgramsByMachineCode(List<Long> ncProgramIdList){
      List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
      return programs.stream().collect(Collectors.groupingBy(NcProgram::getMachineCode));
   }*/
   void addPreviousOtherFiles(Long previousNodeId,String newProcessInstanceId) {
      List<NcNode> previousFileNodes = ncNodeService.getProgramFilesByPackageId(previousNodeId);
      for(NcNode fileNode : previousFileNodes){

         FlowProgramFile progFile = flowProgramFileService.getById(fileNode.getFlowProgramFileId());
         if(!progFile.isProgram()){
            FlowProgramFile newProgFile = new FlowProgramFile();
            BeanUtils.copyProperties(progFile,newProgFile);
            EntityUtil.clearBaseProperties(newProgFile);
            newProgFile.setProcessInstanceId(newProcessInstanceId);

            flowProgramFileService.save(newProgFile);
         }
      }
   }
}