From 1b0ad5a82848c113d89dbd3259e0e40604b4b17a Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期一, 25 三月 2024 13:11:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensRgvThread.java | 66 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index e18a15d..4bef755 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -67,9 +67,9 @@
readStatus();
break;
// // 宸ヤ綅1銆�2鍐欏叆鏁版嵁
-// case 2:
-// write((RgvCommand) task.getData());
-// break;
+ case 2:
+ write((RgvCommand) task.getData());
+ break;
//宸ヤ綅1鍐欏叆鏁版嵁
case 4:
write1((RgvCommand) task.getData());
@@ -172,7 +172,7 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 30);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 16);
if (result.IsSuccess) {
if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
rgvProtocol = new RgvProtocol();
@@ -185,22 +185,22 @@
rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 8));
rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 10));
rgvProtocol.setSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 14));
+ rgvProtocol.setRgvPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
// 宸ヤ綅1澶嶄綅淇″彿
- if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
- || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
- if (resetFlag1) {
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setAckFinish1((short)1);
- if (write(rgvCommand)) {
- resetFlag1 = false;
- }
- }
- }
+// if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
+// || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
+// if (resetFlag1) {
+// RgvCommand rgvCommand = new RgvCommand();
+// rgvCommand.setAckFinish1((short)1);
+// if (write(rgvCommand)) {
+// resetFlag1 = false;
+// }
+// }
+// }
// 宸ヤ綅2澶嶄綅淇″彿
// if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
@@ -249,25 +249,23 @@
return false;
}
// convertRow(command);
- command.setRgvNo(slave.getId());
- short[] array = new short[11];
- array[0] = command.getAckFinish1();
- array[1] = command.getTaskNo1();
- array[2] = command.getTaskMode1();
- array[3] = command.getSourceStaNo1();
- array[4] = command.getDestinationStaNo1();
-// array[0] = command.getAckFinish1();
-// array[1] = command.getTaskNo1();
-// array[2] = command.getTaskMode1();
-// array[3] = command.getSourceStaNo1();
-// array[4] = command.getDestinationStaNo1();
-// array[5] = command.getAckFinish2();
-// array[6] = command.getTaskNo2();
-// array[7] = command.getTaskMode2();
-// array[8] = command.getSourceStaNo2();
-// array[9] = command.getDestinationStaNo2();
-// array[10] = command.getCommand();
- OperateResult result = siemensNet.Write("DB100.0", array);
+ OperateResult result = new OperateResult();
+ boolean[] array = new boolean[1];
+ array[0] = true;
+ if (command.isAuto()){
+ result = siemensNet.Write("DB99.0.0", true);
+ } else if (command.isRestoreTask()) {
+ result = siemensNet.Write("DB99.0.1", true);
+ }
+ else if (command.isCompTask()) {
+ result = siemensNet.Write("DB99.0.2", true);
+ }
+ else if (command.isStop()) {
+ result = siemensNet.Write("DB99.0.3", true);
+ }
+ else if (command.isReset()) {
+ result = siemensNet.Write("DB99.0.4", true);
+ }
// if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
// short commandFinish = 3; //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
--
Gitblit v1.9.1