From 8f93d32b15cff5287a07649da92bd5b6276c14e2 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 26 六月 2024 22:13:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 154 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 144 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index cd891bc..0ea4c8f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -200,6 +200,9 @@
case 9:
write9((StaProtocol)task.getData());
break;
+ case 10:
+ write10((StaProtocol)task.getData());
+ break;
default:
break;
}
@@ -292,6 +295,7 @@
staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
}
}
+
if (slave.getId()==2){
Thread.sleep(200);
int[] staNosRgv = {623,624,625,626};
@@ -305,20 +309,25 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 0)); // 灏忚溅鐩爣浣�
+ try{
+ staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 0)); // 灏忚溅鐩爣浣�
- staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 2)); // 鐩爣绔�
+ staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 鐩爣绔�
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, 4, 1);
- staProtocol.setRGV1(status[0]); // 鑷姩
- staProtocol.setRGV2(status[1]); // 鏈夌墿
- staProtocol.setRGV3(status[2]); // 鍙叆
- staProtocol.setRGV4(status[3]);// 鍙嚭
- staProtocol.setRGV5(status[4]); // 绌烘澘淇″彿
- staProtocol.setRGV6(status[5]); // 婊℃墭鐩�
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
+ staProtocol.setRGV1(status[0]); // 鑷姩
+ staProtocol.setRGV2(status[1]); // 鏈夌墿
+ staProtocol.setRGV3(status[2]); // 鍙叆
+ staProtocol.setRGV4(status[3]);//
+ staProtocol.setRGV5(status[4]); //
+ staProtocol.setRGV6(status[5]); // 婊℃墭鐩�
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
}
}
}
+
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
@@ -541,30 +550,120 @@
/**
* 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
*/
+ private void write10(StaProtocol staProtocol) throws InterruptedException {
+ if (null == staProtocol) {
+ return;
+ }
+ boolean rgv4 = staProtocol.isRGV4();
+ boolean rgv5 = staProtocol.isRGV5();
+ OperateResult result1 = null;
+ String resultV1 = "";
+ switch (staProtocol.getSiteId()){
+ case 623:
+ resultV1 = "DB100.1804";
+ break;
+ case 624:
+ resultV1 = "DB100.1810";
+ break;
+ case 625:
+ resultV1 = "DB100.1816";
+ break;
+ case 626:
+ resultV1 = "DB100.1822";
+ break;
+ default:
+ return;
+ }
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
+ //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ int writeCount = 1;
+ do {
+ try{
+ if(!result1.IsSuccess){
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
+ if (resultRead1.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+ if (status[rgv4? 3:4]){
+ break;
+ } else {
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ } else {
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ }catch (Exception e){
+ log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+ }
+ writeCount++;
+ } while (writeCount<6);
+ }
private void write9(StaProtocol staProtocol) throws InterruptedException {
if (null == staProtocol) {
return;
}
short resultS1 = staProtocol.getEndRow();
OperateResult result1 = null;
+ OperateResult result2 = null;
String resultV1 = "";
+ String resultV2 = "";
switch (staProtocol.getSiteId()){
case 623:
resultV1 = "1800";
+ resultV2 = "1812";
break;
case 624:
resultV1 = "1806";
+ resultV2 = "1818";
break;
case 625:
resultV1 = "1812";
+ resultV2 = "1800";
break;
case 626:
resultV1 = "1818";
+ resultV2 = "1806";
break;
default:
return;
}
result1 = siemensS7Net.Write(resultV1, resultS1);
+ result2 = siemensS7Net.Write(resultV2, resultS1);
//纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
try {
Thread.sleep(200);
@@ -585,7 +684,7 @@
OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
if (resultRead1.IsSuccess) {
short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (transInt16 == resultS1 || transInt16 == (short) 2 || transInt16 == (short) 3){
+ if (transInt16 == resultS1){
break;
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
@@ -607,6 +706,41 @@
writeCount++;
} while (writeCount<6);
+ writeCount = 1;
+ do {
+ try{
+ if(!result2.IsSuccess){
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ result2 = siemensS7Net.Write(resultV2, resultS1);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 2);
+ if (resultRead2.IsSuccess) {
+ short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead2.Content, 0);
+ if (transInt16 == resultS1){
+ break;
+ } else {
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ result2 = siemensS7Net.Write(resultV2, resultS1);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ } else {
+ log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+ result2 = siemensS7Net.Write(resultV2, resultS1);
+ Thread.sleep(100);
+ writeCount++;
+ continue;
+ }
+ }catch (Exception e){
+ log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+ }
+ writeCount++;
+ } while (writeCount<6);
+
if (!result1.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
--
Gitblit v1.9.1