From f89ca17a1a365f5cd349bca3ebf6b2c80f0e534d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 13:47:21 +0800
Subject: [PATCH] #v2.1
---
src/main/java/com/zy/core/ServerBootstrap.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 5b33f28..dd1f8dd 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,6 +3,8 @@
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;
@@ -11,7 +13,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
/**
@@ -27,7 +28,7 @@
private MainProcess mainProcess;
- @PostConstruct
+// @PostConstruct
public void init(){
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
@@ -62,14 +63,14 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- for (Slave crn : slaveProperties.getCrn()) {
+ for (CrnSlave crn : slaveProperties.getCrn()) {
CrnThread crnThread = new CrnThread(crn);
new Thread(crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
// 鍒濆鍖栬緭閫佺嚎绾跨▼
- for (Slave devp : slaveProperties.getDevp()) {
+ for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = new DevpThread(devp);
new Thread(devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
--
Gitblit v1.9.1