From dfafabacf23bf22181d7c3f3665e684be7921f7d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 07 八月 2024 16:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 03795e0..c844cae 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,6 +1,6 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasDevp;
+import com.zy.entity.BasDevp;
import lombok.Data;
/**
@@ -81,6 +81,31 @@
// 鎵爜澶辫触
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 Boolean ifOpenDoor = false; // 鏄惁鎵撳紑
+
+ private Boolean ifCloseDoor = false; // 鏄惁鍏抽棴
+
+ private Boolean openAskDoor = false; // 璇锋眰寮�闂�
+
+ private Boolean closeAskDoor = false; // 璇锋眰鍏抽棬
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
@@ -91,7 +116,7 @@
basDevp.setOutEnable(outEnable?"Y":"N");
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
- basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
+ basDevp.setLocType3((short) (high?1:0)); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
return basDevp;
--
Gitblit v1.9.1