blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmProgramImportController.java
@@ -51,10 +51,10 @@ return R.fail(e.getMessage()); } } /* @PostMapping("accept") @ApiOperationSupport(order = 2) @Operation(summary = "MDM程序入库入库", description = "涉密网程序确认入库") @Operation(summary = "MDM程序入库", description = "涉密网程序确认入库") public R<Void> accept(@RequestParam String ids) { try { mdmProgramImportService.mdmFileAccept(ids); @@ -63,5 +63,5 @@ return R.fail(e.getMessage()); } return R.success(); } }*/ } blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramApprovedMapper.xml
@@ -11,7 +11,7 @@ <result column="is_deleted" property="isDeleted"/> </resultMap> <select id="exportDncPageQuery" resultType="org.springblade.mdm.program.vo.NcProgramExportDncPageVO"> select a.id,a.nc_program_id,p.name,p.nc_node_id,a.create_time,p.process_name from mdm_nc_program_approved a inner join mdm_nc_program p on a.nc_program_id=p.id select a.id,a.nc_program_id,p.name,p.nc_node_id,p.part_no,p.part_no_edition,p.process_name,a.create_time from mdm_nc_program_approved a inner join mdm_nc_program p on a.nc_program_id=p.id where a.is_deleted=0 <where> <if test="query.name!=null and query.name!=''"> blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -54,7 +54,7 @@ InputStream zipFileInputStream = file.getInputStream();//test byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream); list = parseDncZipFromByteArray(bytes); list = parseMdmZipFromByteArray(bytes); } catch (IOException e) { @@ -89,10 +89,8 @@ System.out.println("创建的临时文件: " + tempFile); return tempFile.toFile(); } public static List<MdmProgramImportVO> parseDncZipFromByteArray(byte[] zipData) throws IOException { public static List<MdmProgramImportVO> parseMdmZipFromByteArray(byte[] zipData) throws IOException { List<MdmProgramImportVO> list = new ArrayList<>(); //List<DncSendBackData> datas = ZipFileDirectoryScanner.getFilesInDirectoryRecursive(zipData, ""); Map<String,String> fileMd5Map = new HashMap<>(); Map<String,MdmProgramImportVO> fileDataMap = new HashMap<>(); try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(zipData); @@ -101,9 +99,8 @@ ZipArchiveEntry entry; Enumeration<ZipArchiveEntry> entries = zipFile.getEntries(); while (entries.hasMoreElements()) { //while ((entry = zis.getNextZipEntry()) != null) { entry = entries.nextElement(); DncSendBackData prog = new DncSendBackData(); String entryName = entry.getName(); if (!entry.isDirectory()) { @@ -120,9 +117,19 @@ d.setName(jsonObject.getString("name")); d.setId(jsonObject.getLong("id")); d.setCode(jsonObject.getString("code")); //d.setFileBackTime(LocalDateTime.now());//到达时间 d.setDescription(jsonObject.getString("description")); d.setCategory(jsonObject.getString("category")); d.setBindNcNodeId(jsonObject.getLong("bindNcNodeId")); d.setIsLastEdition(jsonObject.getInteger("isLastEdition")); d.setIsLocked(jsonObject.getInteger("isLocked")); d.setIsTest(jsonObject.getInteger("isTest")); d.setMachineCode(jsonObject.getString("machineCode")); d.setNcNodeId(jsonObject.getLong("ncNodeId")); d.setPartNo(jsonObject.getString("partNo")); d.setProcessEdition(jsonObject.getString("processEdition")); fileDataMap.put(d.getName(),d); list.add(d); } @@ -133,11 +140,6 @@ } } System.out.println("文件名: " + entry.getName()); System.out.println("大小: " + entry.getSize()); // 读取文件内容到字节数组 ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); }
@@ -127,6 +127,7 @@ recObj.put("name",program.getName()); recObj.put("partNo",program.getPartNo()); 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()); blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java
@@ -21,6 +21,56 @@ private String code; @Schema(description = "程序名称") private String name; private long ncNodeId; @Schema(description = "同名绑定节点id") private Long bindNcNodeId; @Schema(description = "文件地址") private String url; @Schema(description = "文件类型") private String category; @Schema(description = "是否为文本类型") private Boolean isTextFile; /** * 工序，如“精铣” */ //private String processName; /** * 备注 */ //private String remark; @Schema(description = "设备（机床）编码") private String machineCode; @Schema(description = "图号") private String partNo; /** * 描述 */ @Schema(description = "描述") private String description; @Schema(description = "是否固化") private Integer isCured; @Schema(description = "工序版次") private String processEdition; @Schema(description = "是否最新版次，1：最新版次；0:历史版次") private Integer isLastEdition = 1; @Schema(description = "是否锁定") private Integer isLocked = 0; @Schema(description = "是否测试程序") private Integer isTest = 0; private String md5;
@@ -13,5 +13,10 @@ public class NcProgramExportDncPageVO extends BaseVO { @Schema(description = "程序名称") private String name; @Schema(description = "图号") private String partNo; @Schema(description = "图号版次") private String partNoEdition; @Schema(description = "工序名称") private String processName; }
