From 1740200255e5eac1f4816331b424c29a5d345d87 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 13 一月 2026 14:35:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 7592969..4660033 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,15 +1,19 @@
package com.zy.core;
-import com.zy.utils.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
-import com.zy.core.model.RgvSlave;
+import com.zy.core.model.RFIDSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.LedThread;
+import com.zy.core.thread.RFIDThread;
+import com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.utils.News;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -73,14 +77,18 @@
for (Slave led : slaveProperties.getLed()) {
MessageQueue.init(SlaveType.Led, led);
}
+ // 鍒濆鍖朢FID璇诲啓鍣╩q
+ for (Slave rfid : slaveProperties.getRfid()) {
+ MessageQueue.init(SlaveType.Rfid, rfid);
+ }
// 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
- }
+// for (Slave scale : slaveProperties.getScale()) {
+// MessageQueue.init(SlaveType.Scale, scale);
+// }
// 鍒濆鍖栧彴杞q
- for (Slave car : slaveProperties.getCar()) {
- MessageQueue.init(SlaveType.Car, car);
- }
+// for (Slave car : slaveProperties.getCar()) {
+// MessageQueue.init(SlaveType.Car, car);
+// }
}
private void initThread(){
@@ -92,12 +100,12 @@
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
// 鍒濆鍖栫┛姊溅绾跨▼
- log.info("鍒濆鍖朢GV绾跨▼...................................................");
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- RgvThread rgvThread = new RgvThread(rgv);
- new Thread((Runnable) rgvThread).start();
- SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
- }
+// log.info("鍒濆鍖朢GV绾跨▼...................................................");
+// for (RgvSlave rgv : slaveProperties.getRgv()) {
+// RgvThread rgvThread = new RgvThread(rgv);
+// new Thread((Runnable) rgvThread).start();
+// SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
+// }
// 鍒濆鍖栬緭閫佺嚎绾跨▼
News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -119,6 +127,19 @@
new Thread(ledThread).start();
SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
}
+ // 鍒濆鍖朢FID璇诲啓鍣ㄧ嚎绋�
+ // 娉ㄦ剰锛氬鏋淩FID璁惧閰嶇疆浜哸utoConnect=true锛屽皢鐢盧FIDAutoConnectService绠＄悊锛岃繖閲岃烦杩�
+ News.info("鍒濆鍖朢FID璇诲啓鍣ㄧ嚎绋�...................................................");
+ for (RFIDSlave rfid : slaveProperties.getRfid()) {
+ // 濡傛灉鍚敤浜嗚嚜鍔ㄨ繛鎺ワ紝璺宠繃RFIDThread鐨勫垱寤猴紙鐢盧FIDAutoConnectService绠＄悊锛�
+ if (rfid.getAutoConnect() != null && rfid.getAutoConnect()) {
+ News.info("RFID璁惧[{}]宸插惎鐢ㄨ嚜鍔ㄨ繛鎺ワ紝璺宠繃RFIDThread鍒濆鍖�", rfid.getId());
+ continue;
+ }
+ RFIDThread rfidThread = new RFIDThread(rfid);
+ new Thread(rfidThread).start();
+ SlaveConnection.put(SlaveType.Rfid, rfid.getId(), rfidThread);
+ }
// 鍒濆鍖栫绉ょ嚎绋�
// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
// for (Slave scale : slaveProperties.getScale()) {
--
Gitblit v1.9.1