yangys
2025-08-12 8ede6183253248e497d391a0902bb5d41181b3bf
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -24,6 +24,7 @@
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -68,7 +69,7 @@
         throw new ServiceException("文件为空");
      }
      if(StringUtils.endsWith(file.getOriginalFilename(),".zip")){
      if(!StringUtils.endsWith(file.getOriginalFilename(),".zip")){
         throw new ServiceException("文件必须为zip包 ");
      }
      try {
@@ -217,7 +218,7 @@
            }
            NcNode newProgramPkg = new NcNode();
            BeanUtils.copyProperties(oriProgramPkg, newProgramPkg);
            clearBaseProperties(newProgramPkg);
            EntityUtil.clearBaseProperties(newProgramPkg);
            newProgramPkg.setIsLastEdition(1);
            ncNodeService.save(newProgramPkg);
            newProgramPackageNodeList.add(newProgramPkg);
@@ -243,7 +244,7 @@
                  NcNode newProgramNode = new NcNode();
                  BeanUtils.copyProperties(oldProgramNode, newProgramNode);
                  clearBaseProperties(newProgramNode);
                  EntityUtil.clearBaseProperties(newProgramNode);
                  newProgramNode.setIsLastEdition(1);
                  newProgramNode.setParentId(newProgramPkg.getId());
                  newProgramNode.setParentIds(newProgramPkg.getParentIds()+","+newProgramPkg.getId());
@@ -252,10 +253,10 @@
                  FlowProgramFile oldFlowFile = flowProgramFileService.getById(newProgramNode.getFlowProgramFileId());
                  FlowProgramFile newFlowFile = new FlowProgramFile();//TODO
                  FlowProgramFile newFlowFile = new FlowProgramFile();
                  BeanUtils.copyProperties(oldFlowFile, newFlowFile);
                  newFlowFile.setProcessInstanceId(null);
                  clearBaseProperties(newFlowFile);
                  EntityUtil.clearBaseProperties(newFlowFile);
                  try {
                     InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
@@ -267,9 +268,11 @@
                  newProgramNode.setFlowProgramFile(newFlowFile);
                  newProgramNode.setVersionNumber(oldProgramNode.genNewVersionNumber());
                  newProgramNodes.add(newProgramNode);
                  oldProgramNode.setIsLastEdition(0);
                  oldProgramNode.setIsLocked(1);
                  ncNodeService.updateById(oldProgramNode);
                  //旧节点处理,咋办?如果导出工控网 重复导出呢?,isLastEdition不用设置了,因为 程序包节点 是新的
                  //TODO 待验证
                  //oldProgramNode.setIsLastEdition(原来是0);
                  //oldProgramNode.setIsLocked(1);
                  //ncNodeService.updateById(oldProgramNode);
               }
            });
@@ -303,7 +306,7 @@
      entity.setCreateUser(jsonObject.getLong("createUser"));
      entity.setUpdateUser(jsonObject.getLong("updateUser"));
   }
   /*
   void clearBaseProperties(BizEntity entity){
      entity.setId(null);
      entity.setCreateTime(null);
@@ -311,5 +314,5 @@
      entity.setStatus(null);
      entity.setCreateUser(null);
      entity.setUpdateUser(null);
   }
   }*/
}