From 098343a983ceba34ee253453c45b903b95d8e877 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 十二月 2023 08:02:26 +0800
Subject: [PATCH] #输送线plc异常显示
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
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 8dbd9ce..ebd4ab8 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -4,6 +4,9 @@
import com.zy.asrs.entity.CommandInfo;
import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
* Created by vincent on 2020/8/6
@@ -85,6 +88,56 @@
// 鎵爜澶辫触
private boolean barcodeErr;
+ //鏁呴殰-----------------------------------------------------------------------
+ private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
+
+ private Boolean infraredErr = false; //鍏夌數寮傚父
+
+ private Boolean outTimeErr = false; //杩愯瓒呮椂
+
+ private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂
+
+ private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅�
+
+ private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅�
+
+ private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+ private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+
+ private List<Integer> alarm;
+
+
+ public List<Integer> getAlarm(){
+ List<Integer> alarm = new ArrayList<>();
+ if (breakerErr){
+ alarm.add(1);
+ }
+ if (infraredErr){
+ alarm.add(2);
+ }
+ if (outTimeErr){
+ alarm.add(3);
+ }
+ if (seizeSeatErr){
+ alarm.add(4);
+ }
+ if (wrkYgoodsN){
+ alarm.add(5);
+ }
+ if (inverterErr){
+ alarm.add(6);
+ }
+ if (contactErr){
+ alarm.add(7);
+ }
+ if (upcontactErr){
+ alarm.add(8);
+ }
+ return alarm;
+ }
+
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
--
Gitblit v1.9.1