From 6b7db6b11ebcc2e8e1eff86443e77fe63e5d8080 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 21:38:52 +0800
Subject: [PATCH] 优化程序名解析
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java
index d66d4ea..b8ec344 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java
@@ -1,11 +1,11 @@
package org.springblade.mdm.task;
import lombok.extern.slf4j.Slf4j;
-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.commons.service.ParamService;
-import org.springblade.mdm.gkw.programnode.entity.MachineFile;
-import org.springblade.mdm.gkw.programnode.service.MachineFileService;
+import org.springblade.mdm.machinefile.entity.MachineFile;
+import org.springblade.mdm.machinefile.service.MachineFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@@ -37,44 +37,38 @@
* 鏂囦欢榛樿淇濆瓨灏忔椂鏁帮紝0涓嶉檺鍒�
*/
private static final int DEFAULT_HOUR = 0;
- // 姣�5绉掓墽琛屼竴娆�
- //@Scheduled(fixedRate = 1000000)
- //@Scheduled(cron = "0 1 0 * * ?") // 姣忓ぉ涓婂崍0鐐�1鍒嗘墽琛�
- //@Scheduled(cron = "0 */3 * * * ?")
- //@Scheduled(cron = "0 15 19 * * ?") //test
- //@Scheduled(cron = "${task.cron.machine_file_scan}")
- @Scheduled(cron = "${task.cron.machine_rec_move:0 3 * * * ?}")
+
+ //@Scheduled(cron = "${task.cron.machine_rec_move:0 3 * * * ?}")
+ /*
public void execute() {
String networkType = paramService.getParamValue(ParamService.NETWORK_TYPE,ParamService.NETWORK_TYPE_SHEMI);
if(!ParamService.NETWORK_TYPE_SHEMI.equals(networkType)){
//闈炴秹瀵嗙綉锛屾墠鎵弿鐩綍鏂囦欢
- moveOverTimeFiles();
+ moveValidateFiles();
}
}
- /**
- * 鎵弿鏁版嵁搴撹褰曪紝瓒呮椂鍒欑Щ鍔ㄦ枃浠�
- */
- public void moveOverTimeFiles() {
+
+ public void moveValidateFiles() {
List<Machine> machines = machineService.getEnableMachines();
LocalDateTime now = LocalDateTime.now();
for (Machine machine : machines) {
int remainHours = machine.getReceiveDirExpiryHours() != null ?machine.getReceiveDirExpiryHours():DEFAULT_HOUR;
- if(remainHours == 0){
- continue;
- }
- LocalDateTime earlyTime = now.minusHours(remainHours);
- List<MachineFile> overTimeFiles = this.machineFileService.lambdaQuery().lt(MachineFile::getFileCreateTime,earlyTime)
- .eq(MachineFile::getDirType,MachineFile.DIR_TYPE_REC)
- .eq(MachineFile::getMachineCode,machine.getCode()).list();
- for(MachineFile overTimeFile : overTimeFiles){
+ //LocalDateTime earlyTime = now.minusHours(remainHours);
+ List<MachineFile> pendingFiles = this.machineFileService.lambdaQuery()
+ .eq(MachineFile::getDirType,MachineFile.DIR_TYPE_REC)
+ .eq(MachineFile::getExceptionType,MachineFile.EXCEPTION_OK)
+ .eq(MachineFile::getMachineCode,machine.getCode()).list();
+//.lt(MachineFile::getFileCreateTime,earlyTime)
+
+ for(MachineFile overTimeFile : pendingFiles){
try {
moveFileToTemp(overTimeFile, machine);
}catch(Exception e){
- log.error("绉诲姩rec鏂囦欢澶辫触:"+overTimeFile.getName(),e);
+ log.error("绉诲姩rec鏂囦欢澶辫触:{}",overTimeFile.getName(),e);
}
}
@@ -82,10 +76,6 @@
}
- /**
- * 鏂囦欢绉诲姩鍒皌emp
- * @param overTimeFile
- */
private void moveFileToTemp(MachineFile overTimeFile,Machine machine) throws IOException {
String srcFilepath = MachineFileService.getBasePath(machine,overTimeFile.getDirType())+ File.separator+overTimeFile.getName();
Path source = Paths.get(srcFilepath);
@@ -103,4 +93,5 @@
// 浣跨敤 REPLACE_EXISTING 閫夐」鏉ヨ鐩栧凡瀛樺湪鐨勬枃浠�
Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
}
+ */
}
--
Gitblit v1.9.3