From 5bb21f6acf38e234b765a76561c588d808a44c93 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 13:51:00 +0800
Subject: [PATCH] #v2.1
---
src/main/java/com/zy/core/ServerBootstrap.java | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index af7d7e1..2ef85a0 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,15 +1,18 @@
package com.zy.core;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.DevpSlave;
import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
/**
@@ -21,31 +24,64 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private MainProcess mainProcess;
- @PostConstruct
+// @PostConstruct
public void init(){
+ // 鍒濆鍖栨秷鎭槦鍒�
+ initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
+ // 寮�濮嬩富娴佺▼杩涚▼
+ mainProcess.start();
}
+ 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();
- }
+ for (CrnSlave 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(crn);
-// new Thread(devpThread).start();
-// }
-// }
+ // 鍒濆鍖栬緭閫佺嚎绾跨▼
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = new DevpThread(devp);
+ new Thread(devpThread).start();
+ SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+ }
+
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+// for (Slave barcode : slaveProperties.getBarcode()) {
+// BarcodeThread barcodeThread = new BarcodeThread(barcode);
+// new Thread(barcodeThread).start();
+// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+// }
}
--
Gitblit v1.9.1