From 5b95602d75b61294e307d11b8a896312ef72ab60 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十二月 2020 09:35:13 +0800
Subject: [PATCH] #newVersion
---
src/main/java/com/zy/asrs/controller/SiteController.java | 2 +-
src/main/java/com/zy/asrs/controller/ConsoleController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/core/DevpThread.java | 13 +++++++++++++
src/main/java/com/zy/core/ServerBootstrap.java | 14 ++++++++++++--
5 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index d84ee24..980903d 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -25,7 +25,7 @@
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensCrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.DevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 10dc000..520935e 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -15,7 +15,7 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.DevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a3b9eec..ef829aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -29,7 +29,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.DevpThread;
import com.zy.core.thread.LedThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/zy/core/DevpThread.java b/src/main/java/com/zy/core/DevpThread.java
new file mode 100644
index 0000000..715c3a5
--- /dev/null
+++ b/src/main/java/com/zy/core/DevpThread.java
@@ -0,0 +1,13 @@
+package com.zy.core;
+
+import com.zy.core.model.protocol.StaProtocol;
+
+import java.util.Map;
+
+public interface DevpThread extends ThreadHandler {
+
+ Map<Integer, StaProtocol> getStation();
+
+ void setPakMk(Integer siteId, boolean pakMk);
+
+}
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 48f02da..7a8aabd 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -92,8 +92,18 @@
// 鍒濆鍖栬緭閫佺嚎绾跨▼
log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new DevpThread(devp);
- new Thread(devpThread).start();
+ DevpThread devpThread = null;
+ switch (devp.getId()) {
+ case 1:
+ devpThread = new SiemensDevpThread(devp);
+ break;
+ case 2:
+
+ break;
+ default:
+ break;
+ }
+ new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
--
Gitblit v1.9.1