From eb746715527db9b42740db84bb576735185e21cd Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 28 四月 2025 15:30:27 +0800
Subject: [PATCH] 11111

---
 ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Inf.java |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 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 31eb9a0..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;			//'閿佺姸鎬�',
@@ -17,9 +17,6 @@
 	private String lock_path;		//'鍥剧墖璺緞',
 	private String lock_ip;			//'鐢靛瓙閿両P鍦板潃[鍐呯綉鍙�氳繃IP鍦板潃璇嗗埆璁惧]',
 	private int lock_id;			//鐢靛瓙閿両D
-	
-	private int lock_open_count;	//'閿佸叿寮�鍚鏁�'
-	private Date last_update_time;	//涓婁竴娆¢攣鍏峰紑鍚垨鍏抽棴鏃堕棿
 	
 	public ElectLock_State lockState;
 	public ElectLock_Report lockReport;
@@ -50,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;
 	}
@@ -71,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;
 	}
@@ -104,27 +113,13 @@
 	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) {
 		this.lockState = lockState;
 	}
 
-	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 clearStoreDataBusyTag()
 	{

--
Gitblit v1.9.1