From b49345c85dfad9d73c6b88b54679ad5de9dbfe3c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 09:43:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 167 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 145 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index be4cdeb..6cc420d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -10,6 +10,8 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
+import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
import com.zy.core.News;
@@ -133,7 +135,7 @@
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 9;
+ private int barcodeSize = 5;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -347,6 +349,103 @@
}
}
}
+ } else if (slave.getId()==1){
+ try{
+ RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
+
+ OperateResultExOne<byte[]> resultSignOne = siemensS7Net.Read("DB293.106", (short) (8));
+
+ int smallEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 0);// 灏忔枡绌烘墭
+ int bigEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 2);// 澶ф枡绌烘墭
+ int smallTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 4);// 灏忔枡缈昏浆
+ int bigTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 6);// 澶ф枡缈昏浆
+
+ try{
+ RgvOneSign smallEmptySign = rgvOneSignMapper.selectOneSign("smallEmpty");
+ if (!Cools.isEmpty(smallEmptySign)){
+ smallEmptySign.setRgvOneSign(smallEmpty);
+ rgvOneSignMapper.updateById(smallEmptySign);
+ }
+ } catch (Exception e){
+ RgvOneSign smallEmptySign = rgvOneSignMapper.selectOneSign("smallEmpty");
+ if (!Cools.isEmpty(smallEmptySign)){
+ smallEmptySign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(smallEmptySign);
+ }
+ }
+ try{
+ RgvOneSign bigEmptySign = rgvOneSignMapper.selectOneSign("bigEmpty");
+ if (!Cools.isEmpty(bigEmptySign)){
+ bigEmptySign.setRgvOneSign(bigEmpty);
+ rgvOneSignMapper.updateById(bigEmptySign);
+ }
+ } catch (Exception e){
+ RgvOneSign bigEmptySign = rgvOneSignMapper.selectOneSign("bigEmpty");
+ if (!Cools.isEmpty(bigEmptySign)){
+ bigEmptySign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(bigEmptySign);
+ }
+ }
+ try{
+ RgvOneSign smallTurnSign = rgvOneSignMapper.selectOneSign("smallTurn");
+ if (!Cools.isEmpty(smallTurnSign)){
+ smallTurnSign.setRgvOneSign(smallTurn);
+ rgvOneSignMapper.updateById(smallTurnSign);
+ }
+ } catch (Exception e){
+ RgvOneSign smallTurnSign = rgvOneSignMapper.selectOneSign("smallTurn");
+ if (!Cools.isEmpty(smallTurnSign)){
+ smallTurnSign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(smallTurnSign);
+ }
+ }
+ try{
+ RgvOneSign bigTurnSign = rgvOneSignMapper.selectOneSign("bigTurn");
+ if (!Cools.isEmpty(bigTurnSign)){
+ bigTurnSign.setRgvOneSign(bigTurn);
+ rgvOneSignMapper.updateById(bigTurnSign);
+ }
+ } catch (Exception e){
+ RgvOneSign bigTurnSign = rgvOneSignMapper.selectOneSign("bigTurn");
+ if (!Cools.isEmpty(bigTurnSign)){
+ bigTurnSign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(bigTurnSign);
+ }
+ }
+ } catch (Exception e){
+ log.error("璇诲彇杈撻�佺嚎鏁伴噺鏍囪鍑虹幇寮傚父锛�"+e);
+ try{
+ RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
+
+ RgvOneSign smallEmptySign = rgvOneSignMapper.selectOneSign("smallEmpty");
+ if (!Cools.isEmpty(smallEmptySign)){
+ smallEmptySign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(smallEmptySign);
+ }
+
+
+ RgvOneSign bigEmptySign = rgvOneSignMapper.selectOneSign("bigEmpty");
+ if (!Cools.isEmpty(bigEmptySign)){
+ bigEmptySign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(bigEmptySign);
+ }
+
+
+ RgvOneSign smallTurnSign = rgvOneSignMapper.selectOneSign("smallTurn");
+ if (!Cools.isEmpty(smallTurnSign)){
+ smallTurnSign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(smallTurnSign);
+ }
+
+ RgvOneSign bigTurnSign = rgvOneSignMapper.selectOneSign("bigTurn");
+ if (!Cools.isEmpty(bigTurnSign)){
+ bigTurnSign.setRgvOneSign(999);
+ rgvOneSignMapper.updateById(bigTurnSign);
+ }
+ } catch (Exception e2){
+ log.error("璇诲彇杈撻�佺嚎鏁伴噺鏍囪鍑虹幇寮傚父锛�"+e2);
+ }
+ }
}
@@ -354,11 +453,15 @@
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
+ int[] staNosRgv = new int[]{281,292,173,214,120};
+ if (slave.getId()==2){
+ staNosRgv = new int[]{453,460,518,532,607};
+ }
+ for (int i = 0; i < barcodeSize; i++) {
+ //1:281 2:292 3:174(173) 4:214 5:120
+ //6:453 7:460 8:508 9:534 10:611
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, (i + 1+((slave.getId()-1)*5)));
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
@@ -371,19 +474,34 @@
}
}
- //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);
+ if (slave.getId()==2){
+ OperateResultExOne<byte[]> result464 = siemensS7Net.Read("DB101.3720",(short)(8));
+ if (result464.IsSuccess) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result464.Content,0,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 11);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ StaProtocol staProtocol = station.get(464);
+ if (null != staProtocol) {
+ staProtocol.setBarcode(barcode);
+ barcodeThread.setBarcode(barcode);
+ }
+ }
}
- staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
}
+
+// //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) {
@@ -397,9 +515,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();
@@ -478,7 +600,7 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100.1872", 1); // 浠诲姟瀹屾垚
+ write = siemensS7Net.Write("DB100.1872", (short) 1); // 浠诲姟瀹屾垚
if(write.IsSuccess){
writeCount=6;
}else {
@@ -518,7 +640,7 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100.1872", 0); // 浠诲姟瀹屾垚澶嶄綅
+ write = siemensS7Net.Write("DB100.1872", (short) 0); // 浠诲姟瀹屾垚澶嶄綅
if(write.IsSuccess){
writeCount=6;
} else {
@@ -1017,9 +1139,10 @@
* 璁剧疆鍏ュ簱鏍囪
*/
@Override
- public void setPakMk(Integer siteId, boolean pakMk) {
+ public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
StaProtocol staProtocol = station.get(siteId);
if (null != staProtocol) {
+ log.info("閿佸畾鍏ュ簱鏍囪锛岀珯鐐瑰彿={};pakMk={};鏃堕棿={};鏍囪={}",siteId,pakMk,new Date(),i);
staProtocol.setPakMk(pakMk);
}
}
--
Gitblit v1.9.1