From 309ed0561c1123e0d8df7c8b26de60b6107b08fd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 11 九月 2024 09:32:47 +0800
Subject: [PATCH] #fs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 159 +++++++---------------------------------------------
1 files changed, 23 insertions(+), 136 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 851cfce..23ec040 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -133,7 +133,7 @@
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 9;
+ private int barcodeSize = 5;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -302,87 +302,6 @@
}
}
- if (slave.getId()==2){
- Thread.sleep(200);
- int[] staNosRgv = {623,624,625,626};
- for (int i = 0; i < staNosRgv.length; i++) {
- OperateResultExOne<byte[]> resultRgv = siemensS7Net.Read("DB100."+(1800+i*6), (short) 5);
- OperateResultExOne<byte[]> resultRgv2 = siemensS7Net.Read("DB100."+(1824+i*12), (short) 8);
- if (resultRgv.IsSuccess) {
- Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- continue;
- }
- try{
- staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0)); // 灏忚溅鐩爣浣�
-
- staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 褰撳墠浣嶇疆
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
- staProtocol.setRGV1(status[0]); // 灏忚溅鏃犺揣绌洪棽
- staProtocol.setRGV2(status[1]); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
- staProtocol.setRGV3(status[2]); // 灏忚溅杩愯涓�
-
-// staProtocol.setRGV1(false); // 灏忚溅鏃犺揣绌洪棽
-// staProtocol.setRGV2(true); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
-// staProtocol.setRGV3(false); // 灏忚溅杩愯涓�
-
- staProtocol.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 2));//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
- staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4)); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
- staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6)); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
-//
-// staProtocol.setRGV44((short) 0);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
-// staProtocol.setRGV55((short) 0); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
-// staProtocol.setRGV66((short) 0); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
-
- staProtocol.setRGV4(staProtocol.getRGV44() != 0 && staProtocol.getRGV44() != 2);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
- staProtocol.setRGV5(staProtocol.getRGV55() != 0 && staProtocol.getRGV55() != 2); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
- staProtocol.setRGV6(staProtocol.getRGV66() != 0 && staProtocol.getRGV66() != 2); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
-
-
- }catch (Exception e){
- log.error("璇诲彇RGV淇℃伅澶辫触"+e.getMessage());
- }
- }
- }
- }
-
-
- //鏉＄爜鎵弿鍣�
- Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
- if (result2.IsSuccess) {
- int[] staNosRgv = {281,292,173,214,120,100,101,102,103};
-
- for (int i = 0; i < barcodeSize; i++) { //1:281 2:292 3:174(173) 4:214 5:120
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- continue;
- }
- staProtocol.setBarcode(barcode);
- barcodeThread.setBarcode(barcode);
- }
- }
- }
-
- //RGV灏忚溅
- Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
- if (result3.IsSuccess) {
- Integer siteId = 2000;
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
- }
if (result.IsSuccess) {
@@ -396,9 +315,13 @@
basDevps.add(staProtocol.toSqlModel());
}
- BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
- throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ try{
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+ throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ }
+ } catch (Exception e){
+ log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
} catch (Exception e) {
e.printStackTrace();
@@ -466,26 +389,8 @@
Integer siteId = staProtocol.getSiteId();
Integer index =0;
switch (siteId){
- case 118:
+ case 607:
index=0;
- break;
- case 119:
- index=1;
- break;
- case 120:
- index=2;
- break;
- case 121:
- index=3;
- break;
- case 131:
- index=4;
- break;
- case 135:
- index=5;
- break;
- case 147:
- index=6;
break;
default:
return;
@@ -495,7 +400,7 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100.600." + index, true); // 浠诲姟瀹屾垚
+ write = siemensS7Net.Write("DB100.1872", (short) 1); // 浠诲姟瀹屾垚
if(write.IsSuccess){
writeCount=6;
}else {
@@ -524,26 +429,8 @@
Integer siteId = staProtocol.getSiteId();
Integer index =0;
switch (siteId){
- case 118:
+ case 607:
index=0;
- break;
- case 119:
- index=1;
- break;
- case 120:
- index=2;
- break;
- case 121:
- index=3;
- break;
- case 131:
- index=4;
- break;
- case 135:
- index=5;
- break;
- case 147:
- index=6;
break;
default:
return;
@@ -553,10 +440,10 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100.600." + index, false); // 浠诲姟瀹屾垚澶嶄綅
+ write = siemensS7Net.Write("DB100.1872", (short) 0); // 浠诲姟瀹屾垚澶嶄綅
if(write.IsSuccess){
writeCount=6;
- }else {
+ } else {
writeCount++;
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
@@ -974,43 +861,43 @@
String resultV1 = "";
switch (devNo){
case 1:
- resultV1 = "DB100.1824";
+ resultV1 = "DB500.0.0";
break;
case 2:
- resultV1 = "DB100.1836";
+ resultV1 = "DB500.0.1";
break;
case 3:
- resultV1 = "DB100.1848";
+ resultV1 = "DB500.0.2";
break;
default:
return;
}
- OperateResult result = siemensS7Net.Write(resultV1, (short) 1);
+ OperateResult result = siemensS7Net.Write(resultV1, true);
Integer writeCount = 0;
do {
try{
if(!result.IsSuccess){
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, (short) 1);
+ result = siemensS7Net.Write(resultV1, true);
Thread.sleep(100);
writeCount++;
continue;
}
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 2);
+ OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 1);
if (resultRead1.IsSuccess) {
- short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (transInt16 == (short) 1){
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+ if (status[devNo-1]){
break;
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, (short) 1);
+ result = siemensS7Net.Write(resultV1, true);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, (short) 1);
+ result = siemensS7Net.Write(resultV1, true);
Thread.sleep(100);
writeCount++;
continue;
--
Gitblit v1.9.1