From b2e9d1f13a8a88e2963f504926234589fa2d2787 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 13:45:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/core/ServerBootstrap.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index e93b49b..5461319 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,10 +5,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.DevpSlave;
-import com.zy.core.model.ForkLiftSlave;
-import com.zy.core.model.LiftSlave;
-import com.zy.core.model.ShuttleSlave;
+import com.zy.core.model.*;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.impl.*;
import lombok.extern.slf4j.Slf4j;
@@ -122,7 +119,7 @@
SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), thread);
}
// 鍒濆鍖栬緭閫佺嚎
- for (DevpSlave devpSlave : slaveProperties.getDevpSlave()) {
+ for (DevpSlave devpSlave : slaveProperties.getDevp()) {
News.info("鍒濆鍖栬緭閫佺嚎......................................................");
ThreadHandler thread = null;
if (devpSlave.getThreadImpl().equals("FyDevpThread")) {
@@ -130,23 +127,16 @@
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
-
new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, devpSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.Devp, devpSlave.getId(), thread);
}
// 鍒濆鍖栫數瑙嗘満
- for (DevpSlave devpSlave : slaveProperties.getL()) {
+ for (LedSlave ledSlave : slaveProperties.getLed()) {
News.info("鍒濆鍖栫數瑙嗘満......................................................");
- ThreadHandler thread = null;
- if (devpSlave.getThreadImpl().equals("FyDevpThread")) {
- thread = new FyDevpThread(devpSlave);
- } else {
- throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
- }
-
+ ThreadHandler thread = new NormalLedThread(ledSlave);
new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, devpSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.Led, ledSlave.getId(), thread);
}
}
--
Gitblit v1.9.1