From 1af31e38c6a2cd072ed310149c656780610fe57b Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 21 四月 2025 08:42:54 +0800
Subject: [PATCH] 2.修复锁具开启之后记录bug

---
 ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Inf.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Inf.java b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Inf.java
index 29766a6..b7d7841 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Inf.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Inf.java
@@ -9,7 +9,7 @@
 	
 	private boolean StoreDataBusy = false;
 	
-	private int area_id;			//'鍖哄煙id',
+	private int station_id;			//'鍖哄煙id',
 	private String lock_name;		//'閿佸悕绉�',
 	private String lock_type;		//'閿佺被鍨�(鏃犳簮,钃濈墮)',
 	private int lock_state;			//'閿佺姸鎬�',
@@ -47,9 +47,16 @@
 		return store_state;
 	}
 	
-	public int getArea_id() {
-		return area_id;
+	
+	
+	public boolean isStoreDataBusy() {
+		return StoreDataBusy;
 	}
+
+	public void setStoreDataBusy(boolean storeDataBusy) {
+		StoreDataBusy = storeDataBusy;
+	}
+
 	public String getLock_name() {
 		return lock_name;
 	}
@@ -68,12 +75,17 @@
 	public String getLock_ip() {
 		return lock_ip;
 	}
-	public void setArea_id(int area_id) {
-		this.area_id = area_id;
-	}
 	public void setLock_name(String lock_name) {
 		this.lock_name = lock_name;
 	}
+	public int getStation_id() {
+		return station_id;
+	}
+
+	public void setStation_id(int station_id) {
+		this.station_id = station_id;
+	}
+
 	public void setLock_type(String lock_type) {
 		this.lock_type = lock_type;
 	}
@@ -101,6 +113,7 @@
 	public void setLock_id(int lock_id) {
 		this.lock_id = lock_id;
 		lockReport.lock_id = lock_id;
+		lockState.setLock_id(lock_id);
 	}
 
 	public void setLockState(ElectLock_State lockState) {

--
Gitblit v1.9.1