From f51029f35beb182ed442e9d211fc39112ed6a5c0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 16 六月 2025 17:01:19 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
index 58a941b..4a11335 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
@@ -20,15 +20,18 @@
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.time.StopWatch;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.List;
@@ -42,6 +45,7 @@
*/
@Slf4j
@Component
+@DependsOn("mapDataDispatcher")
public class AvoidWaveCalculator {
private static final ReentrantLock lock = new ReentrantLock(Boolean.TRUE);
@@ -72,18 +76,9 @@
public void execute() {
this.singleThreadExecutor = Executors.newSingleThreadExecutor();
this.singleThreadExecutor.execute(() -> {
-
- try { Thread.sleep(200); } catch (InterruptedException ignore) {}
+ try { Thread.sleep(500); } catch (InterruptedException ignore) {}
this.calcDynamicNodeWhenBoot();
-
-// while (!Thread.currentThread().isInterrupted()) {
-//
-// this.calcWaveScope();
-//
-// try { Thread.sleep(500); } catch (InterruptedException ignore) {}
-// }
-
});
}
@@ -92,8 +87,7 @@
Integer lev = MapDataDispatcher.MAP_DEFAULT_LEV;
boolean lockAcquired = false;
- StopWatch stopWatch = new StopWatch();
- stopWatch.start();
+ long startTime = System.currentTimeMillis();
try {
if (!(lockAcquired = lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
@@ -114,11 +108,9 @@
lock.unlock();
}
- stopWatch.stop();
- if (stopWatch.getTime() > 0) {
- if (stopWatch.getTime() > 50) {
- log.info("婊ゆ尝鍑芥暟鑺辫垂鏃堕棿涓猴細{}姣......", stopWatch.getTime());
- }
+ long during = System.currentTimeMillis() - startTime;
+ if (during > 50) {
+ log.info("婊ゆ尝鍑芥暟鑺辫垂鏃堕棿涓猴細{}姣......", during);
}
}
}
--
Gitblit v1.9.1