From dc01577b31204fd3c80645b45d81ff693f79a985 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 九月 2025 23:04:20 +0800
Subject: [PATCH] 程序包名增加版次
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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..ca948ba 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
@@ -6,19 +6,19 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.machinefile.entity.FileSendRecord;
+import org.springblade.mdm.machinefile.service.FileSendRecordService;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.MdmProgramImportVO;
import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.support.SimpleTriggerContext;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -49,6 +49,9 @@
@Autowired
private MachineService machineService;
+ @Autowired
+ private FileSendRecordService fileSendRecordService;
+
private String getFileKey(){
return "mdmgkwimpfile-"+ AuthUtil.getUserId();
}
@@ -72,7 +75,6 @@
// 鍒涘缓瑙ｅ帇鐩爣鐩綍锛堝湪涓存椂鐩綍涓嬪垱寤轰竴涓敮涓�瀛愮洰褰曪級
Path tempZipFile = Files.createTempFile("mdmimpfile-"+System.currentTimeMillis(), ".zip");
- //Path extractDir = Files.createTempDirectory(tempPath, "unzip_");
file.transferTo(tempZipFile);
@@ -210,8 +212,6 @@
for (Path subPath : subStream) {
if (Files.isRegularFile(subPath)) {
System.out.println("鎵惧埌鏂囦欢: " + subPath);
- //files.add(subPath.getFileName().toString());
- // 杩欓噷鍙互娣诲姞瀵规枃浠剁殑澶勭悊閫昏緫
}
}
}
@@ -229,8 +229,6 @@
byte[] buffer = new byte[2000];
inputStream.read(buffer);
vo.setMd5(DigestUtils.md5Hex(buffer));
-
-
} catch (IOException e) {
log.error("璇诲彇鏂囦欢md5澶辫触",e);
}
@@ -255,11 +253,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.getControlSystem(),line2));
list.add(vo);
}
@@ -267,17 +265,9 @@
} catch (IOException e) {
log.error("璇诲彇鏂囦欢md5澶辫触",e);
}
-
-
- //List<String> files = new ArrayList<>();
-
-
- // 杩欓噷鍙互娣诲姞瀵规枃浠剁殑澶勭悊閫昏緫
}
}
}
-
-
return list;
}
@@ -350,20 +340,27 @@
List<String> idList = Func.toStrList(ids);
- String ditStr = bladeRedis.get(getFileKey());
- Path extractDir = Paths.get(ditStr);
+ String dictStr = bladeRedis.get(getFileKey());
+ Path extractDir = Paths.get(dictStr);
List<MdmProgramImportVO> list = readTempDir(extractDir);
String destFileFull;
for(String str : idList){
- System.out.println(str);
+ //System.out.println(str);
for(MdmProgramImportVO vo : list){
if(StringUtils.equals(vo.getFullPath(),str)){
destFileFull = vo.getSendPath()+File.separator+vo.getFilename();
File destFile = new File(destFileFull);
FileUtils.forceMkdirParent(destFile);
FileUtils.copyFile(new File(str),destFile);
+
+ FileSendRecord record = new FileSendRecord();
+ record.setName(destFile.getName());
+ Path destPath = Paths.get(destFileFull);
+ record.setMachineCode(vo.getMachineCode());
+ record.setFileSize(Files.size(destPath));
+ fileSendRecordService.save(record);
break;
}
}
--
Gitblit v1.9.3