From 0bdfd76339bb58be09927b8c2fe268175c3a7cc8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 10:11:33 +0800
Subject: [PATCH] 优化现场编制导出
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/ReceiveDirMoveTask.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 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..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
@@ -38,39 +38,37 @@
*/
private static final int DEFAULT_HOUR = 0;
- @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)
+
+ //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);
}
}
@@ -78,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);
@@ -99,4 +93,5 @@
// 浣跨敤 REPLACE_EXISTING 閫夐」鏉ヨ鐩栧凡瀛樺湪鐨勬枃浠�
Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
}
+ */
}
--
Gitblit v1.9.3