From 4b397a21eb979617f4fe9ff9fc1edb7a1be72900 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:45:29 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 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 8660a66..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,14 +6,11 @@
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;
@@ -22,13 +19,10 @@
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;
@@ -37,7 +31,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Optional;
import java.util.zip.ZipEntry;
/**
@@ -66,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)
--
Gitblit v1.9.3