固化流程，建立node；OK

yangys

2025-08-06 d36af1e4c9f7601b97dac825744a0df2b809f0b9

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java

@@ -17,6 +17,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.CureFlowService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgramExchange;
@@ -50,6 +51,7 @@
   private final NcNodeService ncNodeService;
   private final OssTemplate ossTemplate;
   private final BladeRedis bladeRedis;
   private final FlowCommonService flowCommonService;

   private String getFileKey(){
      return "dncexpfile-"+ AuthUtil.getUserId();
@@ -69,7 +71,7 @@
         InputStream zipFileInputStream = file.getInputStream();//test

         //byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream);
         list = parseDncZipFromByteArray(zipFileInputStream);
         list = parseProgramListFromZip(zipFileInputStream);

      } catch (IOException e) {
         log.error("上传dnc回传文件失败",e);
@@ -85,7 +87,7 @@
    * @return 回传程序列表
    * @throws IOException 文件操作异常
    */
   List<DncSendBackData> parseDncZipFromByteArray(InputStream inputStream) throws IOException {
   List<DncSendBackData> parseProgramListFromZip(InputStream inputStream) throws IOException {
      List<DncSendBackData> list = new ArrayList<>();
      Path tempZipFile = createTempFile(inputStream);

@@ -101,16 +103,17 @@
               //目录，才是程序包，
               //查询数据库，对应上才能确认时有效的程序包
               String packageName = StringUtils.removeEnd(entryName,"/");
               List<NcNode> pkgList = ncNodeService.lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNode::getName, packageName).eq(NcNode::getIsLastEdition,1).list();
               if(!pkgList.isEmpty()) {
                  NcNode programPackageNode = pkgList.get(0);
               NcNode programPackageNode = ncNodeService.getLastEditionProgramPackage(packageName);
               //List<NcNode> pkgList = ncNodeService.lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNode::getName, packageName).eq(NcNode::getIsLastEdition,1).list();
               //if(!pkgList.isEmpty()) {
                  //NcNode programPackageNode = pkgList.get(0);
                  progData.setId(programPackageNode.getId());
                  progData.setProgramName(packageName);

                  progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
                  progData.setProgramNo(programPackageNode.getProgramNo());
                  list.add(progData);
               }
               //}
            }
         }

@@ -179,10 +182,15 @@

            NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
            if(oriProgramPkg == null){
               log.warn("未发现匹配的程序包名{}",programPackageName);
               log.warn("文件夹未发现匹配的程序包名{}",dir);
               continue;
            }

            //检查是否在审批过程中
            //根据节点信息查询流程
            boolean active = flowCommonService.isProcessInstanceActive(oriProgramPkg.getProcessInstanceId());
            if(active){
               throw new ServiceException(programPackageName+"正在审批中，请勿重复入库。");
            }
            if(!programPackageIdList.contains(oriProgramPkg.getId())){
               //不在勾选的范围内
               log.info("{}不在勾选范围内",programPackageName);