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/comm/Lock_Task_SQL.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/ElectLock_Monitor/src/com/dev/lock/comm/Lock_Task_SQL.java b/ElectLock_Monitor/src/com/dev/lock/comm/Lock_Task_SQL.java
index 02ac300..5a70519 100644
--- a/ElectLock_Monitor/src/com/dev/lock/comm/Lock_Task_SQL.java
+++ b/ElectLock_Monitor/src/com/dev/lock/comm/Lock_Task_SQL.java
@@ -25,8 +25,12 @@
try {
res = sql.sqlMysqlQuery(sql_str_sel);
if(res.next()) {
+
+ state.setLock_state(res.getInt("lock_state"));
+
state.setComm_count(res.getInt("comm_count")); //'閫氫俊璁℃暟',
state.setErr_tol_count(res.getInt("err_tol_count")); //'鎬婚敊璇鏁�',
+ System.out.println("lock_state:" +state.getLock_state());
}else {
sql.sqlMysqlExecute(sql_str_ins);
}
@@ -101,7 +105,7 @@
* @param param
*/
public static void queryElectLockControlCmd(MysqlConnPool pool,int lock_id,ElectLock_State param) {
- String sql_str = " SELECT op_cmd,id_card_set,lock_addr_set "
+ String sql_str = " SELECT op_cmd,id_card_set,lock_addr_set,ctl_uname "
+ " FROM " + Sql_Mysql.Lock_Rt_Table + ""
+ " WHERE lock_id = " + lock_id;
Sql_Mysql sql = new Sql_Mysql(pool.getConn());
@@ -112,6 +116,7 @@
param.setOp_cmd(res.getInt("op_cmd"));
param.setId_card_set(res.getInt("id_card_set"));
param.setLock_addr_set(res.getInt("lock_addr_set"));
+ param.setCtl_uname(res.getString("ctl_uname"));
}
} catch (SQLException e) {
@@ -158,12 +163,13 @@
*/
public static void insertLock_Ctl_Log_Table(MysqlConnPool pool,ElectLock_Ctl_Log log) {
String sql_str_ins = "INSERT INTO " + Sql_Mysql.Lock_Ctl_Log_Table + ""
- + " (lock_id,ctl_type,ctl_result,ctl_time,ctl_id_card) VALUES("
+ + " (lock_id,ctl_type,ctl_result,ctl_time,ctl_id_card,ctl_uname) VALUES("
+ "" + log.lock_id
+ "," + log.ctl_type + ""
+ "," + log.ctl_result + ""
+ ",'" + Com.getDateTimeFormat(log.ctl_time, Com.DTF_YMDhms) + "'"
+ "," + log.ctl_id_card + ""
+ + ",'" + log.ctl_uname + "'"
+ ");";
Sql_Mysql sql = new Sql_Mysql(pool.getConn());
try {
@@ -178,7 +184,7 @@
public static List<ElectLock_AuthIdcard> queryAuth_Idcard_Table(MysqlConnPool pool, int client_id) {
List<ElectLock_AuthIdcard> batch_auth = new ArrayList<>();
- String sql_str = "SELECT DISTINCT(tb_key_inf.key_id),lock_id,state,tb_auth_idcard.create_time,key_number " +
+ String sql_str = "SELECT DISTINCT(tb_key_inf.key_id),lock_id,state,tb_auth_idcard.create_time,key_number,ctl_uname " +
" FROM " + Sql_Mysql.Key_Inf_Table + "," + Sql_Mysql.Auth_Idcard_Table +
" WHERE tb_key_inf.key_id = tb_auth_idcard.key_id AND lock_id = " + client_id + " AND key_type = 1 ";
Sql_Mysql sql = new Sql_Mysql(pool.getConn());
@@ -192,6 +198,8 @@
auth.state = res.getInt("state"); //'1:绉婚櫎id鍗�,2娣诲姞id鍗�,3宸插鐞�',
auth.create_time = res.getTimestamp("create_time"); //'鍒涘缓鏃堕棿'
auth.key_number = res.getString("key_number"); //ID鍗″彿
+
+ auth.ctl_uname = res.getString("ctl_uname"); //鎿嶄綔浜哄鍚�
batch_auth.add(auth);
}
@@ -238,4 +246,40 @@
sql.close_con();
}
}
+
+
+ /**
+ * 鏌ヨID閽ュ寵鐨勫綊灞炰汉濮撳悕
+ * @param pool
+ * @param client_id
+ * @param last_unlock_id
+ * @return
+ */
+ public static String queryKeyInfByKeyNumberTable(MysqlConnPool pool, int keyNumber) {
+ String uname = "";
+ String sql_str = " SELECT * FROM " + Sql_Mysql.Key_Inf_Table
+ + " WHERE key_number = " + keyNumber;
+ Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+ ResultSet res = null;
+ try {
+ System.out.println("====="+sql_str);
+ res = sql.sqlMysqlQuery(sql_str);
+ if(res.next()) {
+ uname = res.getString("uname");
+ System.out.println("uname:" + uname);
+ }
+ } catch (SQLException e) {
+ sql.logger.error(e.toString(),e);
+ } finally {
+ if(null != res) {
+ try {
+ res.close();
+ } catch (SQLException e) {
+ sql.logger.error(e.toString(),e);
+ }
+ }
+ sql.close_con();
+ }
+ return uname;
+ }
}
--
Gitblit v1.9.1