From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index a1bb5dd..a253991 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,9 +5,10 @@
 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.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.SiemensDevpThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -28,6 +29,7 @@
     @Autowired
     private MainProcess mainProcess;
 
+
     /**
      * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
      * @throws InterruptedException
@@ -43,10 +45,11 @@
         initThread();
         // 寮�濮嬩富娴佺▼杩涚▼
         mainProcess.start();
+
         log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
-    private void initMq(){
+    private void initMq() {
         // 鍒濆鍖栧爢鍨涙満mq
         for (Slave crn : slaveProperties.getCrn()) {
             MessageQueue.init(SlaveType.Crn, crn);
@@ -59,25 +62,25 @@
         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);
-        }
-        // 鍒濆鍖栧彴杞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(){
+    private void initThread() {
         // 鍒濆鍖栧爢鍨涙満绾跨▼
         log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
         for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new MelsecCrnThread(crn);
+            CrnThread crnThread = new SiemensCrnThread(crn);
             new Thread((Runnable) crnThread).start();
             SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
         }
@@ -92,22 +95,22 @@
         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);
-        }
-        // 鍒濆鍖栫绉ょ嚎绋�
+//        // 鍒濆鍖朙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 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