From f7bcd87b19bf265d0fa157f110632d6b661ec22d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 25 九月 2023 15:25:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   69 ++++++++++++++++++----------------
 1 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 3e034da..dfca756 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,6 +5,8 @@
 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.properties.SlaveProperties;
 import com.zy.core.thread.*;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +29,10 @@
     @Autowired
     private MainProcess mainProcess;
 
-
+    /**
+     * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+     * @throws InterruptedException
+     */
     @PostConstruct
     @Async
     public void init() throws InterruptedException {
@@ -47,6 +52,10 @@
         for (Slave crn : slaveProperties.getCrn()) {
             MessageQueue.init(SlaveType.Crn, crn);
         }
+        // 鍒濆鍖栧爢鍨涙満mq
+        for (Slave rgv : slaveProperties.getRgv()) {
+            MessageQueue.init(SlaveType.Rgv, rgv);
+        }
         // 鍒濆鍖栬緭閫佺嚎mq
         for (Slave devp : slaveProperties.getDevp()) {
             MessageQueue.init(SlaveType.Devp, devp);
@@ -63,36 +72,32 @@
         for (Slave scale : slaveProperties.getScale()) {
             MessageQueue.init(SlaveType.Scale, scale);
         }
-        // 鍒濆鍖栧彴杞q
-        for (Slave car : slaveProperties.getCar()) {
-            MessageQueue.init(SlaveType.Car, car);
-        }
+//        // 鍒濆鍖栧彴杞q
+//        for (Slave car : slaveProperties.getCar()) {
+//            MessageQueue.init(SlaveType.Car, car);
+//        }
     }
 
     private void initThread(){
         // 鍒濆鍖栧爢鍨涙満绾跨▼
         log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
         for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = null;
-            switch (crn.getId()) {
-                case 1:
-                    crnThread = new SiemensCrnThread(crn);
-                    break;
-                case 2:
-                    crnThread = new MelsecCrnThread(crn);
-                    break;
-                default:
-                    break;
-            }
+            CrnThread crnThread = new SiemensCrnThread(crn);
             new Thread((Runnable) crnThread).start();
             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("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
         for (DevpSlave devp : slaveProperties.getDevp()) {
-            DevpThread devpThread = new DevpThread(devp);
-            new Thread(devpThread).start();
+            DevpThread devpThread = new SiemensDevpThread(devp);
+            new Thread((Runnable) devpThread).start();
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
 
@@ -100,23 +105,23 @@
         log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
         for (Slave barcode : slaveProperties.getBarcode()) {
             BarcodeThread barcodeThread = new BarcodeThread(barcode);
-            new Thread(barcodeThread).start();
+//            new Thread(barcodeThread).start();
             SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
         }
         // 鍒濆鍖朙ED绾跨▼
-//        log.info("鍒濆鍖朙ED绾跨▼...................................................");
-//        for (LedSlave led : slaveProperties.getLed()) {
-//            LedThread ledThread = new LedThread(led);
-//            new Thread(ledThread).start();
-//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
-//        }
-        // 鍒濆鍖栧彴杞︾嚎绋�
-        log.info("鍒濆鍖栧彴杞︾嚎绋�...................................................");
-        for (Slave car : slaveProperties.getCar()) {
-            CarThread carThread = new CarThread(car);
-            new Thread(carThread).start();
-            SlaveConnection.put(SlaveType.Car, car.getId(), carThread);
+        log.info("鍒濆鍖朙ED绾跨▼...................................................");
+        for (LedSlave led : slaveProperties.getLed()) {
+            LedThread ledThread = new LedThread(led);
+            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);
+//        }
     }
 
 

--
Gitblit v1.9.1