From 4ac0d38c6cd96d308bb38a4c0591403d8ede8c57 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期五, 07 二月 2025 16:39:36 +0800
Subject: [PATCH] 2.记录每年月季度的开锁次数,以及每年锁具状态变化记录-已完成

---
 ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 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 160f45d..f2f8da7 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
@@ -43,7 +43,9 @@
 
 	private String ctl_uname = "";		//鎿嶄綔鐢ㄦ埛鍚�
 	
-	private boolean StoreDataBusy = false;
+	
+	private int lock_open_count;	//'閿佸叿鎬诲紑鍚鏁�'
+	private Date last_update_time;	//涓婁竴娆¢攣鍏峰紑鍚垨鍏抽棴鏃堕棿
 	
 	public ElectLock_State() {
 		
@@ -78,14 +80,19 @@
 //		System.out.println("BlutoothMAC:" + getLockMacAddr());
 		
 		//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;			//'涓婁竴娆″埛寮�寮�閿佸崱鍙穂浠呭埛寮�寮�閿佹椂鏈夋晥]',
+		if(this.lock_state != tmp_lock_state) {
+			if(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;			//'涓婁竴娆″埛寮�寮�閿佸崱鍙穂浠呭埛寮�寮�閿佹椂鏈夋晥]',
+				}
+				this.lock_open_count ++;
 			}
+			//閿佸叿鐘舵�佸彉鍖�
+			this.last_update_time = new Date();
 		}
 		record_time = new Date();
 		buffer.compact();
@@ -119,7 +126,21 @@
 	public String getCtl_uname() {
 		return ctl_uname;
 	}
+	public int getLock_open_count() {
+		return lock_open_count;
+	}
 
+	public Date getLast_update_time() {
+		return last_update_time;
+	}
+
+	public void setLock_open_count(int lock_open_count) {
+		this.lock_open_count = lock_open_count;
+	}
+
+	public void setLast_update_time(Date last_update_time) {
+		this.last_update_time = last_update_time;
+	}
 
 	public void setCtl_uname(String ctl_uname) {
 		this.ctl_uname = ctl_uname;

--
Gitblit v1.9.1