From 4f91b953e8f0ae7c63aea01a57367b6b57639a7f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 05 八月 2025 10:58:52 +0800
Subject: [PATCH] 清除无用的显示ncprogram的内容代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 124 +++++++++++++-------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 90 ++++++++++----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 1
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java | 121 ++++++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 1
6 files changed, 265 insertions(+), 74 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index ff0e043..9a3684c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -11,6 +11,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
@@ -43,6 +44,10 @@
private final IdentityService identityService;
+ private final NcNodeService ncNodeService;
+
+ private final FlowProgramFileService flowProgramFileService;
+
/**
* 鍥哄寲娴佺▼鐨刱ey
*/
@@ -51,16 +56,18 @@
@Transactional
- public void startCure(List<NcNode> programPackageList) {
+ public void startCure(List<NcNode> programPackageList, Map<Long,List<FlowProgramFile>> allFlowProgramFiles) {
//鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
- programPackageList.forEach(this::startOne);
+ programPackageList.forEach(pkg -> {
+ this.startOne(pkg,allFlowProgramFiles.get(pkg.getId()));
+ });
}
/**
* 鍚姩涓�涓暟鎺х▼搴忕殑鍥哄寲娴佺▼
* @param programPackage 绋嬪簭鍖呭悕 鑺傜偣瀹炰綋
*/
- public void startOne(NcNode programPackage) {
+ public void startOne(NcNode programPackage,List<FlowProgramFile> flowProgramFiles) {
Map<String, Object> vars = null;
//璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
if(programPackage.getProcessInstanceId() != null) {
@@ -70,45 +77,76 @@
.singleResult();
if(instance != null) {//浣跨敤浠诲姟娲惧伐娴佺▼鐨勫彉閲�
vars = new HashMap<>(instance.getProcessVariables());
+ vars.remove("proessInstanceId");
}
}
if(vars == null){
vars = new HashMap<>();
}
- /*
- String programmer = null;
- String checker = null;
- String senior = null;
- for (HistoricTaskInstance task : historicTasks) {
- // 鑾峰彇浠诲姟鐨勫姙鐞嗕汉
- if(task.getTaskDefinitionKey().equals("programmingTask")){
- //缂栧埗
- programmer = task.getAssignee();
- }else if(task.getTaskDefinitionKey().equals("check")){
- //鏍″
- checker = task.getAssignee();
- }else if(task.getTaskDefinitionKey().equals("senior")){
- //瀹℃牳
- senior = task.getAssignee();
- }
+ //鏌ユ壘鍘嗗彶瀹為檯鐨勫鎵逛汉
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
+ .orderByTaskCreateTime().desc().processInstanceId(programPackage.getProcessInstanceId())
+ .list();
+ fillHistoryAssignees(vars, historicTasks);
- }*/
- //vars.put("programmer",programmer);
- //vars.put("checker",checker);
- //vars.put("senior",senior);
String businessKey = "0";//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
- log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", pinst.getId());
- //杩欓噷闇�瑕佹柊寤轰竴涓悓鍚嶇▼搴忓寘鍚嶏紝鍜屼笅灞炵殑鏂囦欢鍚楋紝涓嶉渶瑕侊紝鍦╠ncSendbackService涓柊寤虹殑锛岃繖閲屼笉澶勭悊
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
+ //鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
+ programPackage.setProcessInstanceId(inst.getProcessInstanceId());
+ ncNodeService.updateById(programPackage);
+ //鏇存柊鏂囦欢鐨勬祦绋嬪疄渚媔d锛屽苟鍏ュ簱
+ flowProgramFiles.forEach(flowProgramFile -> {
+ flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
+ this.flowProgramFileService.save(flowProgramFile);
+ });
+ log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
}
/**
+ * 濉厖鍘嗗彶瀹℃壒浜猴紝浠庤瘯鍒囨祦绋嬩腑鏌ユ壘
+ * @param vars 鎵惧埌瀹℃壒浜哄悗濉厖鐨刴ap
+ * @param historicTasks 鍘嗗彶浠诲姟闆嗗悎
+ */
+ void fillHistoryAssignees(Map<String, Object> vars,List<HistoricTaskInstance> historicTasks){
+ String programmer = null;
+ String checker = null;
+ String senior = null;
+
+ //鎵句笉鍒板伐鑹哄憳锛岄偅涔堟煡璇㈡渶鍚庝竴涓鎵圭殑宸ヨ壓鍛�
+
+ for (HistoricTaskInstance task : historicTasks) {
+ // 鑾峰彇浠诲姟鐨勫姙鐞嗕汉
+ if (task.getTaskDefinitionKey().equals("programmingTask")) {
+ //缂栧埗
+ if (programmer == null) {
+ programmer = task.getAssignee();
+ }
+ } else if (task.getTaskDefinitionKey().equals("check")) {
+ //鏍″
+ if (checker == null) {
+ checker = task.getAssignee();
+ }
+
+ } else if (task.getTaskDefinitionKey().equals("approveTask")) {
+ //瀹℃牳
+ if (senior == null) {
+ senior = task.getAssignee();
+ }
+ }
+
+ }
+
+ vars.put("programmer",programmer);
+ vars.put("checker",checker);
+ vars.put("senior",senior);
+ }
+ /**
* 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
* @param ncProgramIdList
* @return
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index 689ce47..a645065 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -43,6 +43,7 @@
programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//宸ュ簭鐗堟
+ programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
//鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 0c651c6..689e054 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -134,7 +134,7 @@
}
if(node2.getFlowProgramFileId() != null) {
- vo.setContent1(flowProgramFileService.getFileContent(node2.getFlowProgramFileId()));
+ vo.setContent2(flowProgramFileService.getFileContent(node2.getFlowProgramFileId()));
}
return R.data(vo);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index 81ce4fb..6b89979 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -1,14 +1,9 @@
package org.springblade.mdm.program.service;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizEntity;
@@ -17,16 +12,16 @@
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.IoUtil;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.CureFlowService;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
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.utils.CustomBinaryReader;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,10 +30,11 @@
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
import java.time.Duration;
-import java.time.LocalDateTime;
import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
/**
* DNC鍥炰紶鏂囦欢澶勭悊鏈嶅姟
@@ -50,7 +46,7 @@
@AllArgsConstructor
public class DNCSendBackService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
private final CureFlowService cureFlowService;
- private final NcProgramService ncProgramService;
+ private final FlowProgramFileService flowProgramFileService;
private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
private final BladeRedis bladeRedis;
@@ -72,8 +68,8 @@
InputStream zipFileInputStream = file.getInputStream();//test
- byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream);
- list = parseDncZipFromByteArray(bytes);
+ //byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream);
+ list = parseDncZipFromByteArray(zipFileInputStream);
} catch (IOException e) {
log.error("涓婁紶dnc鍥炰紶鏂囦欢澶辫触",e);
@@ -85,22 +81,21 @@
/**
* 浠庡帇缂╁寘 瑙ｆ瀽鍥炰紶绋嬪簭鍒楄〃锛岃繖閲岃В鏋愮洰褰曞嵆鍙紝鐩綍灏辨槸绋嬪簭鍖呭悕
- * @param zipData 鍘嬬缉鍖呭瓧鑺�
+ * @param inputStream 鍘嬬缉鍖呰緭鍏ユ祦
* @return 鍥炰紶绋嬪簭鍒楄〃
- * @throws IOException
+ * @throws IOException 鏂囦欢鎿嶄綔寮傚父
*/
- List<DncSendBackData> parseDncZipFromByteArray(byte[] zipData) throws IOException {
+ List<DncSendBackData> parseDncZipFromByteArray(InputStream inputStream) throws IOException {
List<DncSendBackData> list = new ArrayList<>();
-
+ Path tempZipFile = createTempFile(inputStream);
//Map<String,String> fileMd5Map = new HashMap<>();
Map<String,DncSendBackData> fileDataMap = new HashMap<>();
- try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(zipData);
- ZipFile zipFile = new ZipFile(channel)) {
+ try (ZipFile zipFile = new ZipFile(tempZipFile.toFile())) {
- ZipArchiveEntry entry;
- Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
- while (entries.hasMoreElements()) {
- entry = entries.nextElement();
+ ZipEntry entry;
+ Enumeration<? extends ZipEntry> zipEntris = zipFile.entries();
+ while (zipEntris.hasMoreElements()) {
+ entry = zipEntris.nextElement();
DncSendBackData progData = new DncSendBackData();
String entryName = entry.getName();
if (entry.isDirectory()){
@@ -112,7 +107,8 @@
NcNode programPackageNode = pkgList.get(0);
progData.setId(programPackageNode.getId());
progData.setProgramName(packageName);
- progData.setFileBackTime(LocalDateTime.now());
+
+ progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
progData.setProgramNo(programPackageNode.getProgramNo());
list.add(progData);
}
@@ -128,7 +124,6 @@
/**
* 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
* @param ids id鍒楄〃閫楀彿鍒嗛殧,绋嬪簭鍖呭悕 鑺傜偣鐨刬d
- * @return
*/
@Transactional
public void dncFileAccept(String ids) throws IOException {
@@ -136,9 +131,11 @@
//
NcProgramExchange exchange;
String pkgFileName = bladeRedis.get(getFileKey());
- updateNodeDataByDNCBackData(pkgFileName,idList);
- List<NcNode> pkgList = ncNodeService.listByIds(idList);
- for(NcNode pkgNode :pkgList){
+
+ Map<Long,List<FlowProgramFile>> programPackageFileMap = new HashMap<>();
+ List<NcNode> newProgramPckageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageFileMap);
+
+ for(NcNode pkgNode :newProgramPckageList){
exchange = new NcProgramExchange();
exchange.setName(pkgNode.getName());
exchange.setExchangeType(2);//鍥炰紶
@@ -147,28 +144,27 @@
this.save(exchange);
}
- //cureFlowService.startCure(pkgList);
+ cureFlowService.startCure(newProgramPckageList,programPackageFileMap);
}
/**
* 鏇存柊鑺傜偣锛屼富瑕佹槸鍒涘缓 绋嬪簭鍖呭悕 鐨勬柊鐗堟湰銆�
* @param pkgFileName zip鏂囦欢鍚�
* @param programPackageIdList 绋嬪簭鍖呭悕 鑺傜偣鐨刬d鍒楄〃
+ * @param programPackageFileMap 鏂扮殑 绋嬪簭鍖呰妭鐐筰d -> =鏂囦欢鍒楄〃 map锛岀敤浜庡洖浼犳暟鎹�
* @throws IOException 璁块棶鏂囦欢寮傚父
*/
- void updateNodeDataByDNCBackData(String pkgFileName, List<Long> programPackageIdList) throws IOException {
+ List<NcNode> updateNodeDataByDNCBackData(String pkgFileName, List<Long> programPackageIdList,Map<Long,List<FlowProgramFile>> programPackageFileMap) throws IOException {
InputStream inputStream = this.ossTemplate.statFileStream(pkgFileName);
- byte[] bytes = FileUtil.copyToByteArray(inputStream);
-
- List<NcNode> nodeList = new ArrayList<>();
+ Path tempZipFile = createTempFile(inputStream);
+ List<NcNode> newProgramPackageNodeList = new ArrayList<>();
List<String> entryNameList = new ArrayList<>();
- try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(bytes);
- ZipFile zipFile = new ZipFile(channel)) {
- ZipArchiveEntry entry;
- Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
- while (entries.hasMoreElements()) {
- entry = entries.nextElement();
+ ZipEntry entry;
+ try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
+ Enumeration<? extends ZipEntry> entris = zipFile.entries();
+ while(entris.hasMoreElements()) {
+ entry = entris.nextElement();
entryNameList.add(entry.getName());
}
@@ -186,20 +182,19 @@
//涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
continue;
}
- //涓存椂娴嬭瘯娉ㄩ噴
-
NcNode newProgramPkg = new NcNode();
BeanUtils.copyProperties(oriProgramPkg, newProgramPkg);
-
clearBaseProperties(newProgramPkg);
newProgramPkg.setIsLastEdition(1);
-
ncNodeService.save(newProgramPkg);
+ newProgramPackageNodeList.add(newProgramPkg);
//鏃ф暟鎹洿鏂颁负鑰佺増鏈�
+ oriProgramPkg.setIsLocked(1);//鏃х増鑷姩閿佸畾
oriProgramPkg.setIsLastEdition(0);;
ncNodeService.updateById(oriProgramPkg);
+ List<FlowProgramFile> newFlowFiles = new ArrayList<>();
//鏌ユ壘鍖呬笅鐨勬枃浠舵暟鎹�,
entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
log.info("{}涓嬬殑鏂囦欢锛歿}",dir,entryName);
@@ -213,21 +208,58 @@
}
NcNode newProgramNode = new NcNode();
- BeanUtils.copyProperties(oriProgramPkg, newProgramNode);
+ BeanUtils.copyProperties(oldProgramNode, newProgramNode);
clearBaseProperties(newProgramNode);
newProgramNode.setIsLastEdition(1);
+ newProgramNode.setParentId(newProgramPkg.getParentId());
+ newProgramNode.setParentIds(newProgramPkg.getParentIds()+","+newProgramPkg.getId());
ncNodeService.save(newProgramNode);
+ //灏嗗洖浼犳枃浠朵笂浼狅紝骞惰褰曞埌鏁版嵁搴�
- ncNodeService.updateById(oriProgramPkg);
+ FlowProgramFile oldFlowFile = flowProgramFileService.getById(newProgramNode.getFlowProgramFileId());
+ FlowProgramFile newFlowFile = new FlowProgramFile();//TODO
+ BeanUtils.copyProperties(oldFlowFile, newFlowFile);
+ newFlowFile.setProcessInstanceId(null);
+ clearBaseProperties(newFlowFile);
+
+ try {
+ InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
+ BladeFile newOssFile = ossTemplate.putFile("mdm",fileName,ins);
+ newFlowFile.setOssName(newOssFile.getName());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ newFlowFiles.add(newFlowFile);
+
+ oldProgramNode.setIsLastEdition(0);
+ oldProgramNode.setIsLocked(1);
+ ncNodeService.updateById(oldProgramNode);
}
});
+
+ programPackageFileMap.put(newProgramPkg.getId(),newFlowFiles);
}
}
-
+ return newProgramPackageNodeList;
}
+ /**
+ * 鍒涘缓涓�涓复鏃秡ip鏂囦欢
+ * @param inputStream 鏂囦欢鐨勮緭鍏ユ祦
+ * @return path 鏂囦欢
+ * @throws IOException
+ */
+ Path createTempFile(InputStream inputStream) throws IOException {
+ byte[] zipData = FileUtil.copyToByteArray(inputStream);
+ Path tempFile = Files.createTempFile("tempzip"+System.currentTimeMillis(), ".zip");
+ // 鍐欏叆瀛楄妭鏁版嵁鍒颁复鏃舵枃浠�
+ Files.write(tempFile, zipData, StandardOpenOption.WRITE);
+
+ return tempFile;
+ }
void setBaseProperties(BizEntity entity, JSONObject jsonObject){
entity.setCreateTime(jsonObject.getDate("createTime"));
entity.setUpdateTime(jsonObject.getDate("updateTime"));
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index c8e16aa..2a337cd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -198,7 +198,6 @@
* @param parentId 鐖惰妭鐐筰d
*/
public NcNode getLastEditionProgramFile(String name,Long parentId) {
- NcNode progNode = null;
List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_FILE)
.eq(NcNode::getName, name).eq(NcNode::getParentId,parentId)
.eq(NcNode::getIsLastEdition,1).list();
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
new file mode 100644
index 0000000..bd77b7a
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
@@ -0,0 +1,121 @@
+
+package org.springblade.mdm.test;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.FileUtil;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.*;
+import java.net.URI;
+import java.nio.file.*;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+/**
+ * 娴佺▼绠＄悊鎺ュ彛
+ *
+ * @author Chill
+ */
+@NonDS
+@RestController
+@RequestMapping("/test/")
+@AllArgsConstructor
+@Tag(name = "MDM绯荤粺鎺ュ彛", description = "寮曞叆blade-system鐨勬帴鍙�")
+@Slf4j
+public class OssTestController {
+ private final OssTemplate ossTemplate;
+ @GetMapping("/readzip")
+ @ApiOperationSupport(order = 2)
+ @Operation(summary = "璇粃ip")
+ public R<String> readzip(@Parameter(description = "鏈烘瀯鐖惰妭鐐筰d") Long deptId) throws IOException {
+ R<String> r = R.data("");
+ InputStream inputStream = new FileInputStream("d:/spd.zip");
+ byte[] zipData = FileUtil.copyToByteArray(inputStream);
+ Path tempFile = Files.createTempFile("tempzip", ".zip");
+ // 鍐欏叆瀛楄妭鏁版嵁鍒颁复鏃舵枃浠�
+ Files.write(tempFile, zipData, StandardOpenOption.WRITE);
+
+ Map<String, String> env = new HashMap<>();
+ env.put("create", "true");
+ URI uri = URI.create("jar:file:/inmemory.zip");
+ List<String> entryNameList = new ArrayList<>();
+ String entryn = "CP1-13-1/CP1-13-1-1-1-1.txt";
+ try (ZipFile zipFile = new ZipFile(tempFile.toFile())) {
+ Enumeration<? extends ZipEntry> entris = zipFile.entries();
+ ZipEntry entry;
+ while(entris.hasMoreElements()) {
+ entry = entris.nextElement();
+ entryNameList.add(entry.getName());
+ }
+ //渚垮埄瀹屾垚鐩存帴鍙栨爲
+ entry = zipFile.getEntry(entryn);
+ InputStream ins = zipFile.getInputStream(entry);
+ Path outputPath = Paths.get("d:/downtest.txt");
+ Files.copy(ins, outputPath, StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ System.out.println(entryNameList);
+
+ /*
+ try (ZipFile zipFile = new ZipFile(tempFile.toFile())) {
+ ZipEntry entry = zipFile.getEntry(entryn);
+ InputStream ins = zipFile.getInputStream(entry);
+
+ Path outputPath = Paths.get("d:/downtest.txt");
+ Files.copy(ins, outputPath, StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ List<String> entryNameList = new ArrayList<>();
+ try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(bytes);
+ ZipFile zipFile = new ZipFile(channel)) {
+
+ ZipArchiveEntry entry;
+ Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
+ String entryn = "CP1-13-1/CP1-13-1-1-1-1.txt";
+ while (entries.hasMoreElements()) {
+ entry = entries.nextElement();
+ entryNameList.add(entry.getName());
+ }
+ }*/
+ /*
+ try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(bytes);
+ ZipFile zipFile = new ZipFile(channel)) {
+ List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
+ for(String dir : dirList) {
+ entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
+ ZipArchiveEntry fileEntry = zipFile.getEntry(entryName);
+ //ZipArchiveEntry fileEntry = entryMap.get(entryName);
+ String fileName = StringUtils.removeStart(entryName,dir);//鍘婚櫎鏂囦欢鍚嶈矾寰勯儴鍒�
+ try {
+ InputStream ins = zipFile.getInputStream(fileEntry);
+ ByteArrayInputStream byteS = new ByteArrayInputStream(ins.readAllBytes());
+
+ Path outputPath = Paths.get("d:/downtest.txt");
+ Files.copy(byteS, outputPath, StandardCopyOption.REPLACE_EXISTING);
+ byteS.reset();
+
+ BladeFile newOssFile = ossTemplate.putFile("mdm", fileName, byteS);
+ r.setData(newOssFile.getName());
+ System.out.println(newOssFile.getName());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+ }*/
+ return r;
+ }
+
+}
--
Gitblit v1.9.3