性能优化

yangys

2025-09-15 d4ca3871c18474768c924fcbfd6e8d3178040092

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java

@@ -16,6 +16,7 @@
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.ProgramAnnotationService;
import org.springblade.mdm.program.service.programannotation.AnnotationProperties;
@@ -32,6 +33,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -50,6 +52,7 @@
   private FlowProgramFileService flowProgramFileService;
   @Autowired
   private NcNodeService nodeService;

   @Autowired
   private NcNodeAutoCreateService ncNodeAutoCreateService;
   @Autowired
@@ -74,9 +77,9 @@
      //需要固化的节点
      NcNode pkgNode = nodeService.lambdaQuery().eq(NcNode::getProcessInstanceId,  flowProps.getProcessInstanceId()).one();

      List<NcNode> historyProgramPackageNodes = nodeService.getNodeHistory(pkgNode);
      //List<NcNode> historyProgramPackageNodes = nodeService.getTryNodeHistory(pkgNode);
      try {
         moveNodeToCuredTree(pkgNode, historyProgramPackageNodes, flowProps);
         moveNodeToCuredTree(pkgNode, flowProps);//, historyProgramPackageNodes
      }catch(Exception e) {
         log.error("固化流程完成异常",e);
         throw new ServiceException("普通固化执行异常"+e.getMessage());
@@ -88,56 +91,82 @@
   /**
    * 将节点和历史节点挪动到固化的同级节点下
    * @param pkgNode1 要固化的节点
    * @param historyProgramPackageNodes 程序包名 历史节点
    * @param historyProgramPackageNodes 程序包名 历史节点List<NcNode> historyProgramPackageNodes,
    */
   void moveNodeToCuredTree(NcNode pkgNode1,List<NcNode> historyProgramPackageNodes, FlowProgramProperties programProperties) throws IOException {
   void moveNodeToCuredTree(NcNode pkgNode1, FlowProgramProperties programProperties) throws IOException {

      //创建节点到机床级别.(固化树)
      NcNode machineNode = ncNodeAutoCreateService.createNodeTreeToMachine(programProperties);

      pkgNode1.setParentId(machineNode.getParentId());
      pkgNode1.setParentIds(machineNode.getParentIds());//更新上级节点，下面还要用应为在historyProgramPackageNodes中的和这个不是一个实例
      NcNode machineGroupNode = ncNodeAutoCreateService.createNodeTreeToMachineGroup(programProperties);

      //新建一个节点，作为固化节点，老节点保留不动,置为老版本

      //机床下现在没有文件了，程序包名升级与机床同级了，改为找到机床同级程序包名更新了
      this.nodeService.lambdaUpdate().likeRight(NcNode::getParentIds, machineNode.getParentIds())
      this.nodeService.lambdaUpdate().likeRight(NcNode::getParentIds, machineGroupNode.subNodeParentIds())
         .in(NcNode::getNodeType, Arrays.asList(NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE))
         .set(NcNode::getIsLastEdition,0).set(NcNode::getIsLocked,1).update();

      //pkgNode1.setParentId(machineGroupNode.getId());
      //pkgNode1.setParentIds(machineGroupNode.subNodeParentIds());//更新上级节点，下面还要用应为在historyProgramPackageNodes中的和这个不是一个实例
      List<NcNode> programNodes = nodeService.getProgramFilesByPackageId(pkgNode1.getId());
      boolean tryPkdNodeHasChild = !programNodes.isEmpty();
      NcNode cureNode = createNewCureNodeByTargetNode(pkgNode1,tryPkdNodeHasChild);
      boolean tryPkgNodeHasChild = !programNodes.isEmpty();

      //新建固化节点
      NcNode cureNode = createNewCureNodeByTargetNode(pkgNode1,tryPkgNodeHasChild);
      cureNode.setParentId(machineGroupNode.getId());
      cureNode.setParentIds(machineGroupNode.subNodeParentIds());
      nodeService.save(cureNode);

      List<NcNode> oriProgramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,pkgNode1.getId()).list();
      //FlowProgramFile pfile;
      for(NcNode oldProgramNode : oriProgramNodes){
         oldProgramNode.setParentIds(pkgNode1.subNodeParentIds());
         oldProgramNode.setIsLastEdition(0);

         //pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());

         //当前固化程序包名下的“其他文件”非程序文件。不设置为老版本，直接挪到固化树下,两个网络之间只交换程序文件，其他文件只能保留
         //其他文件，需要复制到新建的固化节点下
         NcNode newFileNode = new NcNode();
         BeanUtils.copyProperties(oldProgramNode,newFileNode);
         EntityUtil.clearBaseProperties(newFileNode);
         newFileNode.setParentId(cureNode.getId());
         newFileNode.setParentIds(cureNode.subNodeParentIds());
         newFileNode.setIsLastEdition(1);
         nodeService.save(newFileNode);

      }
      nodeService.updateBatchById(oriProgramNodes);
      /*
      for(NcNode hisPackageNode : historyProgramPackageNodes){
         hisPackageNode.setIsLastEdition(0);
         hisPackageNode.setParentId(machineNode.getParentId());
         hisPackageNode.setParentIds(machineNode.getParentIds());//程序包与机床节点同级
         hisPackageNode.setParentId(machineGroupNode.getParentId());
         hisPackageNode.setParentIds(machineGroupNode.subNodeParentIds());//程序包与机床节点同级
         hisPackageNode.lock();

         //处理程序包下层的程序节点，这里：老的程序节点不用更新为历史版本，因为会建立新节点。只修改parentId 和 parentIds
         //处理程序包下层的程序节点，这里：老的程序节点不用更新为历史版本，因为会建立新节点。只修改parentId 和 parentIds //改了，看看效果
         List<NcNode> oriProgramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,hisPackageNode.getId()).list();
         FlowProgramFile pfile;
         for(NcNode oldProgramNode : oriProgramNodes){
            oldProgramNode.setParentIds(hisPackageNode.getParentIds()+","+hisPackageNode.getId());
            oldProgramNode.setParentIds(hisPackageNode.subNodeParentIds());
            oldProgramNode.setIsLastEdition(0);

            pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());
            if(oldProgramNode.getParentId().equals(pkgNode1.getId()) && !pfile.isProgram()){

            //if(oldProgramNode.getParentId().equals(pkgNode1.getId()) && !pfile.isProgram()){
               //当前固化程序包名下的“其他文件”非程序文件。不设置为老版本，直接挪到固化树下,两个网络之间只交换程序文件，其他文件只能保留
               //其他文件，需要复制到新建的固化节点下
               NcNode newOtherFileNode = new NcNode();
               BeanUtils.copyProperties(oldProgramNode,newOtherFileNode);
               EntityUtil.clearBaseProperties(newOtherFileNode);
               newOtherFileNode.setParentId(cureNode.getId());
               newOtherFileNode.setParentIds(cureNode.getParentIds()+","+cureNode.getId());
               newOtherFileNode.setIsLastEdition(1);
               nodeService.save(newOtherFileNode);
            }
               NcNode newFileNode = new NcNode();
               BeanUtils.copyProperties(oldProgramNode,newFileNode);
               EntityUtil.clearBaseProperties(newFileNode);
               newFileNode.setParentId(cureNode.getId());
               newFileNode.setParentIds(cureNode.subNodeParentIds());
               newFileNode.setIsLastEdition(1);
               nodeService.save(newFileNode);
            //}

         }
         nodeService.updateBatchById(oriProgramNodes);
      }
      nodeService.updateBatchById(historyProgramPackageNodes);

       */
      //nodeService.updateBatchById(historyProgramPackageNodes);

      Machine machine = machineService.getByCode(cureNode.getMachineCode());
      List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
@@ -152,7 +181,7 @@
         newProgNode.setName(flowProgramFile.getName());
         newProgNode.setNodeType(NcNode.TYPE_PROGRAM_FILE);
         newProgNode.setParentId(cureNode.getId());
         newProgNode.setParentIds(cureNode.getParentIds()+","+cureNode.getId());
         newProgNode.setParentIds(cureNode.subNodeParentIds());
         newProgNode.setIsLastEdition(1);
         newProgNode.setFlowProgramFileId(flowProgramFile.getId());
         newProgNode.setIsCured(1);
@@ -168,9 +197,10 @@
   /**
    * 复制待固化节点数据，创建一个新的固化节点
    * @param waitingCureNode 待固化节点
    * @param tryPkgNodeHasProgramFiles 是否有程序文件
    * @return 固化节点
    */
   NcNode createNewCureNodeByTargetNode(NcNode waitingCureNode,boolean tryPkdNodeHasProgramFiles){
   NcNode createNewCureNodeByTargetNode(NcNode waitingCureNode,boolean tryPkgNodeHasProgramFiles){
      //新建一个节点，作为固化节点，老节点保留不动
      NcNode cureNode = new NcNode();
      BeanUtils.copyProperties(waitingCureNode, cureNode);
@@ -180,18 +210,20 @@
      cureNode.setIsLastEdition(1);
      cureNode.setExpireDate(calculateExpireDate());//设置过期日期

      cureNode.setHisSerial(nodeService.calculateHistorySerial(cureNode));

      Optional<NcNode> optOldCuredPackageNode = nodeService.lambdaQuery().eq(NcNode::getName,waitingCureNode.getName())
         .eq(NcNode::getProcessNo,waitingCureNode.getProcessNo())
         .eq(NcNode::getProcessEdition,waitingCureNode.getProcessEdition())
         .eq(NcNode::getIsLastEdition,1).eq(NcNode::getIsCured,1).oneOpt();

      if(optOldCuredPackageNode.isEmpty() && tryPkdNodeHasProgramFiles){
      if(optOldCuredPackageNode.isEmpty() && tryPkgNodeHasProgramFiles){
         //之前 没有已固化的程序包名，则直接更新版本号，如果有，那就使用node现在的版本号，因为不可用转为试切，审批完成已经升级version
         //tryPkdNodeHasProgramFiles 试切程序包下有程序文件才需要升级版本（没有文件的是车床，无文件，直接等待回传）
         cureNode.upgradeVersionNumber();
      }

      nodeService.save(cureNode);
      //nodeService.save(cureNode);

      return cureNode;
   }
@@ -228,7 +260,7 @@

   /**
    * 计算有效期
    * @return
    * @return 过期日
    */
   private Date calculateExpireDate() {
      R<String> validMonResult = sysClient.getParamValue(ParamConstants.CURE_VALID_MONTH_KEY);
@@ -242,12 +274,4 @@
      return DateUtil.toDate(now.plusMonths(month));
   }

   /*
   void updateApproveRecordNodeId(String processInstanceId,Long nodeId){
      //更新审批记录的ncNodeId
      approveRecordService.lambdaUpdate()
         .eq(ApproveRecord::getProcessInstanceId, processInstanceId)
         .set(ApproveRecord::getNcNodeId,nodeId).update();
   }
    */
}