From 3b08b4868e19a653aa5d61e22868a1c81f23d217 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期四, 01 八月 2024 16:39:27 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/core/thread/RgvThread.java | 135 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 119 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index df569ca..72b72ea 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
+import com.zy.common.utils.News;
+import com.zy.core.RgvThread2;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -19,6 +21,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
import lombok.Data;
@@ -33,7 +36,7 @@
*/
@Data
@Slf4j
-public class RgvThread implements Runnable, ThreadHandler {
+public class RgvThread implements Runnable, RgvThread2 {
private SiemensS7Net siemensNet;
private RgvSlave slave;
@@ -46,6 +49,9 @@
* 宸ヤ綅2澶嶄綅淇″彿
*/
private boolean resetFlag2 = false;
+
+ //閿佸畾鏍囪
+ private boolean PakMk = true;
public RgvThread(RgvSlave slave) {
this.slave = slave;
@@ -91,13 +97,8 @@
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);
+ write1(command);
break;
// 鍥炲師鐐� 閬胯
case 9:
@@ -180,7 +181,7 @@
try {
OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 30);
if (result.IsSuccess) {
- if (null == rgvProtocol) {
+ if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
rgvProtocol = new RgvProtocol();
rgvProtocol.setRgvNo(slave.getId());
}
@@ -247,12 +248,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();
}
}
@@ -334,6 +335,26 @@
return false;
}
+ 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());
@@ -343,15 +364,95 @@
array[2] = command.getTaskMode1();
array[3] = command.getSourceStaNo1();
array[4] = command.getDestinationStaNo1();
- siemensNet.Write("DB100.10", 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.10", 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 {
// 鏃ュ織璁板綍
@@ -371,7 +472,9 @@
null
);
bean.insert(basRgvOpt);
- } catch (Exception ignore) {}
+ } catch (Exception ignore) {
+ log.error(ignore.getMessage());
+ }
if (result != null && result.IsSuccess) {
Thread.sleep(200);
--
Gitblit v1.9.1