From b7af95d487f49490de16f9636147e5a40911e157 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 23:36:48 +0800
Subject: [PATCH] 确认表增加程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 12 ++----------
1 files changed, 2 insertions(+), 10 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 9318958..29b2d15 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
@@ -255,11 +255,11 @@
if (matchedMachine != null) {
vo.setName(parseProgramName(vo.getFilename()));
vo.setMachineCode(matchedMachine.getCode());
- //String sendPath = programAnnotationService.removeAnnotation(matchedMachine.getMachineGroupCode(),line1,"(",")");
+
vo.setFullPath(path.toString());//鏂囦欢鍦板潃
vo.setSendPath(matchedMachine.getProgSendDir());
vo.setId(vo.getFullPath());
- vo.setProgramStatus(programAnnotationService.removeAnnotation(matchedMachine.getMachineGroupCode(),line2,"(",")"));
+ vo.setProgramStatus(programAnnotationService.removeAnnotation(matchedMachine.getMachineGroupCode(),line2));
list.add(vo);
}
@@ -267,17 +267,9 @@
} catch (IOException e) {
log.error("璇诲彇鏂囦欢md5澶辫触",e);
}
-
-
- //List<String> files = new ArrayList<>();
-
-
- // 杩欓噷鍙互娣诲姞瀵规枃浠剁殑澶勭悊閫昏緫
}
}
}
-
-
return list;
}
--
Gitblit v1.9.3