From f4c6e0e1308bccb943ca1cddfdf7f643b6b6a1aa Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 15 七月 2025 23:39:30 +0800
Subject: [PATCH] 测试导出dnc
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 69849a5..a692911 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
@@ -7,16 +7,12 @@
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.apache.commons.lang3.StringUtils;
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.oss.OssTemplate;
-import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.service.ApproveRecordService;
@@ -27,12 +23,10 @@
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -46,6 +40,7 @@
@Service
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
+
private final NcProgramService progService;
private final NcProgramApprovedService approvedService;
private final ApproveRecordService approveRecordService;
@@ -53,6 +48,17 @@
private final OssTemplate ossTemplate;
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";
+
+ /**
+ * 鏄惁鍘嬬缉鍖呭唴鐨勬暟鎹枃浠�
+ * @param filename 鏂囦欢鍚嶇О
+ * @return
+ */
+ public static boolean isDataFile(String filename){
+ return StringUtils.equals(filename, PROGRAM_JSON_FILE) || StringUtils.equals(filename, NODE_JSON_FILE) || StringUtils.equals(filename, APPROVE_RECORD_JSON_FILE);
+ }
/**
* 鍒嗛〉鏌ヨ
* @param query 鏌ヨ鍙傛暟
@@ -92,6 +98,8 @@
addDataJson(zipOut, programIdList);
}
+ os.close();
+
}
@@ -122,11 +130,13 @@
recObj.put("code", program.getCode());
recObj.put("ossName",program.getOssName());
recObj.put("isTextFile",program.getIsTextFile());
+ recObj.put("isLastEdition",program.getIsLastEdition());
recObj.put("category",program.getCategory());
recObj.put("description",program.getDescription());
recObj.put("name",program.getName());
- recObj.put("partNo",program.getPartNo());
+ recObj.put("drawingNo",program.getDrawingNo());
recObj.put("ncNodeId",program.getNcNodeId());
+ recObj.put("bindNcNodeId",program.getBindNcNodeId());
recObj.put("url",program.getUrl());
recObj.put("isCured",program.getIsCured());
recObj.put("isLocked",program.getIsLocked());
@@ -187,11 +197,11 @@
ArrayList<Long> exportNodeIdList = new ArrayList<>();
for(NcProgram program : programs){
- JSONObject recObj = new JSONObject();
- if(!exportNodeIdList.contains(program.getNcNodeId())){
- exportNodeIdList.add(program.getNcNodeId());
+ //JSONObject recObj = new JSONObject();
+ if(!exportNodeIdList.contains(program.getBindNcNodeId())){
+ exportNodeIdList.add(program.getBindNcNodeId());
}
- NcNode ncNode = ncNodeService.getById(program.getNcNodeId());
+ NcNode ncNode = ncNodeService.getById(program.getBindNcNodeId());//浠庣粦瀹氱殑鑺傜偣鏈韩寮�濮嬪鍑�
if(StringUtils.isNotEmpty(ncNode.getParentIds())){
List<Long> pids = Func.toLongList(ncNode.getParentIds());
@@ -218,7 +228,7 @@
recObj.put("description",node.getDescription());
recObj.put("name",node.getName());
recObj.put("remark",node.getRemark());
- recObj.put("partNo",node.getPartNo());
+ recObj.put("drawingNo",node.getDrawingNo());
recObj.put("parentIds",node.getParentIds());
recObj.put("processName",node.getProcessName());
--
Gitblit v1.9.3