From 720e0926fa1c94b952c26e111206c5d6e1ed5ba2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 四月 2026 15:59:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master
---
src/main/java/com/zy/core/ServerBootstrap.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 4522b3d..82d1ebd 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -25,6 +25,8 @@
@Component
public class ServerBootstrap {
+ private static boolean initThread = false;
+
@Autowired
private MainProcess mainProcess;
@Autowired
@@ -34,6 +36,9 @@
@Async
public void init() throws InterruptedException {
+ if (initThread) {
+ return;
+ }
News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
clearStartupRuntimeLocks();
// 鍒濆鍖栨秷鎭槦鍒�
@@ -42,11 +47,16 @@
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
mainProcess.start();
+ initThread = true;
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
private void clearStartupRuntimeLocks() {
redisUtil.del(RedisKeyType.STATION_EXECUTE_COMMAND_LOCK.key);
+ java.util.Set<String> stationSendLockKeys = redisUtil.scanKeys(RedisKeyType.STATION_EXECUTE_COMMAND_LOCK.key + ":", 2048);
+ if (stationSendLockKeys != null && !stationSendLockKeys.isEmpty()) {
+ redisUtil.del(stationSendLockKeys.toArray(new String[0]));
+ }
// News.info("绯荤粺鍚姩鏃跺凡娓呯悊杈撻�佺珯鍛戒护鎵ц閿侊紝key={}", RedisKeyType.STATION_EXECUTE_COMMAND_LOCK.key);
}
@@ -142,8 +152,6 @@
thread = new ZyStationThread(deviceConfig, redisUtil);
} else if (deviceConfig.getThreadImpl().equals("ZyStationV3Thread")) {
thread = new ZyStationV3Thread(deviceConfig, redisUtil);
- } else if (deviceConfig.getThreadImpl().equals("ZyStationV4Thread")) {
- thread = new ZyStationV4Thread(deviceConfig, redisUtil);
} else if (deviceConfig.getThreadImpl().equals("ZyStationV5Thread")) {
thread = new ZyStationV5Thread(deviceConfig, redisUtil);
} else {
--
Gitblit v1.9.1