From 9338cdee4bae84f74825fbd86786e35ddfbd2d64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 05 一月 2022 16:10:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 49 ++++++++++++++++++++-----------------------------
1 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
similarity index 94%
rename from src/main/java/com/zy/core/thread/CrnThread.java
rename to src/main/java/com/zy/core/thread/MelsecCrnThread.java
index dd6d4f9..57d10ea 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.core.CrnThread;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -33,14 +34,14 @@
*/
@Data
@Slf4j
-public class CrnThread implements Runnable, ThreadHandler {
+public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread {
private MelsecMcNet melsecMcNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
- public CrnThread(CrnSlave slave) {
+ public MelsecCrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -187,32 +188,22 @@
}
command.setCrnNo(slave.getId());
short[] array = new short[10];
+ array[0] = command.getAckFinish();
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+ array[9] = command.getCommand();
+ OperateResult result = melsecMcNet.Write("D0", array);
- OperateResult result;
if (command.getAckFinish() == 0) {
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
- array[9] = command.getCommand();
- result = melsecMcNet.Write("D0", array);
-
- short[] array0 = new short[1];
- array0[0] = 1;
- result = melsecMcNet.Write("D9", array);
-
- } else {
-
+ short commandFinish = 1;
+ result = melsecMcNet.Write("D9", commandFinish);
}
-
-
-
-
try {
// 鏃ュ織璁板綍
@@ -264,10 +255,10 @@
slave.setPort(5015);
slave.setRack(0);
slave.setSlot(0);
- CrnThread crnThread = new CrnThread(slave);
- crnThread.connect();
- crnThread.readStatus();
- System.out.println(JSON.toJSONString(crnThread.crnProtocol));
+ MelsecCrnThread melsecCrnThread = new MelsecCrnThread(slave);
+ melsecCrnThread.connect();
+ melsecCrnThread.readStatus();
+ System.out.println(JSON.toJSONString(melsecCrnThread.crnProtocol));
// 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
// CrnCommand command = new CrnCommand();
--
Gitblit v1.9.1