From 8a93ac3f06f3a61af3186a333fcba2628dd15f11 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 10:46:24 +0800
Subject: [PATCH] 插入注释调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 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 15b31f1..3617173 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
@@ -58,9 +58,10 @@
private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
+ private final ProgramAnnotationService programAnnotationService;
//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 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";
@@ -75,20 +76,24 @@
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
- * @param approvedIdArr 寰呭鍑哄鎵硅〃id鏁扮粍
+ * @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
*/
- public void exportDnc(Long[] approvedIdArr, OutputStream os) throws IOException {
+ public void exportDnc(Long[] approvedIdArray, OutputStream os) throws IOException {
//FileOutputStream fos = new FileOutputStream("d:/exportDnc.zip");
try (ZipOutputStream zipOut = new ZipOutputStream(os);) {//os
- ArrayList<Long> programPackageNodeIdList = new ArrayList<Long>();
+ //ArrayList<Long> programPackageNodeIdList = new ArrayList<Long>();
- for (Long approvedId : approvedIdArr) {
+ for (Long approvedId : approvedIdArray) {
NcProgramApproved approved = approvedService.getById(approvedId);
- programPackageNodeIdList.add(approved.getNcNodeId());
+ //programPackageNodeIdList.add(approved.getNcNodeId());
addProgramPackageToZip(zipOut,approved);
}
+
+ //鐘舵�佷慨鏀逛负宸插鍑�
+ approvedService.lambdaUpdate().in(NcProgramApproved::getId, approvedIdArray)
+ .set(NcProgramApproved::getStatus,NcProgramApproved.STATUS_EXPORTED).update();
//addDataJson(zipOut, programPackageNodeIdList);
}
@@ -117,7 +122,7 @@
}else if(programPackageNode.hasCured()){
status = "GH";
}
- List<Dict> annotationList = getAnnotionList();
+ List<Dict> annotationList = programAnnotationService.getAnnotionList();
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
@@ -153,7 +158,7 @@
*/
InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
//妫�娴嬬浜岃鏄惁鏄矾寰�
- String annotationText = generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
+ String annotationText = programAnnotationService.generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
//TODO 鏀瑰垽鏂鍐呭
return FileContentUtil.insertLine(inputStream,1,annotationText);
@@ -169,9 +174,25 @@
* @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 annoText= programAnnotationService.generateAnnotation(status,machine.getMachineGroupCode(),annotationList);
+
+ return FileContentUtil.insertLine(inputStream,2,annoText);
}
+ /**
+ * 鍒ゆ柇涓�琛屾枃鏈槸鍚︽槸娉ㄩ噴
+ * @param line
+ * @param annotationList
+ * @return
+ */
+ boolean isAnnotation(String line,List<Dict> annotationList){
+ boolean isAnno = false;
+
+ return isAnno;
+ }
+
+
+
String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
String annotation = oriTest;
--
Gitblit v1.9.3