From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java b/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
index 2a629bc..ff26406 100644
--- a/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
+++ b/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
@@ -2,10 +2,12 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.service.WaitMatinService;
import com.zy.ints.task.handler.WaitMatinLogHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -17,14 +19,25 @@
*/
@Component
public class WaitMatinLogScheduler {
+
private static final Logger log = LoggerFactory.getLogger(WaitMatinLogScheduler.class);
@Autowired
private WaitMatinLogHandler waitMatinLogHandler;
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Autowired
+ private WaitMatinService waitMatinService;
+
+ /**
+ * ERP鎺ュ彛鏄惁鍚敤
+ */
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+
+ @Scheduled(cron = "0/4 * * * * ? ")
private void execute(){
- List<WaitMatin> WaitMatins = null;
+ if(!erpEnabled) return;
+ List<WaitMatin> WaitMatins = waitMatinService.selectWaitMatinBySts();
for (WaitMatin waitMatin : WaitMatins) {
ReturnT<String> result = waitMatinLogHandler.start(waitMatin);
if (!result.isSuccess()) {
--
Gitblit v1.9.1