From 474af43d8e8111e2af1fee2d8b23225ebd483a5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 05 八月 2020 12:47:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 11 ++++++-----
src/main/java/com/zy/core/ServerBootstrap.java | 19 ++++++++-----------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 0d298b3..b168c21 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -2,6 +2,7 @@
import com.core.common.Cools;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
@@ -32,20 +33,16 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- if (!Cools.isEmpty(slaveProperties.getCrn())) {
- for (Slave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new CrnThread(crn);
- new Thread(crnThread).start();
- SlaveConnection.put(ThreadHandler.CRN_PREFIX + crn.getId(), crnThread);
- }
+ for (Slave 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();
- }
+ for (Slave devo : slaveProperties.getDevp()) {
+ DevpThread devpThread = new DevpThread(devo);
+ new Thread(devpThread).start();
}
}
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index ad23f6a..e691c45 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -5,6 +5,7 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -15,14 +16,14 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
- private List<Slave> crn;
+ private List<Slave> crn = new ArrayList<>();
- private List<Slave> devp;
+ private List<Slave> devp = new ArrayList<>();
- private List<Slave> barcode;
+ private List<Slave> barcode = new ArrayList<>();
- private List<Slave> led;
+ private List<Slave> led = new ArrayList<>();
- private List<Slave> scale;
+ private List<Slave> scale = new ArrayList<>();
}
--
Gitblit v1.9.1