mdm.git - Gitblit

			@@ -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列表逗号分隔,程序包名节点的id
			* @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 程序包名节点的id列表
			* @param programPackageFileMap 新的程序包节点id -> =文件列表 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;
			}

			/**
			* 创建一个临时zip文件
			* @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"));