解决回传工控网记录无法撤销的问题

yangys

2025-09-22 12f2fafc574afb4c534ab59244f2b954d1876e9f

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

@@ -17,6 +17,7 @@
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.program.entity.DncBackFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.mapper.DncBackFileMapper;
import org.springblade.mdm.program.vo.DncBackFileQueryVO;
import org.springblade.mdm.program.vo.DncBackFileVO;
@@ -49,6 +50,7 @@
@AllArgsConstructor
public class DncBackFileService extends BizServiceImpl<DncBackFileMapper, DncBackFile> {
   private final NcNodeService ncNodeService;
   private final NcNodeHisService nodeHisService;
   private final OssTemplate ossTemplate;
   private final HistoryService historyService;
   private final FlowBusinessService businessService;
@@ -64,12 +66,10 @@
    * 检查流程实例是否被执行过（通过历史记录）
    */
   public boolean isProcessExecuted(String processInstanceId) {
      // 检查是否有历史活动记录
      /*
      long activityCount = historyService.createHistoricActivityInstanceQuery()
         .processInstanceId(processInstanceId)
         .count();
   */
      if(StringUtils.isBlank(processInstanceId)){
         //空流程实例id，说明节点已经没有了
         return true;
      }
      // 检查是否有历史任务记录
      long taskCount = historyService.createHistoricTaskInstanceQuery()
         .processInstanceId(processInstanceId)
@@ -107,9 +107,9 @@

      InputStream inputStream = this.ossTemplate.statFileStream(backFIle.getOssName());
      Path tempZipFile = createTempFile(inputStream);
      List<String> entryNameList = new ArrayList<>();
      NcNode packageNode =  this.ncNodeService.getById(backFIle.getNcNodeId());
      String targetFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
      NcNodeHis packageNode =  nodeHisService.getById(backFIle.getNcNodeId());
      //String targetFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
      String targetFolder = packageNode.getName()+"/";
      ZipEntry entry;
      try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
         Enumeration<? extends ZipEntry> entries = zipFile.entries();
@@ -169,36 +169,5 @@
      DncBackFile backFIle = this.getById(id);

      return ZipTextFileContentUtil.getTextContent(this.ossTemplate.statFileStream(backFIle.getOssName()),entryName);
      /*
      try(InputStream inputStream = this.ossTemplate.statFileStream(backFIle.getOssName());){
         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 = StringUtils.endsWithIgnoreCase(entryName,".txt") || StringUtils.endsWithIgnoreCase(entryName,".nc")|| StringUtils.endsWithIgnoreCase(entryName,".xml");
                  if(!isText) {
                     isText = FileContentUtil.isTextFile(bos);
                  }
                  if (isText) {
                     bos.reset();
                     result = FileContentUtil.getContentFromStream(bos);
                  } else {
                     result = "<非文本文件>";
                  }
               }

            }
         }
      }*/


   }
}