From b5b668d2728665ca05d15be8862ceb0a2796fc67 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 11 八月 2025 09:18:10 +0800
Subject: [PATCH] 增加替换文件上传
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 284 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 88f5aa2..a0a2e65 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -1,27 +1,44 @@
package org.springblade.mdm.program.service;
+import com.alibaba.csp.sentinel.util.StringUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-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.jetbrains.annotations.NotNull;
+import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.utils.FileUtil;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.flow.entity.ApproveRecord;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
+import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.NcProgramApproved;
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.FileContentUtil;
+import org.springblade.system.feign.IDictClient;
+import org.springblade.system.pojo.entity.Dict;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Enumeration;
+import java.util.Collections;
import java.util.List;
+import java.util.Optional;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
/**
* 涓嬪彂/鍥炰紶绋嬪簭缁熻
@@ -33,6 +50,19 @@
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
+ //private final NcProgramService progService;
+ private final IDictClient dictClient;
+ private final MachineService machineService;
+ private final NcProgramApprovedService approvedService;
+ private final ApproveRecordService approveRecordService;
+ private final NcNodeService ncNodeService;
+ private final OssTemplate ossTemplate;
+ private final FlowProgramFileService flowProgramFileService;
+ //public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
+ public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
+ public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";
+
+ public static final String ANNOTATION_DICT = "machine_annotation";
/**
* 鍒嗛〉鏌ヨ
@@ -40,11 +70,255 @@
* @return
*/
public IPage<DncSendBackData> dncSendBackPageQuery(Query query) {
+ return this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
+ }
- IPage<DncSendBackData> page = this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
+ /**
+ * 瀵煎嚭dnc鍘嬬缉鍖�
+ * @param approvedIdArr 寰呭鍑哄鎵硅〃id鏁扮粍
+ */
+ public void exportDnc(Long[] approvedIdArr, OutputStream os) throws IOException {
+ //FileOutputStream fos = new FileOutputStream("d:/exportDnc.zip");
+ try (ZipOutputStream zipOut = new ZipOutputStream(os);) {//os
- return page;
+ ArrayList<Long> programPackageNodeIdList = new ArrayList<Long>();
+ for (Long approvedId : approvedIdArr) {
+ NcProgramApproved approved = approvedService.getById(approvedId);
+ programPackageNodeIdList.add(approved.getNcNodeId());
+
+ addProgramPackageToZip(zipOut,approved);
+ }
+ addDataJson(zipOut, programPackageNodeIdList);
+ }
+
+ os.close();
+
+ }
+
+ /**
+ * 灏嗙▼搴忓寘鍜屼笅灞炴枃浠跺姞鍏ュ帇缂╁寘
+ * @param zipOut
+ * @param approved
+ */
+ private void addProgramPackageToZip(ZipOutputStream zipOut, NcProgramApproved approved) throws IOException{
+ String packageFolder = approved.getProgramName()+"/";
+ ZipEntry zipEntry = new ZipEntry(packageFolder);// "/"缁撳熬琛ㄧず鏂囦欢澶�
+ zipOut.putNextEntry(zipEntry);
+ zipOut.closeEntry();
+
+ List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
+
+ FlowProgramFile programFile;
+ NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
+ String status = "SQ";
+ if(programPackageNode.isDeviationProgram()){
+ status = "PL";
+ }else if(programPackageNode.hasCured()){
+ status = "GH";
+ }
+ List<Dict> annotationList = getAnnotionList();
+ for (NcNode node : programNodes) {
+ String filePathInZip = packageFolder + node.getName();
+ programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
+
+ InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
+ Machine machine = machineService.getByCode(node.getMachineCode());
+ InputStream addedIns1 = addSendDirAnnotation(inputStream,machine,annotationList);
+ InputStream addedIns2 = addProgramStatusAnnotation(addedIns1,status,machine,annotationList);
+ this.addInputStreamToZip(zipOut,addedIns2,filePathInZip);
+ }
+
+ }
+
+ /**
+ * 鑾峰彇瀛楀吀涓厤缃殑娉ㄩ噴
+ * @return 瀛楀吀椤瑰垪琛�
+ */
+ List<Dict> getAnnotionList(){
+ List<Dict> annotationList;
+ R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
+ if(dictsResult.isSuccess()) {
+ annotationList = dictsResult.getData();
+ }else{
+ annotationList = Collections.emptyList();
+ }
+
+ return annotationList;
+ }
+ /**
+ * 鍔犲叆鏈哄簥涓嬪彂璺緞鍜岀▼搴忕姸鎬佺殑娉ㄩ噴
+ * @param inputStream
+ * @return
+ */
+ InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
+ return FileContentUtil.insertLine(inputStream,1,generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList));
+ }
+
+ /**
+ * 娣诲姞绋嬪簭涓撴敼鐨勬敞閲�
+ * @param inputStream
+ * @param status 绋嬪簭鐘舵��
+ * @param machine
+ * @param annotationList 閰嶇疆鐨勬敞閲婂瓧鍏稿垪琛�
+ * @return
+ * @throws IOException
+ */
+ InputStream addProgramStatusAnnotation(InputStream inputStream,String status,Machine machine,List<Dict> annotationList) throws IOException {
+ return FileContentUtil.insertLine(inputStream,2,generateAnnotation(status,machine.getMachineGroupCode(),annotationList));
+ }
+
+ String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
+ R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
+ String annotation = oriTest;
+ String begin = "(";
+ String end = ")";
+
+ Optional<Dict> dictOpt = dictsResult.getData().stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
+ String annotationSetting = "(,)";
+ if(dictOpt.isPresent()) {
+ annotationSetting = dictOpt.get().getDictValue();
+ }
+ String[] arr = annotationSetting.split(",");
+ if(arr.length == 2){
+ begin = arr[0];
+ end = arr[1];
+ }
+
+ annotation = begin + oriTest + end;
+ return annotation;
+
+ }
+ /**
+ * 瀵煎叆鏁版嵁鏂囦欢
+ * @param zipOut
+ */
+ void addDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
+ addNodeDataJson(zipOut, programPackageNodeIdList);
+ addApproveRecordDataJson(zipOut, programPackageNodeIdList);
+ }
+
+
+ /**
+ * zip淇濋噸鍔犲叆鑺傜偣鐨勬暟鎹�
+ * @param zipOut
+ * @param pkgNodeIdList
+ * @throws IOException
+ */
+ void addNodeDataJson(ZipOutputStream zipOut,List<Long> pkgNodeIdList) throws IOException {
+ List<NcNode> pkgNodes = this.ncNodeService.lambdaQuery().in(NcNode::getId, pkgNodeIdList).list();
+
+ List<Long> allNodeIds = new ArrayList<>();
+ for(NcNode node : pkgNodes){
+ allNodeIds.addAll(Func.toLongList(node.getParentIds()));
+ allNodeIds.add(node.getId());
+ }
+ //鍔犲叆绋嬪簭鍖呬笅绾х殑绋嬪簭鑺傜偣
+ List<NcNode> programNodes = ncNodeService.lambdaQuery().in(NcNode::getParentId, pkgNodes.stream().map(NcNode::getId).toList()).list();
+
+ allNodeIds.addAll(programNodes.stream().map(NcNode::getId).toList());
+ List<Long> distinctIds = allNodeIds.stream().distinct().toList();
+ List<NcNode> allNodes = this.ncNodeService.lambdaQuery().in(NcNode::getId, distinctIds).list();
+ JSONArray jsonArray = new JSONArray();
+
+ for(NcNode node : allNodes){
+ JSONObject recObj = getNodeJsonObject(node);
+ addSuperProperties(recObj,node);
+ jsonArray.add(recObj);
+ }
+ addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),NODE_JSON_FILE);
+
+ }
+
+ @NotNull
+ private static JSONObject getNodeJsonObject(NcNode node) {
+ JSONObject recObj = new JSONObject();
+ recObj.put("id", node.getId());
+ recObj.put("name", node.getName());
+ recObj.put("drawingNo", node.getDrawingNo());
+ recObj.put("drawingNoEdition", node.getDrawingNoEdition());
+ recObj.put("productModel", node.getProductModel());
+ recObj.put("processName", node.getProcessName());
+ recObj.put("processEdition", node.getProcessEdition());
+ recObj.put("craftEdition", node.getCraftEdition());
+ recObj.put("parentIds", node.getParentIds());
+ recObj.put("processNo", node.getProcessNo());
+
+ recObj.put("isCured", node.getIsCured());
+ recObj.put("isLocked", node.getIsLocked());
+ recObj.put("nodeType", node.getNodeType());
+
+ recObj.put("machineCode", node.getMachineCode());
+ recObj.put("flowProgramFileId", node.getFlowProgramFileId());
+ recObj.put("processInstanceId", node.getProcessInstanceId());
+ return recObj;
+ }
+
+ /**
+ * 瀵煎叆瀹℃壒璁板綍
+ * @param zipOut
+ * @param programPackageNodeIdList 绋嬪簭鍖呭悕鐨刬d鍒楄〃
+ */
+ void addApproveRecordDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
+ /*
+ List<String> instanceIds = this.ncNodeService.lambdaQuery().in(NcNode::getId, programPackageNodeIdList)
+ .list().stream().map(NcNode::getProcessInstanceId).toList();
+*/
+ //List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getProcessInstanceId, instanceIds).list();
+ List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getNcNodeId, programPackageNodeIdList).list();
+
+ JSONArray jsonArray = new JSONArray();
+ for(ApproveRecord record : records){
+ JSONObject recObj = new JSONObject();
+ recObj.put("id", record.getId());
+ recObj.put("comment", record.getComment());
+ recObj.put("userId",record.getUserId());
+ recObj.put("userNickname",record.getUserNickname());
+ recObj.put("operateTime",record.getOperateTime());
+ recObj.put("operateResult",record.getOperateResult());
+ recObj.put("taskName",record.getTaskName());
+ recObj.put("processInstanceId",record.getProcessInstanceId());
+ recObj.put("ncNodeId",record.getNcNodeId());
+ addSuperProperties(recObj,record);
+
+ jsonArray.add(recObj);
+ }
+ addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),"exp_mdm_approve_record.json");
+
+ }
+
+ void addSuperProperties(JSONObject recObj, BizEntity entity){
+ recObj.put("tenantId",entity.getTenantId());
+ recObj.put("createTime",entity.getCreateTime());
+ recObj.put("updateTime",entity.getUpdateTime());
+ recObj.put("createUser",entity.getCreateUser());
+ recObj.put("updateUser",entity.getUpdateUser());
+ recObj.put("status",entity.getStatus());
+ recObj.put("createDept",entity.getCreateDept());
+ }
+
+ /**
+ * 灏� 杈撳叆娴� 涓殑鍐呭鍐欏叆zip
+ * @param zipOut zip杈撳嚭娴�
+ * @param inputStream 杈撳叆娴�
+ * @param entryName 鏂囦欢鍚�
+ * @throws IOException
+ */
+ void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
+ throws IOException {
+ // 鍒涘缓鏂扮殑 ZIP 鏉＄洰
+ ZipEntry zipEntry = new ZipEntry(entryName);
+ zipOut.putNextEntry(zipEntry);
+
+ // 灏嗚緭鍏ユ祦鍐欏叆 ZIP 杈撳嚭娴�
+ byte[] buffer = new byte[1024];
+ int length;
+ while ((length = inputStream.read(buffer)) >= 0) {
+ zipOut.write(buffer, 0, length);
+ }
+
+ // 鍏抽棴褰撳墠鏉＄洰
+ zipOut.closeEntry();
}
}
--
Gitblit v1.9.3