From 31ecdb8c700529a59dd762f0c47f0ed9c66d5092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 25 九月 2025 20:40:07 +0800
Subject: [PATCH] 工控网任务
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
index c955ac7..e5fe6bc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
@@ -73,7 +73,6 @@
//闈炴枃鏈�
excepType = MachineFile.EXCEPTION_NOT_TEXT;
}else{
- //Matcher matcher = RegExpConstants.PROGRAM_FILE_PATTERN.matcher(machineFile.getName());
ProgramNameVO progNameVO = ProgramFileNameParser.parseProgramName(machineFile.getName());
boolean filenameValid = progNameVO.isValidFilename();
if(!filenameValid){
@@ -85,19 +84,18 @@
if(matchCount != progNameVO.getSegmentCount()){//鏂囦欢娈垫暟缂哄け
excepType = MachineFile.EXCEPTION_LOST_FILES;
}else{
+ //妫�鏌ユ槸鍚﹀尮閰嶆満搴婂洖浼犱换鍔★紵
+
//妫�鏌ユ槸鍚﹀尮閰嶄笅鍙戣褰曠殑娈垫暟
- //姝ｈ礋3绉掍綔涓烘煡璇㈡椂闂�
- //Date beginTime = new Date(machineFile.getFileCreateTime().getTime()-3000);
- //Date endTime = new Date(machineFile.getFileCreateTime().getTime()+3000);
- String likeStr;
+ String nameLikeStr;
if(StringUtils.isNotBlank(progNameVO.getLgPart())){
- likeStr = prefix +"%P%";
+ nameLikeStr = prefix +"%P%";
}else{
- likeStr = prefix;
+ nameLikeStr = prefix;
}
Optional<FileSendRecord> optFile = fileSendRecordService.lambdaQuery()
.eq(FileSendRecord::getMachineCode,machineFile.getMachineCode())
- .likeRight(FileSendRecord::getName,likeStr).last("limit 1")
+ .likeRight(FileSendRecord::getName,nameLikeStr).last("limit 1")
.orderByDesc(FileSendRecord::getCreateTime).oneOpt();
boolean matchSendRecord;//鏂囦欢鏄惁鏈変笅鍙戣褰�
@@ -118,17 +116,6 @@
if(!matchSendRecord){//濡傛灉鏂囦欢鏈笅鍙戣繃锛屾煡鐪嬫槸鍚︽湁鐜板満缂栫▼璁板綍
byteStream.reset();
-
- /*
- String planStatusLine = AnnotationUtil.removeAnnotation(machine.getControlSystem(),FileContentUtil.readLineAt(byteStream,annoProps.getStatusLineIndex()),programAnnotationService.getAnnotionDictList());
-
- String lgNo;//鏇存敼鍗曞彿
- if(AnnotationUtil.LG.equals(planStatusLine)) {//鏄洿鏀瑰崟
- String lgLine = FileContentUtil.readLineAt(byteStream, annoProps.getDeviationLineIndex());
- lgNo = AnnotationUtil.removeAnnotation(machine.getControlSystem(), lgLine, programAnnotationService.getAnnotionDictList());
- }else{
- lgNo = null;
- }*/
String devSerial = null;
if(StringUtils.isNotBlank(progNameVO.getLgPart())){
--
Gitblit v1.9.3