From 270aceade15ec4cb7715131055b53cec4ecb7d4e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 18:13:21 +0800
Subject: [PATCH] 增加现场编制查询列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 6ae2543..935f938 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
@@ -44,7 +44,7 @@
if(!ParamService.NETWORK_TYPE_SHEMI.equals(networkType)){
//闈炴秹瀵嗙綉锛屾墠鎵弿鐩綍鏂囦欢
- moveOverTimeFiles();
+ moveValidateFiles();
}
}
@@ -52,25 +52,26 @@
/**
* 鎵弿鏁版嵁搴撹褰曪紝瓒呮椂鍒欑Щ鍔ㄦ枃浠�
*/
- 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){
+ /*if(remainHours == 0){
continue;
- }
- LocalDateTime earlyTime = now.minusHours(remainHours);
- List<MachineFile> overTimeFiles = this.machineFileService.lambdaQuery().lt(MachineFile::getFileCreateTime,earlyTime)
+ }*/
+ //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 : overTimeFiles){
+ for(MachineFile overTimeFile : pendingFiles){
try {
moveFileToTemp(overTimeFile, machine);
}catch(Exception e){
- log.error("绉诲姩rec鏂囦欢澶辫触:"+overTimeFile.getName(),e);
+ log.error("绉诲姩rec鏂囦欢澶辫触:{}",overTimeFile.getName(),e);
}
}
--
Gitblit v1.9.3