From 7b8021d7ff94015d7034ead10fea5006d0032301 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 24 四月 2026 09:13:51 +0800
Subject: [PATCH] WCS功能完善
---
src/main/java/com/zy/core/thread/RgvThread.java | 391 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 258 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 6c259f9..e3cf4a0 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -7,20 +7,19 @@
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasRgv;
-import com.zy.asrs.entity.BasRgvOpt;
-import com.zy.asrs.service.BasRgvOptService;
-import com.zy.asrs.service.BasRgvService;
-import com.zy.core.ThreadHandler;
+import com.zy.core.RgvThread2;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.RgvStatusType;
-import com.zy.core.enums.RgvTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
+import com.zy.entity.BasRgv;
+import com.zy.entity.BasRgvOpt;
+import com.zy.service.BasRgvOptService;
+import com.zy.service.BasRgvService;
+import com.zy.utils.News;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -33,7 +32,7 @@
*/
@Data
@Slf4j
-public class RgvThread implements Runnable, ThreadHandler {
+public class RgvThread implements Runnable, RgvThread2 {
private SiemensS7Net siemensNet;
private RgvSlave slave;
@@ -46,6 +45,9 @@
* 宸ヤ綅2澶嶄綅淇″彿
*/
private boolean resetFlag2 = false;
+
+ //閿佸畾鏍囪
+ private boolean PakMk = true;
public RgvThread(RgvSlave slave) {
this.slave = slave;
@@ -67,58 +69,53 @@
case 1:
readStatus();
break;
- // 宸ヤ綅1銆�2鍐欏叆鏁版嵁
+// // 宸ヤ綅1銆�2鍐欏叆鏁版嵁
case 2:
write((RgvCommand) task.getData());
break;
//宸ヤ綅1鍐欏叆鏁版嵁
- case 4:
- write1((RgvCommand) task.getData());
- break;
- //宸ヤ綅2鍐欏叆鏁版嵁
- case 5:
- write2((RgvCommand) task.getData());
- break;
+// case 4:
+// write1((RgvCommand) task.getData());
+// break;
+// //宸ヤ綅2鍐欏叆鏁版嵁
+// case 5:
+// write2((RgvCommand) task.getData());
+// break;
// 澶嶄綅
- case 3:
- RgvCommand command = (RgvCommand) task.getData();
- if (null == command) {
- command = new RgvCommand();
- }
- command.setRgvNo(slave.getId()); // RGV缂栧彿
- command.setTaskNo1((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish1((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourceStaNo1((short)0); // 婧愮珯
- command.setDestinationStaNo1((short)0); // 鐩爣绔�
- command.setTaskNo2((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish2((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode2(RgvTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourceStaNo2((short)0); // 婧愮珯
- command.setDestinationStaNo2((short)0); // 鐩爣绔�
- command.setCommand((short)0);
- write(command);
- break;
- // 鍥炲師鐐� 閬胯
- case 9:
- RgvCommand commandAvoidanceXY = (RgvCommand) task.getData();
- if (null == commandAvoidanceXY) {
- commandAvoidanceXY = new RgvCommand();
- }
- commandAvoidanceXY.setRgvNo(slave.getId()); // RGV缂栧彿
- commandAvoidanceXY.setTaskNo1((short) 9999); // 宸ヤ綔鍙�
- commandAvoidanceXY.setAckFinish1((short) 1); // 浠诲姟瀹屾垚纭浣�
- commandAvoidanceXY.setTaskMode1(RgvTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
- commandAvoidanceXY.setSourceStaNo1((short)0); // 婧愮珯
- commandAvoidanceXY.setDestinationStaNo1((short)0); // 鐩爣绔�
- commandAvoidanceXY.setTaskNo2((short) 0); // 宸ヤ綔鍙�
- commandAvoidanceXY.setAckFinish2((short) 1); // 浠诲姟瀹屾垚纭浣�
- commandAvoidanceXY.setTaskMode2(RgvTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
- commandAvoidanceXY.setSourceStaNo2((short)0); // 婧愮珯
- commandAvoidanceXY.setDestinationStaNo2((short)0); // 鐩爣绔�
- commandAvoidanceXY.setCommand((short)0);
- write(commandAvoidanceXY);
- break;
+// case 3:
+// RgvCommand command = (RgvCommand) task.getData();
+// if (null == command) {
+// command = new RgvCommand();
+// }
+// command.setRgvNo(slave.getId()); // RGV缂栧彿
+// command.setTaskNo1((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish1((short) 1); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
+// command.setSourceStaNo1((short)0); // 婧愮珯
+// command.setDestinationStaNo1((short)0); // 鐩爣绔�
+// command.setCommand((short)0);
+// write1(command);
+// break;
+// // 鍥炲師鐐� 閬胯
+// case 9:
+// RgvCommand commandAvoidanceXY = (RgvCommand) task.getData();
+// if (null == commandAvoidanceXY) {
+// commandAvoidanceXY = new RgvCommand();
+// }
+// commandAvoidanceXY.setRgvNo(slave.getId()); // RGV缂栧彿
+// commandAvoidanceXY.setTaskNo1((short) 9999); // 宸ヤ綔鍙�
+// commandAvoidanceXY.setAckFinish1((short) 1); // 浠诲姟瀹屾垚纭浣�
+// commandAvoidanceXY.setTaskMode1(RgvTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+// commandAvoidanceXY.setSourceStaNo1((short)0); // 婧愮珯
+// commandAvoidanceXY.setDestinationStaNo1((short)0); // 鐩爣绔�
+//// commandAvoidanceXY.setTaskNo2((short) 0); // 宸ヤ綔鍙�
+//// commandAvoidanceXY.setAckFinish2((short) 1); // 浠诲姟瀹屾垚纭浣�
+//// commandAvoidanceXY.setTaskMode2(RgvTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+//// commandAvoidanceXY.setSourceStaNo2((short)0); // 婧愮珯
+//// commandAvoidanceXY.setDestinationStaNo2((short)0); // 鐩爣绔�
+// commandAvoidanceXY.setCommand((short)0);
+// write(commandAvoidanceXY);
+// break;
default:
break;
}
@@ -136,21 +133,25 @@
private void initRgv() {
if (null == rgvProtocol) {
rgvProtocol = new RgvProtocol();
+ rgvProtocol.setRgvNo(slave.getId());
}
rgvProtocol.setMode((short) -1);
- rgvProtocol.setStatus((short)-1);
- rgvProtocol.setTaskNo1((short)0);
- rgvProtocol.setStatus1((short)-1);
rgvProtocol.setLoaded1((short)0);
- rgvProtocol.setWalkPos((short)0);
- rgvProtocol.setRgvPos((short)0);
- rgvProtocol.setTaskNo2((short)0);
- rgvProtocol.setStatus2((short)-1);
- rgvProtocol.setLoaded2((short)0);
+ rgvProtocol.setRgvPos(0);
+ rgvProtocol.setStartSta((short)0);
+ rgvProtocol.setEndSta((short)0);
+ rgvProtocol.setTaskNo1((short)0);
rgvProtocol.setAlarm((short)0);
- rgvProtocol.setxSpeed((short) 0);
- rgvProtocol.setxDistance((short) 0);
- rgvProtocol.setxDuration((short) 0);
+ rgvProtocol.setStatus((short)-1);
+
+// rgvProtocol.setStatus1((short)-1);
+// rgvProtocol.setWalkPos((short)0);
+// rgvProtocol.setTaskNo2((short)0);
+// rgvProtocol.setStatus2((short)-1);
+// rgvProtocol.setLoaded2((short)0);
+// rgvProtocol.setxSpeed((short) 0);
+// rgvProtocol.setxDistance((short) 0);
+// rgvProtocol.setxDuration((short) 0);
}
@Override
@@ -178,29 +179,32 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB1.0", (short) 34);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 22);
if (result.IsSuccess) {
- if (null == rgvProtocol) {
+ if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
rgvProtocol = new RgvProtocol();
rgvProtocol.setRgvNo(slave.getId());
}
- rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
- rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2));
- rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt16(result.Content, 4));
- rgvProtocol.setStatus1(siemensNet.getByteTransform().TransInt16(result.Content, 6));
- rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
- rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
- rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
- rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
- rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
- rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
- rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
- rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+ rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+ rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+ rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 6));
+ rgvProtocol.setStartSta(siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ rgvProtocol.setEndSta(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ rgvProtocol.setTaskNo1((short) siemensNet.getByteTransform().TransInt32(result.Content, 14));
+ rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+
+// rgvProtocol.setStatus1(siemensNet.getByteTransform().TransInt16(result.Content, 6));
+// rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+// rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+// rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+// rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+// rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+// rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+// rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+// rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
+// rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
+// rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
// rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
// rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
// rgvProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
@@ -208,28 +212,28 @@
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)
- || rgvProtocol.getStatusType2().equals(RgvStatusType.FETCHWAITING)) {
- if (resetFlag2) {
- RgvCommand rgvCommand = new RgvCommand();
- rgvCommand.setAckFinish2((short)1);
- if (write(rgvCommand)) {
- resetFlag2 = false;
- }
- }
- }
+// if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
+// || rgvProtocol.getStatusType2().equals(RgvStatusType.FETCHWAITING)) {
+// if (resetFlag2) {
+// RgvCommand rgvCommand = new RgvCommand();
+// rgvCommand.setAckFinish2((short)1);
+// if (write(rgvCommand)) {
+// resetFlag2 = false;
+// }
+// }
+// }
try {
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -247,12 +251,12 @@
} else {
initRgv();
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戣鍙朢GV plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("璇诲彇RGV plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+// log.error("璇诲彇RGV plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
} catch (Exception e) {
e.printStackTrace();
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戣鍙朢GV plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("璇诲彇RGV plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// log.error("璇诲彇RGV plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initRgv();
}
}
@@ -267,25 +271,36 @@
}
// convertRow(command);
command.setRgvNo(slave.getId());
- short[] array = new short[11];
- array[0] = command.getAckFinish1();
- array[1] = command.getTaskNo1();
+ short[] array = new short[3];
+ array[0] = command.getSourceStaNo1();
+ array[1] = command.getDestinationStaNo1();
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 result1 = siemensNet.Write("DB100.0", array);
- if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
- short commandFinish = 3; //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
- Thread.sleep(100L);
- result = siemensNet.Write("DB100.20", commandFinish);
- }
+ OperateResult result2 = siemensNet.Write("DB100.6", command.getTaskNo1().intValue());
+
+ Thread.sleep(100);
+ OperateResult result3 = siemensNet.Write("DB100.10", command.getCommand());
+
+
+// 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();
+
+
+// if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
+// short commandFinish = 3; //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
+// Thread.sleep(100L);
+// result = siemensNet.Write("DB100.20", commandFinish);
+// }
try {
// 鏃ュ織璁板綍
@@ -307,7 +322,7 @@
bean.insert(basRgvOpt);
} catch (Exception ignore) {}
- if (result != null && result.IsSuccess) {
+ if (result1 != null && result1.IsSuccess && result2 != null && result2.IsSuccess && result3 != null && result3.IsSuccess) {
Thread.sleep(200);
this.readStatus();
log.info("RGV 鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
@@ -329,7 +344,27 @@
return false;
}
- siemensNet.Write("DB100.20", command.getCommand());
+ OperateResultExOne<byte[]> result3 = siemensNet.Read("DB100.0", (short) 12);
+ OperateResultExOne<byte[]> result4 = siemensNet.Read("DB100.10", (short) 2);
+ if (result3.IsSuccess){
+ RgvCommand one = new RgvCommand();
+// one.setAckFinish1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
+ one.setTaskNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 2));
+ one.setTaskMode1(siemensNet.getByteTransform().TransInt16(result3.Content, 4));
+ one.setSourceStaNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 6));
+ one.setDestinationStaNo1(siemensNet.getByteTransform().TransInt16(result3.Content, 8));
+ one.setCommand(siemensNet.getByteTransform().TransInt16(result4.Content, 0));
+
+ News.error("RGV鍛戒护涓嬪彂鍓嶈鍙栫姸鎬乕id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ }
+
+
+ OperateResult result8 = siemensNet.Write("DB100.10", (short) 0);
+ if (result8.IsSuccess){
+ News.error("涓嬪彂鍓嶆妸杞﹀瓙纭浣嶇疆涓�0");
+ }
+
+// siemensNet.Write("DB100.20", command.getCommand());
command.setRgvNo(slave.getId());
short[] array = new short[5];
@@ -338,15 +373,95 @@
array[2] = command.getTaskMode1();
array[3] = command.getSourceStaNo1();
array[4] = command.getDestinationStaNo1();
- siemensNet.Write("DB100.20", command.getCommand());
+ siemensNet.Write("DB100.10", command.getCommand());
OperateResult result = siemensNet.Write("DB100.0", array);
- if (command.getAckFinish1() == 0) {
- short commandFinish = 1; //宸ヤ綅1浠诲姟鍐欏叆
- Thread.sleep(100L);
- result = siemensNet.Write("DB100.20", commandFinish);
+ if (!result.IsSuccess){
+ News.error("鍐欏叆RGVplc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===> [id:{}],{}",slave.getId(),JSON.toJSON(command));
+ MessageQueue.offer(SlaveType.Rgv,slave.getId(),new Task(4,command));
+ Thread.sleep(100);
+ readStatus();
+ return false;
}
+
+ //RGV浠诲姟鍐欏叆鍚庯紝鍥炶涓�娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(400);
+ try {
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 12);
+ if (resultRead.IsSuccess){
+ RgvCommand one = new RgvCommand();
+// one.setAckFinish1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
+ one.setTaskNo1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourceStaNo1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setDestinationStaNo1(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ if (
+ !command.getTaskNo1().equals(one.getTaskNo1()) ||
+ !command.getTaskMode1().equals(one.getTaskMode1()) ||
+ !command.getSourceStaNo1().equals(one.getSourceStaNo1()) ||
+ !command.getDestinationStaNo1().equals(one.getDestinationStaNo1())
+ ){
+ try{
+ News.error("RGV鍛戒护鍦板潃鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ }catch (Exception e){
+ try{
+ News.error("鏃ュ織鎵撳嵃澶辫触锛�===>>鍙傛暟one鎶ラ敊 [id:{}],{}", slave.getId(), JSON.toJSON(command),JSON.toJSON(resultRead));
+ }catch (Exception e1){
+ News.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+ }
+ }
+ News.error("Rgv鍛戒护鍥炶澶辫触鍚庯紝閲嶆柊娣诲姞浠诲姟鍒伴槦鍒� ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
+ MessageQueue.offer(SlaveType.Rgv, slave.getId(), new Task(4, command));
+ Thread.sleep(100);
+ readStatus();
+ return false;
+ }else {
+ News.info("RGV鍛戒护鍦板潃鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ }
+ }
+ }catch (Exception e){
+ News.error("RGV鍛戒护鍦板潃鍐欏叆鍚庡洖璇诲嚭閿�");
+ }
+
+ if (command.getAckFinish1() == 0) {
+ if (result.IsSuccess) {
+ Thread.sleep(300);
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount2 = 0;
+
+ do {
+ writeCount2++;
+ short commandFinish = (short) 1;
+ result = siemensNet.Write("DB100.10", commandFinish);
+ if(result.IsSuccess){
+ //RGV浠诲姟鍐欏叆鍚庯紝鍥炶涓�娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.10", (short) 2);
+ if (resultRead.IsSuccess) {
+ commandFinish=siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+ if (commandFinish != 1){
+ News.error("RGV浠诲姟纭浣�"+commandFinish+"鍐欏叆鏁版嵁涓庡洖璇绘暟鎹笉涓�鑷达紒"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+ }else{
+ //浠诲姟鍛戒护鍐欏叆鎴愬姛
+ News.info("RGV浠诲姟纭浣�"+commandFinish+"鍥炶鎴愬姛锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+ break;
+ }
+ }else {
+ News.error("RGV浠诲姟纭浣�"+commandFinish+"鍥炶澶辫触锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+ }
+ } else {
+ News.error("RGV浠诲姟纭浣�"+commandFinish+"鍐欏叆澶辫触锛�"+"寰幆鎵ц娆℃暟:"+writeCount2+"娆�");
+ }
+ }while (writeCount2<5);
+ }
+ }
+
+// if (command.getAckFinish1() == 0) {
+// short commandFinish = 1; //宸ヤ綅1浠诲姟鍐欏叆
+// Thread.sleep(200);
+// result = siemensNet.Write("DB100.10", commandFinish);
+// }
try {
// 鏃ュ織璁板綍
@@ -366,7 +481,9 @@
null
);
bean.insert(basRgvOpt);
- } catch (Exception ignore) {}
+ } catch (Exception ignore) {
+ log.error(ignore.getMessage());
+ }
if (result != null && result.IsSuccess) {
Thread.sleep(200);
@@ -451,7 +568,7 @@
public static void main(String[] args) throws InterruptedException {
RgvSlave slave = new RgvSlave();
slave.setId(1);
- slave.setIp("192.168.6.9");
+ slave.setIp("10.10.10.53");
slave.setRack(0);
slave.setSlot(0);
RgvThread rgvThread = new RgvThread(slave);
@@ -459,6 +576,14 @@
rgvThread.readStatus();
System.out.println(JSON.toJSONString(rgvThread.rgvProtocol));
Thread.sleep(3000L);
+ RgvCommand command = new RgvCommand();
+ command.setRgvNo(1);
+ command.setSourceStaNo1((short)1120);
+ command.setDestinationStaNo1((short)1101);
+ command.setTaskNo1((short)1);
+ command.setTaskMode1((short)3);
+ command.setCommand((short)1);
+ rgvThread.write(command);
}
--
Gitblit v1.9.1