From ffd5abc74eea1f6ee6433ac11e401aaa57bcc4ab Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 22:37:50 +0800
Subject: [PATCH] 接口文档描述修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
index 1f285df..25af59b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -25,7 +25,6 @@
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.program.vo.MdmProgramImportVO;
import org.springblade.mdm.utils.CustomBinaryReader;
import org.springframework.stereotype.Service;
@@ -36,7 +35,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
-import java.time.LocalDateTime;
import java.util.*;
/**
@@ -70,6 +68,7 @@
//璁剧疆涓�涓紦瀛橈紝2灏忔椂杩囨湡
bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));
+ String pkgFileName = bladeRedis.get(getFileKey());
//String fileName = file.getOriginalFilename();
//InputStream zipFileInputStream = FileExchangeUtil.convertFileToZip(file.getInputStream());
InputStream zipFileInputStream = file.getInputStream();//test
@@ -146,7 +145,7 @@
d.setIsTest(jsonObject.getInteger("isTest"));
d.setMachineCode(jsonObject.getString("machineCode"));
d.setNcNodeId(jsonObject.getLong("ncNodeId"));
- d.setPartNo(jsonObject.getString("partNo"));
+ d.setDrawingNo(jsonObject.getString("drawingNo"));
d.setProcessEdition(jsonObject.getString("processEdition"));
fileDataMap.put(d.getName(),d);
@@ -252,7 +251,7 @@
d.setIsTest(jsonObject.getInteger("isTest"));
d.setMachineCode(jsonObject.getString("machineCode"));
d.setNcNodeId(jsonObject.getLong("ncNodeId"));
- d.setPartNo(jsonObject.getString("partNo"));
+ d.setDrawingNo(jsonObject.getString("drawingNo"));
d.setProcessEdition(jsonObject.getString("processEdition"));
setBaseProperties(d,jsonObject);
@@ -273,7 +272,7 @@
node.setDescription(jsonObject.getString("description"));
node.setNodeType(jsonObject.getString("nodeType"));
node.setProcessName(jsonObject.getString("processName"));
- node.setPartNo(jsonObject.getString("partNo"));
+ node.setDrawingNo(jsonObject.getString("drawingNo"));
node.setMachineCode(jsonObject.getString("machineCode"));
node.setParentId(jsonObject.getLong("parentId"));
node.setParentIds(jsonObject.getString("parentIds"));
--
Gitblit v1.9.3