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_Array.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
index f3275bd..c7dac21 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
@@ -25,7 +25,7 @@
public boolean initEleLockData(MysqlConnPool pool) {
- String sql_str = " SELECT * FROM " + Sql_Mysql.Lock_Inf_Table;
+ String sql_str = " SELECT * FROM " + Sql_Mysql.Lock_Inf_Table + " WHERE del_flag = 0 ORDER BY lock_id ";
Sql_Mysql sql = new Sql_Mysql(pool.getConn());
ResultSet res = null;
boolean isChange = false;
@@ -35,7 +35,7 @@
res = sql.sqlMysqlQuery(sql_str);
while(res.next()) {
int lock_id = res.getInt("lock_id");
- int area_id = res.getInt("area_id"); //鍖哄煙ID
+ int station_id = res.getInt("station_id"); //鏈烘埧ID
String lock_name = res.getString("lock_name"); //閿佸悕绉�
String lock_type = res.getString("lock_type"); //閿佺被鍨�(鏃犳簮,钃濈墮)
int lock_state = res.getInt("lock_state"); //閿佺姸鎬�
@@ -63,7 +63,7 @@
} else {
ElectLock_Inf tmp_lock = new ElectLock_Inf(pool);
tmp_lock.setLock_id(lock_id);
- tmp_lock.setArea_id(area_id); //'鍖哄煙id',
+ tmp_lock.setStation_id(station_id); //'鍖哄煙id',
tmp_lock.setLock_name(lock_name); //'閿佸悕绉�',
tmp_lock.setLock_type(lock_type); //'閿佺被鍨�(鏃犳簮,钃濈墮)',
tmp_lock.setLock_state(lock_state); //'閿佺姸鎬�',
@@ -71,12 +71,15 @@
tmp_lock.setLock_path(lock_path); //'鍥剧墖璺緞',
tmp_lock.setLock_ip(lock_ip);; //'鐢靛瓙閿両P鍦板潃[鍐呯綉鍙�氳繃IP鍦板潃璇嗗埆璁惧]',
- tmp_lock.setLast_update_time(lastUpdateTime); //涓婁竴娆￠攣鍏风姸鎬佹洿鏂版椂闂�
- tmp_lock.setLock_open_count(open_count); //閿佸叿寮�鍚鏁�
+ tmp_lock.lockState.setLast_update_time(lastUpdateTime); //涓婁竴娆￠攣鍏风姸鎬佹洿鏂版椂闂�
+ tmp_lock.lockState.setLock_open_count(open_count); //閿佸叿寮�鍚鏁�
Lock_Task_SQL.queryLock_Rt_TableByLockId(pool, lock_id, tmp_lock.lockState);
Lock_Task_SQL.queryLock_Report_TableByLockId(pool, lock_id, tmp_lock.lockReport, nowYear);
+ Lock_Task_SQL.insertLock_IdCard_Table(pool, lock_id);
+ Lock_Task_SQL.insertLock_Rt_Table(pool, lock_id);
+
mInfs.add(tmp_lock);
}
--
Gitblit v1.9.1