From b4d10ff7535002dddb63a0b28ddb37fee7ed1e9d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 十二月 2025 16:30:53 +0800
Subject: [PATCH] 增加pdf，xlsx，docx文件预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
index 91d6a16..a92e75e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
@@ -6,28 +6,23 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.HistoryService;
-import org.flowable.engine.ProcessEngine;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.tool.utils.FileUtil;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
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;
import org.springblade.mdm.program.vo.DncSendBackFile;
-import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.mdm.utils.ZipTextFileContentUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
@@ -36,7 +31,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Optional;
import java.util.zip.ZipEntry;
/**
@@ -49,6 +43,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 +59,10 @@
* 妫�鏌ユ祦绋嬪疄渚嬫槸鍚﹁鎵ц杩囷紙閫氳繃鍘嗗彶璁板綍锛�
*/
public boolean isProcessExecuted(String processInstanceId) {
- // 妫�鏌ユ槸鍚︽湁鍘嗗彶娲诲姩璁板綍
- /*
- long activityCount = historyService.createHistoricActivityInstanceQuery()
- .processInstanceId(processInstanceId)
- .count();
- */
+ if(StringUtils.isBlank(processInstanceId)){
+ //绌烘祦绋嬪疄渚媔d锛岃鏄庤妭鐐瑰凡缁忔病鏈変簡
+ return true;
+ }
// 妫�鏌ユ槸鍚︽湁鍘嗗彶浠诲姟璁板綍
long taskCount = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInstanceId)
@@ -107,9 +100,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();
--
Gitblit v1.9.3