From 687d250bf7f02bebc03e660933a2669fa28d93b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 06 八月 2020 15:55:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 ++++++-
src/main/java/com/zy/core/thread/DevpThread.java | 45 ++++++++++++++++++++++
src/main/java/com/zy/core/model/Task.java | 13 +++++-
4 files changed, 70 insertions(+), 5 deletions(-)
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 8660126..2aa80f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -11,9 +11,11 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.common.model.StartupDto;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
@@ -124,8 +126,12 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
- // 涓嬪彂plc鍛戒护
-
+ // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+ staProtocol
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task<>(4, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
}
@@ -135,4 +141,8 @@
}
+ public static void main(String[] args) {
+
+ }
+
}
diff --git a/src/main/java/com/zy/core/model/Task.java b/src/main/java/com/zy/core/model/Task.java
index 417a0d0..c337aed 100644
--- a/src/main/java/com/zy/core/model/Task.java
+++ b/src/main/java/com/zy/core/model/Task.java
@@ -6,8 +6,17 @@
* Created by vincent on 2020/8/5
*/
@Data
-public class Task {
+public class Task<T> {
- private int id;
+ private Integer step;
+ private T data;
+
+ public Task() {
+ }
+
+ public Task(Integer step, T data) {
+ this.step = step;
+ this.data = data;
+ }
}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 61d016a..7113a2c 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -9,6 +9,9 @@
@Data
public class StaProtocol {
+ // 绔欑偣缂栧彿
+ private Integer siteId;
+
// 鑷姩
private boolean autoing;
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 030e98b..b8cfd82 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -37,9 +37,23 @@
public void run() {
while (true) {
try {
+ int step = 1;
Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
if (task != null) {
- System.out.println("浠诲姟"+task.getId());
+ step = task.getStep();
+ }
+ switch (step) {
+ // 璇绘暟鎹�
+ case 1:
+ readWorkNo(); // 璇诲彇宸ヤ綔鍙�
+ readStaDest(); // 璇诲彇鐩爣绔�
+ readStatus(); // 璇诲彇鐘舵��
+ readError(); // 璇诲彇寮傚父淇℃伅
+ break;
+ case 2:
+ break;
+ default:
+ break;
}
Thread.sleep(3000);
} catch (Exception e) {
@@ -64,6 +78,35 @@
return result;
}
+ /**
+ * 璇诲彇宸ヤ綔鍙�
+ */
+ private void readWorkNo(){
+
+ }
+
+ /**
+ * 璇诲彇鐩爣绔�
+ */
+ private void readStaDest(){
+
+ }
+
+ /**
+ * 璇诲彇鐘舵��
+ */
+ private void readStatus(){
+
+ }
+
+ /**
+ * 璇诲彇寮傚父淇℃伅
+ */
+ private void readError(){
+
+ }
+
+
@Override
public void close() {
--
Gitblit v1.9.1