From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/java/com/zy/core/ServerBootstrap.java | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 60b9ec3..4023026 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,13 +1,18 @@
package com.zy.core;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.zy.core.cache.CrnConnection;
+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.model.LedSlave;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.LedThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -22,31 +27,75 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private MainProcess mainProcess;
@PostConstruct
+ @Async
public void init(){
+ log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ // 鍒濆鍖栨秷鎭槦鍒�
+ initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
+ // 寮�濮嬩富娴佺▼杩涚▼
+ mainProcess.start();
+ log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
+ 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();
- CrnConnection.put(ThreadHandler.CRN_PREFIX + crn.getId(), crnThread);
- }
+ log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+ 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(devo);
- new Thread(devpThread).start();
- }
+ // 鍒濆鍖栬緭閫佺嚎绾跨▼
+ log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+ 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);
+// }
+ // 鍒濆鍖朙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);
}
}
--
Gitblit v1.9.1