From 3e3959bf84c673b3cb366e6225a6b5c8dfbea903 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 05 八月 2020 14:09:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 60b9ec3..25db737 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,8 +1,9 @@
 package com.zy.core;
 
-import com.alibaba.fastjson.JSON;
 import com.core.common.Cools;
-import com.zy.core.cache.CrnConnection;
+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;
@@ -26,27 +27,48 @@
 
     @PostConstruct
     public void init(){
+        // 鍒濆鍖栨秷鎭槦鍒�
+        initMq();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
         initThread();
     }
 
+    private void initMq(){
+        // 鍒濆鍖栧爢鍨涙満mq
+        for (Slave crn : slaveProperties.getCrn()) {
+            MessageQueue.init(SlaveType.Crn, crn);
+        }
+        // 鍒濆鍖栬緭閫佺嚎mq
+        for (Slave devp : slaveProperties.getDevp()) {
+            MessageQueue.init(SlaveType.Devp, devp);
+        }
+        // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
+        for (Slave barcode : slaveProperties.getBarcode()) {
+            MessageQueue.init(SlaveType.Barcode, barcode);
+        }
+        // 鍒濆鍖朙ed鐏痬q
+        for (Slave led : slaveProperties.getLed()) {
+            MessageQueue.init(SlaveType.Led, led);
+        }
+        // 鍒濆鍖栫绉癿q
+        for (Slave scale : slaveProperties.getScale()) {
+            MessageQueue.init(SlaveType.Scale, scale);
+        }
+    }
 
     private void initThread(){
         // 鍒濆鍖栧爢鍨涙満绾跨▼
-        if (!Cools.isEmpty(slaveProperties.getCrn())) {
-            for (Slave crn : slaveProperties.getCrn()) {
-                CrnThread crnThread = new CrnThread(crn);
-                new Thread(crnThread).start();
-                CrnConnection.put(ThreadHandler.CRN_PREFIX + crn.getId(), crnThread);
-            }
+        for (Slave crn : slaveProperties.getCrn()) {
+            CrnThread crnThread = new CrnThread(crn);
+            new Thread(crnThread).start();
+            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
         }
 
         // 鍒濆鍖栫珯鐐圭嚎绋�
-        if (!Cools.isEmpty(slaveProperties.getDevp())) {
-            for (Slave devo : slaveProperties.getDevp()) {
-                DevpThread devpThread = new DevpThread(devo);
-                new Thread(devpThread).start();
-            }
+        for (Slave devo : slaveProperties.getDevp()) {
+            DevpThread devpThread = new DevpThread(devo);
+            new Thread(devpThread).start();
+            SlaveConnection.put(SlaveType.Devp, devo.getId(), devpThread);
         }
 
     }

--
Gitblit v1.9.1