bug修复

yangys

2025-08-16 f77951077aa87daae6460c0161868bd5661efb2f

 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.program.vo.DncSendBackFile;
import org.springblade.mdm.utils.EntityUtil;
import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.beans.BeanUtils;
@@ -57,7 +58,7 @@
   private final FlowCommonService flowCommonService;

   private String getFileKey(){
      return "dncexpfile-"+ AuthUtil.getUserId();
      return "dncimpfile-"+ AuthUtil.getUserId();
   }
   /**
    * dnc回传文件上传
@@ -78,10 +79,10 @@
         //设置一个缓存，2小时过期
         bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));

         InputStream zipFileInputStream = file.getInputStream();//test

         list = parseProgramListFromZip(zipFileInputStream);

         try(InputStream zipFileInputStream = ossTemplate.statFileStream(bfile.getName());) {
            //InputStream zipFileInputStream = file.getInputStream();//test
            list = parseProgramListFromZip(zipFileInputStream);
         }
      } catch (IOException e) {
         log.error("上传dnc回传文件失败",e);
         throw new ServiceException("解析DNC回传数据失败");
@@ -145,6 +146,17 @@
               if(programPackageNode != null) {
                  progData.setId(programPackageNode.getId());
                  progData.setProgramNo(programPackageNode.getProgramNo());

                  List<String> fileEtriyNames  = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).toList();
                  List<DncSendBackFile> programFiles = new ArrayList<>();
                  fileEtriyNames.forEach( filePath ->{
                        DncSendBackFile backFile = new DncSendBackFile();
                        backFile.setEntryName(filePath);
                        backFile.setName(StringUtils.removeStart(filePath,entryName));
                        programFiles.add(backFile);
                  });

                  progData.setFiles(programFiles);
                  list.add(progData);
               }else{
                  throw new ServiceException("找不到程序包名:"+packageName+statusLine);
@@ -166,15 +178,20 @@
    */
   @Transactional
   public void dncFileAccept(String ids) throws IOException {
      List<Long> idList = Func.toLongList(ids);
      List<Long> acceptIdList = Func.toLongList(ids);
      //
      NcProgramExchange exchange;
      String filekey = getFileKey();
      String pkgFileName = bladeRedis.get(filekey);
      log.info("filekey={},文件名={}",filekey,pkgFileName);
      String zipFileName = bladeRedis.get(filekey);
      log.info("filekey={},文件名={}",filekey,zipFileName);

      Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
      List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
      //Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();

      Map<Long,List<FlowProgramFile>> pkgIdFileMap = dealWithBackFile(zipFileName,acceptIdList);

      ///List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
      //updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
      /*
      log.info("需要启动固化流程的程序包名数量:{}",newProgramPackageList.size());
      for(NcNode pkgNode :newProgramPackageList){
         exchange = new NcProgramExchange();
@@ -183,13 +200,88 @@
         exchange.setNcNodeId(pkgNode.getId());

         this.save(exchange);
      }*/
      //bladeRedis.del(filekey);
      //this.ossTemplate.removeFile(zipFileName);
      //log.info("删除oss文件:{}",zipFileName);

      //cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
      cureFlowService.startCureNew(pkgIdFileMap);

   }

   private Map<Long, List<FlowProgramFile>> dealWithBackFile(String ossFileName, List<Long> acceptIdList) throws IOException{
      Map<Long, List<FlowProgramFile>> pkgIdFileMap = new HashMap<>();

      InputStream inputStream = this.ossTemplate.statFileStream(ossFileName);
      Path tempZipFile = createTempFile(inputStream);
      List<String> entryNameList = new ArrayList<>();

      ZipEntry entry;
      try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
         Enumeration<? extends ZipEntry> entries = zipFile.entries();
         while(entries.hasMoreElements()) {
            entry = entries.nextElement();
            entryNameList.add(entry.getName());
         }
         log.info("allentrynames:{}",entryNameList);

         List<NcNode> allAcceptPackages =  this.ncNodeService.lambdaQuery().in(NcNode::getId,acceptIdList).list();
         //根据内部文件，读取和分析程序包和程序文件数据
         List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
         for(String dir : dirList){
            String programPackageName = StringUtils.removeEnd(dir,"/");
            Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();

            if(optPackageNode.isEmpty()){
               throw new ServiceException("找不到程序"+programPackageName);
            }

            NcNode packageNode = optPackageNode.get();
            if(packageNode.hasCured()) {
               throw new ServiceException(programPackageName + "已经固化，请勿重复入库。");
            }

            //检查是否在审批过程中
            //根据节点信息查询流程
            boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
            if(active){
               throw new ServiceException(programPackageName+"正在审批中，请勿重复入库。");
            }

            List<FlowProgramFile> flowFiles = new ArrayList<>();
            //查找包下的文件数据,
            entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
               log.info("{}下的文件：{}",dir,entryName);

               if(!entryName.endsWith("/")){
                  //实际的文件
                  String fileName = StringUtils.removeStart(entryName,dir);//去除文件名路径部分

                  try {
                     FlowProgramFile newFlowFile = new FlowProgramFile();
                     newFlowFile.setProgramName(packageNode.getName());
                     newFlowFile.setProcessInstanceId(null);//先置为空，启动流程后设置该值
                     newFlowFile.setFileType("program");
                     newFlowFile.setName(fileName);
                     InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
                     BladeFile newOssFile = ossTemplate.putFile("mdm",fileName,ins);
                     newFlowFile.setOssName(newOssFile.getName());

                     flowFiles.add(newFlowFile);
                  } catch (IOException e) {
                     throw new RuntimeException(e);
                  }
               }

            });

            pkgIdFileMap.put(packageNode.getId(),flowFiles);
         }

      }
      bladeRedis.del(filekey);
      this.ossTemplate.removeFile(pkgFileName);
      log.info("删除oss文件:{}",pkgFileName);


      cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
      return pkgIdFileMap;
   }

   /**
@@ -314,20 +406,42 @@

      return tempFile;
   }
   void setBaseProperties(BizEntity entity, JSONObject jsonObject){
      entity.setCreateTime(jsonObject.getDate("createTime"));
      entity.setUpdateTime(jsonObject.getDate("updateTime"));
      entity.setStatus(jsonObject.getInteger("status"));
      entity.setCreateUser(jsonObject.getLong("createUser"));
      entity.setUpdateUser(jsonObject.getLong("updateUser"));

   /**
    * 获取回传文件的内容
    * @param entryName 文件在压缩包内的路径
    * @return 文件内容文本
    */
   public String getEntryFileContent(String entryName) throws IOException {
      String result  = "";
      String zipFileName = bladeRedis.get(getFileKey());
      try(InputStream inputStream = this.ossTemplate.statFileStream(zipFileName);){
         Path tempZipFile = createTempFile(inputStream);

         ZipEntry entry;
         try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
            Enumeration<? extends ZipEntry> entries = zipFile.entries();
            while (entries.hasMoreElements()) {
               entry = entries.nextElement();
               if (!entryName.equals(entry.getName())) {
                  continue;
               }
               try (InputStream fileIns = zipFile.getInputStream(zipFile.getEntry(entryName))) {
                  ByteArrayInputStream bos = new ByteArrayInputStream(fileIns.readAllBytes());
                  boolean isText = FileContentUtil.isTextFile(bos);
                  if (isText) {
                     bos.reset();
                     result = FileContentUtil.getContentFromStream(bos);
                  } else {
                     result = "<非文本文件>";
                  }
               }

            }
         }
      }

      return result;
   }
   /*
   void clearBaseProperties(BizEntity entity){
      entity.setId(null);
      entity.setCreateTime(null);
      entity.setUpdateTime(null);
      entity.setStatus(null);
      entity.setCreateUser(null);
      entity.setUpdateUser(null);
   }*/

}