From 7ec503a70d25e089cc008192898d9da3219d2a6b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 十一月 2025 16:38:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   99 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 25db737..7779d8e 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,18 +1,24 @@
 package com.zy.core;
 
-import com.core.common.Cools;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.DeviceConfigService;
+import com.zy.common.utils.RedisUtil;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
-import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.impl.ZySiemensCrnThread;
+import com.zy.core.thread.impl.ZyStationThread;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import java.util.List;
 
 /**
  * Created by vincent on 2020/8/4
@@ -22,53 +28,88 @@
 public class ServerBootstrap {
 
     @Autowired
-    private SlaveProperties slaveProperties;
-
+    private MainProcess mainProcess;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private DeviceConfigService deviceConfigService;
 
     @PostConstruct
-    public void init(){
+    @Async
+    public void init() throws InterruptedException {
+        News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
         initThread();
+        // 寮�濮嬩富娴佺▼杩涚▼
+        mainProcess.start();
+        News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
     private void initMq(){
         // 鍒濆鍖栧爢鍨涙満mq
-        for (Slave crn : slaveProperties.getCrn()) {
-            MessageQueue.init(SlaveType.Crn, crn);
+        List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Crn)));
+        for (DeviceConfig crn : crnList) {
+            MessageQueue.init(SlaveType.Crn, crn.getDeviceNo());
+        }
+        // 鍒濆鍖朢gv灏忚溅mq
+        List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Rgv)));
+        for (DeviceConfig rgv : rgvList) {
+            MessageQueue.init(SlaveType.Rgv, rgv.getDeviceNo());
         }
         // 鍒濆鍖栬緭閫佺嚎mq
-        for (Slave devp : slaveProperties.getDevp()) {
-            MessageQueue.init(SlaveType.Devp, devp);
+        List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Devp)));
+        for (DeviceConfig devp : devpList) {
+            MessageQueue.init(SlaveType.Devp, devp.getDeviceNo());
         }
         // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-        for (Slave barcode : slaveProperties.getBarcode()) {
-            MessageQueue.init(SlaveType.Barcode, barcode);
+        List<DeviceConfig> barcodeList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Barcode)));
+        for (DeviceConfig barcode : barcodeList) {
+            MessageQueue.init(SlaveType.Barcode, barcode.getDeviceNo());
         }
         // 鍒濆鍖朙ed鐏痬q
-        for (Slave led : slaveProperties.getLed()) {
-            MessageQueue.init(SlaveType.Led, led);
-        }
-        // 鍒濆鍖栫绉癿q
-        for (Slave scale : slaveProperties.getScale()) {
-            MessageQueue.init(SlaveType.Scale, scale);
+        List<DeviceConfig> ledList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Led)));
+        for (DeviceConfig led : ledList) {
+            MessageQueue.init(SlaveType.Led, led.getDeviceNo());
         }
     }
 
     private void initThread(){
-        // 鍒濆鍖栧爢鍨涙満绾跨▼
-        for (Slave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new CrnThread(crn);
-            new Thread(crnThread).start();
-            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+        News.info("鍒濆鍖栧爢鍨涙満........................................................");
+        List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Crn)));
+        for (DeviceConfig deviceConfig : crnList) {
+            ThreadHandler thread = null;
+            if (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
+                thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
+            } else {
+                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            new Thread(thread).start();
+            SlaveConnection.put(SlaveType.Crn, deviceConfig.getDeviceNo(), thread);
         }
 
-        // 鍒濆鍖栫珯鐐圭嚎绋�
-        for (Slave devo : slaveProperties.getDevp()) {
-            DevpThread devpThread = new DevpThread(devo);
-            new Thread(devpThread).start();
-            SlaveConnection.put(SlaveType.Devp, devo.getId(), devpThread);
+        News.info("鍒濆鍖栬緭閫佺珯........................................................");
+        List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Devp)));
+        for (DeviceConfig deviceConfig : devpList) {
+            ThreadHandler thread = null;
+            if (deviceConfig.getThreadImpl().equals("ZyStationThread")) {
+                thread = new ZyStationThread(deviceConfig, redisUtil);
+            } else {
+                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            new Thread(thread).start();
+            SlaveConnection.put(SlaveType.Devp, deviceConfig.getDeviceNo(), thread);
         }
 
     }

--
Gitblit v1.9.1