From 4c6ac55bbdfd2426274014047126da179bde367c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 10 一月 2025 16:06:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 90 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 8 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..ce532a8 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
@@ -57,33 +60,104 @@
private Short inQty;
// 闅斿绔欑偣锛堝彴杞︿綅缃級
- private String nearbySta;
+ private short nearbySta;
//鎸囦护ID
private Integer commandId;
+ //鏉＄爜
+ private String barcode = null;
+
+ private boolean place1 = false;
+ private boolean place2 = false;
+
+ public String getPlace(){
+ if (place1 && place2){
+ return "鍒颁綅淇″彿寮傚父";
+ }
+ if (place1){
+ return "涓�妤煎埌浣�";
+ }
+ if (place2){
+ return "浜屾ゼ鍒颁綅";
+ }
+ return "涓嶅湪瀹氫綅";
+
+ }
+
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
- private boolean frontErr;
+ private boolean frontErr = false;
// 鍚庤秴闄�
- private boolean backErr;
+ private boolean backErr = false;
// 楂樿秴闄�
- private boolean highErr;
+ private boolean highErr = false;
// 宸﹁秴闄�
- private boolean leftErr;
+ private boolean leftErr = false;
// 鍙宠秴闄�
- private boolean rightErr;
+ private boolean rightErr = false;
// 瓒呴噸
- private boolean weightErr;
+ private boolean weightErr = false;
// 鎵爜澶辫触
- private boolean barcodeErr;
+ private boolean barcodeErr = false;
+
+ //鏁呴殰-----------------------------------------------------------------------
+ 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;
+ private Short realTimeLocation;
+
+
+ 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(){
--
Gitblit v1.9.1