From b7da34655eba68a1d837cffbbd43319d88971fac Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 19 八月 2025 13:00:54 +0800
Subject: [PATCH] 调整日志配置
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 7734274..55243df 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
@@ -110,6 +110,9 @@
zipOut.putNextEntry(zipEntry);
zipOut.closeEntry();
+ NcNode packageNode = ncNodeService.getById(approved.getNcNodeId());
+ Machine machine = machineService.getByCode(packageNode.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
+
List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
@@ -120,15 +123,16 @@
}else if(programPackageNode.hasCured()){
status = "GH";
}
- List<Dict> annotationList = programAnnotationService.getAnnotionList();
+ //List<Dict> annotationList = programAnnotationService.getAnnotionList();
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
if(programFile.isProgram()) {//绋嬪簭鏂囦欢锛屾墠浼氬姞鍏ュ帇缂╁寘
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);
+ //InputStream addedIns1 = addSendDirAnnotation(inputStream, machine, annotationList);
+ //InputStream addedIns2 = addProgramStatusAnnotation(addedIns1, status, machine, annotationList);
+ String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
+ InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getMachineGroupCode());
this.addInputStreamToZip(zipOut, addedIns2, filePathInZip);
}
}
@@ -141,13 +145,14 @@
* @param inputStream
* @return
*/
+ /*
InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
//妫�娴嬬浜岃鏄惁鏄矾寰�
String annotationText = programAnnotationService.generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
//TODO 鏀瑰垽鏂鍐呭
return FileContentUtil.insertLine(inputStream,1,annotationText);
- }
+ }*/
/**
* 娣诲姞绋嬪簭涓撴敼鐨勬敞閲�
@@ -158,11 +163,12 @@
* @return
* @throws IOException
*/
+ /*
InputStream addProgramStatusAnnotation(InputStream inputStream,String status,Machine machine,List<Dict> annotationList) throws IOException {
String annoText= programAnnotationService.generateAnnotation(status,machine.getMachineGroupCode(),annotationList);
return FileContentUtil.insertLine(inputStream,2,annoText);
- }
+ }*/
/**
* 鍒ゆ柇涓�琛屾枃鏈槸鍚︽槸娉ㄩ噴
@@ -170,11 +176,12 @@
* @param annotationList
* @return
*/
+ /*
boolean isAnnotation(String line,List<Dict> annotationList){
boolean isAnno = false;
return isAnno;
- }
+ }*/
--
Gitblit v1.9.3