From 10dab7d3386ef06679c9d9a78c0dbf94e473aeeb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 22 四月 2024 14:56:45 +0800
Subject: [PATCH] #按钮

---
 src/main/java/com/zy/core/ServerBootstrap.java |   80 +++++++++++++++++++++++-----------------
 1 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 7b62114..d67d829 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -6,6 +6,7 @@
 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.properties.SlaveProperties;
 import com.zy.core.thread.*;
 import lombok.extern.slf4j.Slf4j;
@@ -59,41 +60,52 @@
         for (Slave barcode : slaveProperties.getBarcode()) {
             MessageQueue.init(SlaveType.Barcode, barcode);
         }
-        // 鍒濆鍖朙ed鐏痬q
-        for (Slave led : slaveProperties.getLed()) {
-            MessageQueue.init(SlaveType.Led, led);
+        // 鍒濆鍖朢gv灏忚溅mq
+        for (Slave rgv : slaveProperties.getRgv()) {
+            MessageQueue.init(SlaveType.Rgv, rgv);
         }
-        // 鍒濆鍖栫绉癿q
-        for (Slave scale : slaveProperties.getScale()) {
-            MessageQueue.init(SlaveType.Scale, scale);
-        }
-        // 鍒濆鍖栧彴杞q
-        for (Slave car : slaveProperties.getCar()) {
-            MessageQueue.init(SlaveType.Car, car);
-        }
+//        // 鍒濆鍖朙ed鐏痬q
+//        for (Slave led : slaveProperties.getLed()) {
+//            MessageQueue.init(SlaveType.Led, led);
+//        }
+//        // 鍒濆鍖栫绉癿q
+//        for (Slave scale : slaveProperties.getScale()) {
+//            MessageQueue.init(SlaveType.Scale, scale);
+//        }
+//        // 鍒濆鍖栧彴杞q
+//        for (Slave car : slaveProperties.getCar()) {
+//            MessageQueue.init(SlaveType.Car, car);
+//        }
     }
 
     private void initThread(){
         // 鍒濆鍖栧爢鍨涙満绾跨▼
-        log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
-        for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new SiemensCrnThread(crn);
-            new Thread((Runnable) crnThread).start();
-            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
-        }
-        // 鍒濆鍖栬緭閫佺嚎绾跨▼
-        log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
-        for (DevpSlave devp : slaveProperties.getDevp()) {
-            DevpThread devpThread = new SiemensDevpThread(devp);
-            new Thread((Runnable) devpThread).start();
-            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
-        }
-        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-        log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
-        for (Slave barcode : slaveProperties.getBarcode()) {
-            BarcodeThread barcodeThread = new BarcodeThread(barcode);
-//            new Thread(barcodeThread).start();
-            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+//        log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+//        for (CrnSlave crn : slaveProperties.getCrn()) {
+//            CrnThread crnThread = new SiemensCrnThread(crn);
+//            new Thread((Runnable) crnThread).start();
+//            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+//        }
+//        // 鍒濆鍖栬緭閫佺嚎绾跨▼
+//        log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+//        for (DevpSlave devp : slaveProperties.getDevp()) {
+//            DevpThread devpThread = new SiemensDevpThread(devp);
+//            new Thread((Runnable) devpThread).start();
+//            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+//        }
+//        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+//        log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+//        for (Slave barcode : slaveProperties.getBarcode()) {
+//            BarcodeThread barcodeThread = new BarcodeThread(barcode);
+////            new Thread(barcodeThread).start();
+//            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+//        }
+        // 鍒濆鍖栫┛姊溅绾跨▼
+        log.info("鍒濆鍖朢GV绾跨▼...................................................");
+        for (RgvSlave rgv : slaveProperties.getRgv()) {
+            RgvThread rgvThread = new SiemensRgvThread(rgv);
+            new Thread((Runnable) rgvThread).start();
+            SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
         }
 //        // 鍒濆鍖朙ED绾跨▼
 //        log.info("鍒濆鍖朙ED绾跨▼...................................................");
@@ -102,12 +114,12 @@
 //            new Thread(ledThread).start();
 //            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
 //        }
-        // 鍒濆鍖栫绉ょ嚎绋�
+//        // 鍒濆鍖栫绉ょ嚎绋�
 //        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
 //        for (Slave scale : slaveProperties.getScale()) {
-//            ScaleThread barcodeThread = new ScaleThread(scale);
-//            new Thread(barcodeThread).start();
-//            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
+//            ScaleThread scaleThread = new ScaleThread(scale);
+//            new Thread(scaleThread).start();
+//            SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
 //        }
     }
 

--
Gitblit v1.9.1