mdm.git - Gitblit

			@@ -1,13 +1,12 @@

			package org.springblade.mdm.program.service;

			import com.alibaba.fastjson.JSONObject;
			import io.netty.util.internal.StringUtil;
			import lombok.AllArgsConstructor;
			import lombok.Data;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.io.FilenameUtils;
			import org.apache.commons.lang3.StringUtils;
			import org.springblade.core.log.exception.ServiceException;
			import org.springblade.core.mp.base.BizEntity;
			import org.springblade.core.mp.base.BizServiceImpl;
			import org.springblade.core.oss.OssTemplate;
			import org.springblade.core.oss.model.BladeFile;
			@@ -16,19 +15,22 @@
			import org.springblade.core.tool.utils.DateUtil;
			import org.springblade.core.tool.utils.FileUtil;
			import org.springblade.core.tool.utils.Func;
			import org.springblade.mdm.basesetting.machine.entity.Machine;
			import org.springblade.mdm.basesetting.machine.service.MachineService;
			import org.springblade.mdm.commons.service.ParamService;
			import org.springblade.mdm.flow.entity.FlowProgramFile;
			import org.springblade.mdm.flow.service.CureFlowService;
			import org.springblade.mdm.flow.service.FlowCommonService;
			import org.springblade.mdm.flow.service.FlowProgramFileService;
			import org.springblade.mdm.program.entity.DncBackFile;
			import org.springblade.mdm.program.entity.NcNode;
			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.program.vo.DncSendBackFile;
			import org.springblade.mdm.utils.EntityUtil;
			import org.springblade.mdm.program.vo.ProgramAnnotation;
			import org.springblade.mdm.utils.FileContentUtil;
			import org.springframework.beans.BeanUtils;
			import org.springblade.mdm.utils.ZipTextFileContentUtil;
			import org.springblade.system.pojo.entity.DictBiz;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.multipart.MultipartFile;
			@@ -52,13 +54,19 @@
			@AllArgsConstructor
			public class DNCSendBackService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
			private final CureFlowService cureFlowService;
			private final FlowProgramFileService flowProgramFileService;
			private final ProgramAnnotationService programAnnotationService;
			private final NcNodeService ncNodeService;
			private final OssTemplate ossTemplate;
			private final BladeRedis bladeRedis;
			private final FlowCommonService flowCommonService;
			private final DncBackFileService dncBackFileService;
			private final ProgramFlowStatusQueryService programFlowStatusQueryService;
			private final MachineService machineService;
			private final ParamService paramService;
			/**
			* 偏离单文件末尾的模式：P+数字
			*/
			private static final String P_NUMBER_PATTERN = "(?i)P\\d+";

			private String getFileKey(){
			return "dncimpfile-"+ AuthUtil.getUserId();
			}
			@@ -82,7 +90,6 @@
			bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));

			try(InputStream zipFileInputStream = ossTemplate.statFileStream(bfile.getName());) {
			//InputStream zipFileInputStream = file.getInputStream();//test
			list = parseProgramListFromZip(zipFileInputStream);
			}
			} catch (IOException e) {
			@@ -104,7 +111,7 @@
			Path tempZipFile = createTempFile(inputStream);

			List<String> fileEntryNameList = new ArrayList<>();
			List<String> dirEntryNameList = new ArrayList<>();
			List<String> dirEntryNameList = new ArrayList<>();//程序包名+工序版次作为文件夹名
			try (ZipFile zipFile = new ZipFile(tempZipFile.toFile())) {

			Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
			@@ -120,14 +127,23 @@
			}
			}

			List<DictBiz> annotionDictList = programAnnotationService.getAnnotionDictList();
			NcNode programPackageNode;
			//目录列表，即程序包列表
			for(String entryName : dirEntryNameList){
			DncSendBackData progData = new DncSendBackData();
			String packageName = StringUtils.removeEnd(entryName,"/");
			String folderName = StringUtils.removeEnd(entryName,"/");

			PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
			String packageName = pkgAndEdition.getProgramPackageName();
			String processEdition = pkgAndEdition.getProcessEdition();
			if(StringUtils.isBlank(packageName) \|\| StringUtils.isBlank(processEdition)){
			throw new ServiceException("包内文件夹名格式错误应该为[零组件号-工序号-工序版次]:"+folderName);
			}

			progData.setProgramName(packageName);
			String statusLine = "";
			Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).findFirst();
			String statusLine;
			Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(entryName)).findFirst();
			if(optFilename.isPresent()){
			entry = zipFile.getEntry(optFilename.get());
			InputStream ins = zipFile.getInputStream(entry);
			@@ -135,23 +151,34 @@
			statusLine = FileContentUtil.readLineAt(ins,2);
			if(statusLine.contains("SQ")){
			//试切
			programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
			programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
			}else if(statusLine.contains("GH")){
			//固化
			programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName);
			programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName,processEdition);
			}else if(statusLine.contains("PL")){
			//偏离
			programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
			programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);
			}else{
			throw new ServiceException("未找到程序文件中的状态注释");
			//查询是否车床，是车床可以放过，按试切处理
			programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
			if(programPackageNode!=null){
			Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
			String chechuangVal = paramService.turninngValue();
			if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){
			//车床
			ProgramAnnotation pa = programAnnotationService.getProgramAnnotationFormat(machine.getControlSystem(),annotionDictList);
			statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
			}
			}
			}

			if(programPackageNode != null) {
			progData.setId(programPackageNode.getId());
			progData.setProgramNo(programPackageNode.getProgramNo());

			List<String> fileEtriyNames = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).toList();
			List<String> fileEntryNames = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).toList();
			List<DncSendBackFile> programFiles = new ArrayList<>();
			fileEtriyNames.forEach( filePath ->{
			fileEntryNames.forEach( filePath ->{
			DncSendBackFile backFile = new DncSendBackFile();
			backFile.setEntryName(filePath);
			backFile.setName(StringUtils.removeStart(filePath,entryName));
			@@ -161,10 +188,10 @@
			progData.setFiles(programFiles);
			list.add(progData);
			}else{
			throw new ServiceException("找不到程序包名:"+packageName+statusLine);
			throw new ServiceException("找不到程序包名:"+packageName);
			}
			}else{
			throw new ServiceException(entryName+"包下未找到文件"+statusLine);
			throw new ServiceException(entryName+"包下未找到文件");
			}

			}
			@@ -173,6 +200,26 @@
			return list;
			}

			/**
			* 从文件夹名解析出程序包名和和工序版次
			* @param folderName 文件夹名
			* @return 结构数据
			*/
			PackageAndProcessEdition parseProgramPackageFromFolderName(String folderName){
			int index = StringUtils.lastIndexOf(folderName,'-');
			String processEditon = "";
			String temp;
			String packageName = "";
			if(index != -1){
			processEditon = folderName.substring(index+1);
			packageName = folderName.substring(0,index);
			}

			PackageAndProcessEdition result = new PackageAndProcessEdition();;
			result.setProgramPackageName(packageName);
			result.setProcessEdition(processEditon);
			return result;
			}

			/**
			* 入库回传文件,并启动固化流程
			@@ -187,27 +234,8 @@
			String zipFileName = bladeRedis.get(filekey);
			log.info("filekey={},文件名={}",filekey,zipFileName);

			//Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();

			Map<Long,List<FlowProgramFile>> pkgIdFileMap = dealWithBackFile(zipFileName,acceptIdList);

			///List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
			//updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
			/*
			log.info("需要启动固化流程的程序包名数量:{}",newProgramPackageList.size());
			for(NcNode pkgNode :newProgramPackageList){
			exchange = new NcProgramExchange();
			exchange.setName(pkgNode.getName());
			exchange.setExchangeType(2);//回传
			exchange.setNcNodeId(pkgNode.getId());

			this.save(exchange);
			}*/
			//bladeRedis.del(filekey);
			//this.ossTemplate.removeFile(zipFileName);
			//log.info("删除oss文件:{}",zipFileName);

			//cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
			cureFlowService.startCureNew(pkgIdFileMap);

			}
			@@ -239,20 +267,25 @@
			//根据内部文件，读取和分析程序包和程序文件数据
			List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
			for(String dir : dirList){
			String programPackageName = StringUtils.removeEnd(dir,"/");
			String folderName = StringUtils.removeEnd(dir,"/");

			PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
			String programPackageName = pkgAndEdition.getProgramPackageName();

			Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();

			if(optPackageNode.isEmpty()){
			throw new ServiceException("找不到程序"+programPackageName);
			}

			NcNode packageNode = optPackageNode.get();
			if(packageNode.hasCured()) {
			throw new ServiceException(programPackageName + "已经固化，请勿重复入库。");
			}

			//偏离程序判断是否重复回传
			if(packageNode.isDeviationProgram() && packageNode.hasLocked()) {
			throw new ServiceException(programPackageName + "已锁定的程序不可以再次回传。");
			}
			//检查是否在审批过程中
			//根据节点信息查询流程
			boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
			if(active){
			throw new ServiceException(programPackageName+"正在审批中，请勿等待审批完成。");
			@@ -272,7 +305,7 @@
			if(!entryName.endsWith("/")){
			//实际的文件
			String fileName = StringUtils.removeStart(entryName,dir);//去除文件名路径部分

			fileName = removeDeviationPart(fileName);
			try {
			FlowProgramFile newFlowFile = new FlowProgramFile();
			newFlowFile.setProgramName(packageNode.getName());
			@@ -293,121 +326,29 @@

			pkgIdFileMap.put(packageNode.getId(),flowFiles);
			}

			}

			return pkgIdFileMap;
			}

			/**
			* 更新节点，主要是创建程序包名的新版本。
			* @param pkgFileName zip文件名
			* @param programPackageIdList 程序包名节点的id列表
			* @param programPackageSubMap 新的程序包节点id -> =文件列表 map，用于回传数据
			* @throws IOException 访问文件异常
			*/
			/*
			List<NcNode> updateNodeDataByDNCBackData(String pkgFileName, List<Long> programPackageIdList,Map<Long,List<NcNode>> programPackageSubMap) throws IOException {
			InputStream inputStream = this.ossTemplate.statFileStream(pkgFileName);
			Path tempZipFile = createTempFile(inputStream);
			List<NcNode> newProgramPackageNodeList = new ArrayList<>();
			List<String> entryNameList = new ArrayList<>();

			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();
			entryNameList.add(entry.getName());
			String removeDeviationPart(String filename){
			String finalFilename = filename;
			//去掉文件名中可能带有的偏离单部分：-P[序号]
			String ext = FilenameUtils.getExtension(filename);
			String dotExt = StringUtils.isNotBlank(ext)?"."+ext:ext;//带点的扩展名
			String notExtName = StringUtils.removeEnd(filename,dotExt);
			int idx = notExtName.lastIndexOf("-");
			if(idx != -1){
			String endPart = notExtName.substring(idx+1);
			//Pattern.CASE_INSENSITIVE
			boolean containsPld = endPart.matches(P_NUMBER_PATTERN);
			if(containsPld){
			finalFilename = notExtName.substring(0, idx)+dotExt;
			}
			log.info("allentrynames:{}",entryNameList);

			List<NcNode> allAcceptPackages = this.ncNodeService.lambdaQuery().in(NcNode::getId,programPackageIdList).list();
			//根据内部文件，读取和分析程序包和程序文件数据
			List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
			for(String dir : dirList){
			String programPackageName = StringUtils.removeEnd(dir,"/");
			Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();

			if(optPackageNode.isEmpty()){
			throw new ServiceException("找不到程序"+programPackageName);
			}

			NcNode packageNode = optPackageNode.get();
			if(packageNode.hasCured()) {
			throw new ServiceException(programPackageName + "已经固化，请勿重复入库。");
			}

			//检查是否在审批过程中
			//根据节点信息查询流程
			boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
			if(active){
			throw new ServiceException(programPackageName+"正在审批中，请勿重复入库。");
			}

			NcNode newProgramPkg = new NcNode();
			BeanUtils.copyProperties(packageNode, newProgramPkg);
			EntityUtil.clearBaseProperties(newProgramPkg);
			newProgramPkg.setIsLastEdition(1);
			ncNodeService.save(newProgramPkg);
			newProgramPackageNodeList.add(newProgramPkg);

			//旧数据更新为老版本
			packageNode.setIsLocked(1);//旧版自动锁定
			packageNode.setIsLastEdition(0);;
			ncNodeService.updateById(packageNode);

			//List<FlowProgramFile> newFlowFiles = new ArrayList<>();
			List<NcNode> newProgramNodes = new ArrayList<>();
			//查找包下的文件数据,
			entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
			log.info("{}下的文件：{}",dir,entryName);
			if(!entryName.endsWith("/")){
			//实际的文件
			String fileName = StringUtils.removeStart(entryName,dir);//去除文件名路径部分
			NcNode oldProgramNode = this.ncNodeService.getLastEditionProgramFile(fileName,packageNode.getId());
			if(oldProgramNode == null){
			log.info("{}找不到程序文件",entryName);
			throw new ServiceException(programPackageName+"下找不到程序文件"+fileName);
			}

			//创建新版本的程序节点
			NcNode newProgramNode = new NcNode();
			BeanUtils.copyProperties(oldProgramNode, newProgramNode);
			EntityUtil.clearBaseProperties(newProgramNode);
			newProgramNode.setIsLastEdition(1);
			newProgramNode.setParentId(newProgramPkg.getId());
			newProgramNode.setParentIds(newProgramPkg.getParentIds()+","+newProgramPkg.getId());

			FlowProgramFile oldFlowFile = flowProgramFileService.getById(newProgramNode.getFlowProgramFileId());

			FlowProgramFile newFlowFile = new FlowProgramFile();
			BeanUtils.copyProperties(oldFlowFile, newFlowFile);
			newFlowFile.setProcessInstanceId(null);//先置为空，启动流程后设置该值
			EntityUtil.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);
			}
			newProgramNode.setFlowProgramFile(newFlowFile);
			newProgramNode.setVersionNumber(oldProgramNode.genNewVersionNumber());
			newProgramNodes.add(newProgramNode);
			//旧节点处理，咋办？如果导出工控网重复导出呢？，isLastEdition不用设置了，因为程序包节点是新的
			}
			});

			programPackageSubMap.put(newProgramPkg.getId(),newProgramNodes);
			}

			}

			return newProgramPackageNodeList;
			return finalFilename;
			}
			*/
			/**
			* 创建一个临时zip文件
			* @param inputStream 文件的输入流
			@@ -431,6 +372,9 @@
			public String getEntryFileContent(String entryName) throws IOException {
			String result = "";
			String zipFileName = bladeRedis.get(getFileKey());
			return ZipTextFileContentUtil.getTextContent(this.ossTemplate.statFileStream(zipFileName),entryName);

			/*
			try(InputStream inputStream = this.ossTemplate.statFileStream(zipFileName);){
			Path tempZipFile = createTempFile(inputStream);

			@@ -460,7 +404,14 @@
			}
			}

			return result;
			return result;*/
			}

			}

			@Data
			class PackageAndProcessEdition{
			private String programPackageName;
			private String processEdition;

			}