From 245a2c8c220429dbfc849d9d7a1929094c696fe9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 02 二月 2024 13:00:15 +0800
Subject: [PATCH] #输送线报错
---
src/main/java/com/zy/core/model/protocol/StaError1.java | 26 ++++++++++++++++++++++++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 29 +++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaError1.java b/src/main/java/com/zy/core/model/protocol/StaError1.java
new file mode 100644
index 0000000..7fa6810
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/StaError1.java
@@ -0,0 +1,26 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+@Data
+public class StaError1 implements Cloneable{
+ private boolean EMERGENCY_Stop_Core = false;
+ private boolean EMERGENCY_STOP1 = false;
+ private boolean EMERGENCY_STOP2 = false;
+ private boolean EMERGENCY_STOP3 = false;
+ private boolean EMERGENCY_STOP4 = false;
+
+ private boolean Door_EMERGENCY_STOP1 = false;
+ private boolean Door_EMERGENCY_STOP2 = false;
+ private boolean Door_EMERGENCY_STOP3 = false;
+ private boolean Door_EMERGENCY_STOP4 = false;
+ private boolean Door_EMERGENCY_STOP5 = false;
+ private boolean Door_EMERGENCY_STOP6 = false;
+
+ private boolean Door_Open_Err1 = false;
+ private boolean Door_Open_Err2 = false;
+ private boolean Door_Open_Err3 = false;
+ private boolean Door_Open_Err4 = false;
+ private boolean Door_Open_Err5 = false;
+ private boolean Door_Open_Err6 = false;
+}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f0435a5..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>() {{
//
// }};
@@ -333,6 +335,33 @@
}
}
+ 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) {
--
Gitblit v1.9.1