From 32efe67e5c2ce1419d91717232f5b881b1828bc8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 07 六月 2024 09:30:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2
src/main/java/com/zy/asrs/controller/SiteController.java | 72 +++++++++++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/controller/ConsoleController.java | 7 +--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 8 ++--
4 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 2355664..74a38d8 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -106,7 +106,7 @@
continue;
}
if (rgvProtocol.getAlarm() > 0){
- msg.append("<span style=\"color: red\">").append(rgv.getId()).append("鍙稲gv鎶ヨ<span>\br");
+ msg.append("<span style=\"color: red\">").append(rgv.getId()).append("鍙稲gv鎶ヨ<span><br>");
}
}
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -116,15 +116,14 @@
for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
if (entry.getKey() == 302 || entry.getKey() == 303 || entry.getKey() == 304 || entry.getKey() == 305) {
if (!Cools.isEmpty(staPlcErr(entry))){
- msg.append(staPlcErr(entry).get(0));
- msg.append("<span style=\"color: red\">").append(staPlcErr(entry).get(0).getNo()).append("鍙锋彁鍗囨満鎶ヨ<span>\br");
+ msg.append("<span style=\"color: red\">").append(staPlcErr(entry).get(0).getNo()).append("鍙锋彁鍗囨満鎶ヨ<span><br>");
}
}
}
}
- if (Cools.isEmpty(msg)){
+ if (!Cools.isEmpty(msg)){
return R.error().add(msg.toString());
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 8be2ea6..975e47f 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -221,8 +221,8 @@
for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
if (entry.getKey() == 302 || entry.getKey() == 303 || entry.getKey() == 304 || entry.getKey() == 305) {
- if (!Cools.isEmpty(staPlcErr(entry))){
- list.add(staPlcErr(entry).get(0));
+ if (!Cools.isEmpty(staPlcErr2(entry))){
+ list.add(staPlcErr2(entry).get(0));
}
}
@@ -530,4 +530,72 @@
return list;
}
+ public List<PlcErrorTableVo> staPlcErr2(Map.Entry<Integer, StaProtocol> entry){
+ List<PlcErrorTableVo> list = new ArrayList<>();
+ StaProtocol staProtocol = entry.getValue();
+ if (staProtocol.getBreakerErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鎻愬崌鏈轰笂鍗囨瀬闄�");
+ vo.setError("鎻愬崌鏈轰笂鍗囨瀬闄�");
+ list.add(vo);
+ }
+ if (staProtocol.getInfraredErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鎻愬崌鏈轰笅闄嶆瀬闄�");
+ vo.setError("鎻愬崌鏈轰笅闄嶆瀬闄�");
+ list.add(vo);
+ }
+ if (staProtocol.getOutTimeErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("杩愯瓒呮椂");
+ vo.setError("杩愯瓒呮椂");
+ list.add(vo);
+ }
+ if (staProtocol.getSeizeSeatErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鍗犱綅瓒呮椂");
+ vo.setError("鍗犱綅瓒呮椂");
+ list.add(vo);
+ }
+ if (staProtocol.getWrkYgoodsN()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鏈変换鍔℃棤璐ф晠闅�");
+ vo.setError("鏈変换鍔℃棤璐ф晠闅�");
+ list.add(vo);
+ }
+ if (staProtocol.getInverterErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鍙橀鍣ㄦ晠闅�");
+ vo.setError("鍙橀鍣ㄦ晠闅�");
+ list.add(vo);
+ }
+ if (staProtocol.getContactErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鎻愬崌鏈哄乏瓒呴檺");
+ vo.setError("鎻愬崌鏈哄乏瓒呴檺");
+ list.add(vo);
+ }
+ if (staProtocol.getUpcontactErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鎻愬崌鏈哄彸瓒呴檺");
+ vo.setError("鎻愬崌鏈哄彸瓒呴檺");
+ list.add(vo);
+ }
+ return list;
+ }
+
}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index ce532a8..6d724a0 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -109,7 +109,7 @@
private boolean barcodeErr = false;
//鏁呴殰-----------------------------------------------------------------------
- private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
+ private Boolean breakerErr = true; //鏂矾鍣ㄦ晠闅�
private Boolean infraredErr = false; //鍏夌數寮傚父
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6322db8..068e197 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -480,14 +480,14 @@
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
StaProtocol staProtocol = station.get(siteId);
- staProtocol.setBreakerErr(status[0]);
- staProtocol.setInfraredErr(status[1]);
+ 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]);
+ staProtocol.setContactErr(status[6]); //鎻愬崌鏈� 宸﹁秴闄�
+ staProtocol.setUpcontactErr(status[7]); //鎻愬崌鏈� 鍙宠秴闄�
}
}
--
Gitblit v1.9.1