From 9098f686cacede7a15f0534cdb3e4213d36aff73 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 09 九月 2024 16:13:28 +0800
Subject: [PATCH] #fs
---
src/main/java/com/zy/core/ServerBootstrap.java | 154 +++++++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 74bc024..98da0b9 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -53,10 +53,10 @@
}
private void initMq(){
- // 鍒濆鍖栧爢鍨涙満mq
- for (Slave crn : slaveProperties.getCrn()) {
- MessageQueue.init(SlaveType.Crn, crn);
- }
+// // 鍒濆鍖栧爢鍨涙満mq
+// for (Slave crn : slaveProperties.getCrn()) {
+// MessageQueue.init(SlaveType.Crn, crn);
+// }
// // 鍒濆鍖朢GVmq
// for (Slave rgv : slaveProperties.getRgv()) {
// MessageQueue.init(SlaveType.Rgv, rgv);
@@ -65,42 +65,42 @@
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);
- }
- // 鍒濆鍖栫～鍖栫綈mq
- for (Slave jar : slaveProperties.getJar()) {
- MessageQueue.init(SlaveType.Jar, jar);
- }
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华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);
+// }
+// // 鍒濆鍖栫～鍖栫綈mq
+// for (Slave jar : slaveProperties.getJar()) {
+// MessageQueue.init(SlaveType.Jar, jar);
+// }
// // 鍒濆鍖栧彴杞q
// for (Slave car : slaveProperties.getCar()) {
// MessageQueue.init(SlaveType.Car, car);
// }
- // 鍒濆鍖朣temq
- for (Slave ste : slaveProperties.getSte()) {
- MessageQueue.init(SlaveType.Ste, ste);
- }
+// // 鍒濆鍖朣temq
+// for (Slave ste : slaveProperties.getSte()) {
+// MessageQueue.init(SlaveType.Ste, ste);
+// }
}
private void initThread(){
- // 鍒濆鍖栧爢鍨涙満绾跨▼
- log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- Thread thread = new Thread((Runnable) crnThread);
- thread.start();
- map.put(crnThread, thread);
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
- }
+// // 鍒濆鍖栧爢鍨涙満绾跨▼
+// log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// CrnThread crnThread = new SiemensCrnThread(crn);
+// Thread thread = new Thread((Runnable) crnThread);
+// thread.start();
+// map.put(crnThread, thread);
+// SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+// }
// // 鍒濆鍖栫┛姊溅绾跨▼
// log.info("鍒濆鍖朢GV绾跨▼...................................................");
// for (RgvSlave rgv : slaveProperties.getRgv()) {
@@ -108,49 +108,49 @@
// new Thread((Runnable) rgvThread).start();
// SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
// }
- // 鍒濆鍖栬緭閫佺嚎绾跨▼
- 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);
+// // 鍒濆鍖栬緭閫佺嚎绾跨▼
+// 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);
+// }
+// // 鍒濆鍖朙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);
+// }
+// // 鍒濆鍖杍ar绾跨▼
+// log.info("鍒濆鍖杍ar绾跨▼...................................................");
+// for (JarSlave jar : slaveProperties.getJar()) {
+// JarThread jarThread = new JarThread(jar);
+// new Thread(jarThread).start();
+// SlaveConnection.put(SlaveType.Jar, jar.getId(), jarThread);
+// }
+// // 鍒濆鍖朣te绾跨▼
+// log.info("鍒濆鍖杝te绾跨▼...................................................");
+// for (SteSlave ste : slaveProperties.getSte()) {
+// SteThread steThread = new SteThread(ste);
+// new Thread(steThread).start();
+// SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
+// }
+// // 鍒濆鍖栫绉ょ嚎绋�
+// log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+// for (Slave scale : slaveProperties.getScale()) {
+// ScaleThread barcodeThread = new ScaleThread(scale);
// 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);
- }
- // 鍒濆鍖杍ar绾跨▼
- log.info("鍒濆鍖杍ar绾跨▼...................................................");
- for (JarSlave jar : slaveProperties.getJar()) {
- JarThread jarThread = new JarThread(jar);
- new Thread(jarThread).start();
- SlaveConnection.put(SlaveType.Jar, jar.getId(), jarThread);
- }
- // 鍒濆鍖朣te绾跨▼
- log.info("鍒濆鍖杝te绾跨▼...................................................");
- for (SteSlave ste : slaveProperties.getSte()) {
- SteThread steThread = new SteThread(ste);
- new Thread(steThread).start();
- SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
- }
- // 鍒濆鍖栫绉ょ嚎绋�
- log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
- for (Slave scale : slaveProperties.getScale()) {
- ScaleThread barcodeThread = new ScaleThread(scale);
- new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
- }
+// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
+// }
}
@@ -161,7 +161,7 @@
@Component
class killThread {
- @Scheduled(cron = "0/3 * * * * ? ")
+ /* @Scheduled(cron = "0/3 * * * * ? ")
public void kill() {
for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) {
CRN_COUNT++;
@@ -193,7 +193,7 @@
map.put(entry.getKey(), thread);
}
}
- }
+ }*/
}
--
Gitblit v1.9.1