From 0a2ce614306f517929ee939c04b09df0ca4ea2c0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 三月 2026 13:09:30 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java b/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
index c98a3a6..daa2c42 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/scheduler/JobLogScheduler.java
@@ -4,6 +4,8 @@
import com.zy.asrs.mapper.JobMapper;
import com.zy.asrs.service.JobService;
import com.zy.core.enums.ConveyorStateType;
+import com.zy.core.properties.CtuOperationConfig;
+import com.zy.core.properties.CtuServiceProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -24,17 +26,34 @@
@Autowired
private JobMapper jobMapper;
+ @Autowired
+ private CtuServiceProperties properties;
+
//@Scheduled(cron = "0 0 2 * * ?")
@Scheduled(cron = "*/5 * * * * ?")
public void autoToLog() {
- List<Job> jobs = jobMapper.listJobByJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
+ List<Job> jobs = jobMapper.listJobByJobStsAndDay(ConveyorStateType.CLEARSIGNAL.getStatus(),1);
for (Job job : jobs) {
jobService.saveJobLog(job);
}
- jobs = jobMapper.listJobToLog(ConveyorStateType.OUTBOUND.getStatus(), 1);
- for (Job job : jobs) {
- jobService.saveJobLog(job);
+ Boolean flag = true;
+ List<CtuOperationConfig> operations = properties.getOperations();
+ for (CtuOperationConfig config : operations) {
+ if (config.getType().equals(ConveyorStateType.FAKEUSER)) {
+ flag = false;
+ }
+ }
+ if (flag) {
+ jobs = jobMapper.listJobToLog(ConveyorStateType.OUTBOUND.getStatus(), 1);
+ for (Job job : jobs) {
+ jobService.saveJobLog(job);
+ }
+ } else {
+ jobs = jobMapper.listJobToLog(ConveyorStateType.FAKEUSER.getStatus(), 1);
+ for (Job job : jobs) {
+ jobService.saveJobLog(job);
+ }
}
}
--
Gitblit v1.9.1