From 0878726a63970fe2a9b11c867a7ac78cf161b445 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 27 二月 2024 16:13:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1865943..919b4d9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -22,6 +22,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaError1;
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
+ private StaError1 staError1;
// public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
//
// }};
@@ -231,12 +233,12 @@
}
}
BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
- //RGV灏忚溅
- Thread.sleep(200);
+ //RGV灏忚溅1
+ Thread.sleep(100);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10);
if (result3.IsSuccess) {
BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
- if (!Cools.isEmpty(basRgvMap) && basRgvMap.getStartRoute() == 100){
+ if (!Cools.isEmpty(basRgvMap)){
Integer siteId = 1;
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -248,12 +250,12 @@
staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)));
}
}
- //RGV灏忚溅
- Thread.sleep(200);
+ //RGV灏忚溅2
+ Thread.sleep(100);
OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB50.212",(short)10);
if (result4.IsSuccess) {
BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result4.Content, 0));
- if (!Cools.isEmpty(basRgvMap) && (basRgvMap.getStartRoute() == 161 || basRgvMap.getStartRoute() == 157)){
+ if (!Cools.isEmpty(basRgvMap)){
Integer siteId = 2;
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -263,6 +265,24 @@
}
staProtocol.setAutoing(true);
staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result4.Content, 8)));
+ }
+ }
+
+ //RGV灏忚溅3
+ Thread.sleep(100);
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB50.224",(short)10);
+ if (result5.IsSuccess) {
+ BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result5.Content, 0));
+ if (!Cools.isEmpty(basRgvMap)){
+ Integer siteId = 3;
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setAutoing(true);
+ staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result5.Content, 8)));
}
}
@@ -298,6 +318,52 @@
}
}
+ OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
+ if (resultErr2.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4, 1);
+ StaProtocol staProtocol = station.get(siteId);
+ staProtocol.setBreakerErr(status[0]);
+ staProtocol.setInfraredErr(status[1]);
+ staProtocol.setOutTimeErr(status[2]);
+ staProtocol.setSeizeSeatErr(status[3]);
+ staProtocol.setWrkYgoodsN(status[4]);
+ staProtocol.setInverterErr(status[5]);
+ staProtocol.setContactErr(status[6]);
+ staProtocol.setUpcontactErr(status[7]);
+
+ }
+ }
+ OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
+ if (resultErr3.IsSuccess) {
+ if (staError1 == null){
+ staError1 = new StaError1();
+ }
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
+ staError1.setEMERGENCY_Stop_Core(status[0]);
+ staError1.setEMERGENCY_STOP1(status[1]);
+ staError1.setEMERGENCY_STOP2(status[2]);
+ staError1.setEMERGENCY_STOP3(status[3]);
+ staError1.setEMERGENCY_STOP4(status[4]);
+
+ staError1.setDoor_EMERGENCY_STOP1(status[5]);
+ staError1.setDoor_EMERGENCY_STOP2(status[6]);
+ staError1.setDoor_EMERGENCY_STOP3(status[7]);
+ staError1.setDoor_EMERGENCY_STOP4(status[8]);
+ staError1.setDoor_EMERGENCY_STOP5(status[9]);
+ staError1.setDoor_EMERGENCY_STOP6(status[10]);
+
+ staError1.setDoor_Open_Err1(status[11]);
+ staError1.setDoor_Open_Err1(status[12]);
+ staError1.setDoor_Open_Err1(status[13]);
+ staError1.setDoor_Open_Err1(status[14]);
+ staError1.setDoor_Open_Err1(status[15]);
+ staError1.setDoor_Open_Err1(status[16]);
+
+ }
+
+
if (result.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1