From d8ebb73be7e75f4c995827e30edc76dcc823cc36 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期五, 10 一月 2025 15:24:41 +0800
Subject: [PATCH] 3.新增控制时新增当前操作用户名，并且监控ID开锁状态
---
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
index 8c177f6..deac7e6 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
@@ -7,6 +7,12 @@
import com.base.ComBase;
public class ElectLock_State {
+ public static final int Unlock_Type_485 = 0; //485
+ public static final int Unlock_Type_ID = 1; //ID鍗�
+ public static final int Unlock_Type_Bluetooth = 2; //钃濈墮
+ public static final int Unlock_Type_DI = 3; //DI
+
+
public static int Reg_Count_Real = 8; //瀵勫瓨鍣ㄦ暟閲�
private Date record_time; //'鏇存柊鏃堕棿',
@@ -28,6 +34,12 @@
private int lock_online; //閿佸叿鍦ㄧ嚎鐘舵�乕0-绂荤嚎 1-鍦ㄧ嚎]
+ private boolean isIDOpen = false; //鏄惁鏄疘D寮�閿�
+ private int last_unlock_type; //'涓婁竴娆″紑閿佹柟寮廩0-485寮�閿� 1-鍒峰崱寮�閿� 2-钃濈墮寮�閿� 3-DI寮�閿乚',
+ private int last_unlock_id; //'涓婁竴娆″埛寮�寮�閿佸崱鍙穂浠呭埛寮�寮�閿佹椂鏈夋晥]',
+
+ private String ctl_uname = ""; //鎿嶄綔鐢ㄦ埛鍚�
+
public ElectLock_State() {
}
@@ -44,14 +56,26 @@
this.already_id_count = ComBase.changeShortToInt(buffer.getShort()); //'褰撳墠閿佸凡鎺堟潈鍗℃暟閲�',
this.max_id_count = ComBase.changeShortToInt(buffer.getShort()); //'鎺堟潈鍗℃暟閲忓瓨鍌ㄤ笂闄�',
+ int tmp_lock_state = lock_state;
this.lock_state = ComBase.changeShortToInt(buffer.getShort()); //'鐢靛瓙閿佺姸鎬乕0-鍏� 1-寮�]',
int ver = ComBase.changeShortToInt(buffer.getShort());
this.lock_version = " V"+ ver; //'杞欢鐗堟湰鍙�',
+
+
this.unlock_type = ComBase.changeShortToInt(buffer.getShort()); //'涓婁竴娆″紑閿佹柟寮廩0-485寮�閿� 1-鍒峰崱寮�閿� 2-钃濈墮寮�閿� 3-DI寮�閿乚',
this.unlock_id = (buffer.getInt()&0xFFFFFFFF); //'涓婁竴娆″埛寮�寮�閿佸崱鍙穂浠呭埛寮�寮�閿佹椂鏈夋晥]',
this.lock_addr = ComBase.changeShortToInt(buffer.getShort()); //'璁惧鍦板潃',
- //System.out.println(this);
+ //System.out.println("this.lock_state:"+tmp_lock_state+"********lock_state:"+lock_state);
+ if(this.lock_state != tmp_lock_state && this.lock_state == 1) {
+ //閿佸叿鐘舵�佸彉鍖�;閿佷粠鍏抽棴鍙樹负鎵撳紑
+ if(this.unlock_type == Unlock_Type_ID) {
+ //ID鏈�杩慖D鍗″紑閿�
+ isIDOpen = true;
+ last_unlock_type = unlock_type; //'涓婁竴娆″紑閿佹柟寮廩0-485寮�閿� 1-鍒峰崱寮�閿� 2-钃濈墮寮�閿� 3-DI寮�閿乚',
+ last_unlock_id = unlock_id; //'涓婁竴娆″埛寮�寮�閿佸崱鍙穂浠呭埛寮�寮�閿佹椂鏈夋晥]',
+ }
+ }
buffer.compact();
return true;
@@ -76,6 +100,16 @@
public int getAlready_id_count() {
return already_id_count;
}
+
+ public String getCtl_uname() {
+ return ctl_uname;
+ }
+
+
+ public void setCtl_uname(String ctl_uname) {
+ this.ctl_uname = ctl_uname;
+ }
+
public int getMax_id_count() {
return max_id_count;
@@ -199,6 +233,36 @@
this.lock_addr_set = lock_addr_set;
}
+ public boolean isIDOpen() {
+ return isIDOpen;
+ }
+
+
+ public int getLast_unlock_type() {
+ return last_unlock_type;
+ }
+
+
+ public int getLast_unlock_id() {
+ return last_unlock_id;
+ }
+
+
+ public void setIDOpen(boolean isIDOpen) {
+ this.isIDOpen = isIDOpen;
+ }
+
+
+ public void setLast_unlock_type(int last_unlock_type) {
+ this.last_unlock_type = last_unlock_type;
+ }
+
+
+ public void setLast_unlock_id(int last_unlock_id) {
+ this.last_unlock_id = last_unlock_id;
+ }
+
+
public void addCommCount() {
this.comm_count ++ ;
if(this.comm_count > 999990000) {
--
Gitblit v1.9.1