From 21e2e98d7de6273ab542da3abcdd97545deff8ee Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期三, 19 三月 2025 14:43:32 +0800
Subject: [PATCH] 2.屏蔽平台远程设置mac地址逻辑
---
ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java b/ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java
index 9f051cc..5cf1850 100644
--- a/ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java
+++ b/ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java
@@ -119,17 +119,17 @@
Lock_Task_SQL.insertLock_Ctl_Log_Table(pool, tmp_log);
}
}else if(mLock_param.getOp_cmd() == ElectLock_ComBase.CMD_SetLockAddr) {
- mRtu_Tx.mkBusRtu(MyModBusRtu.CMD_TYPE_WRITE_STD, ElectLock_ComBase.LOCK_SET_ADDR_ADDR, ElectLock_ComBase.RegCount_Sigle);
- if(SocketComm(mRtu_Tx, ComBase.mkUInt16Buffer(mLock_param.getLock_addr_set()))) {
- mLock_param.setOp_cmd(ElectLock_ComBase.CMD_SetLockAddr_Ack);
-
- tmp_log = new ElectLock_Ctl_Log(client_id, ElectLock_ComBase.CtlType_SetLockAddr, true,mLock_param.getLock_addr_set(),mLock_param.getCtl_uname());
- Lock_Task_SQL.insertLock_Ctl_Log_Table(pool, tmp_log);
- } else {
- mLock_param.setOp_cmd(ElectLock_ComBase.CMD_Fail);
- tmp_log = new ElectLock_Ctl_Log(client_id, ElectLock_ComBase.CtlType_SetLockAddr, false,mLock_param.getLock_addr_set(),mLock_param.getCtl_uname());
- Lock_Task_SQL.insertLock_Ctl_Log_Table(pool, tmp_log);
- }
+// mRtu_Tx.mkBusRtu(MyModBusRtu.CMD_TYPE_WRITE_STD, ElectLock_ComBase.LOCK_SET_ADDR_ADDR, ElectLock_ComBase.RegCount_Sigle);
+// if(SocketComm(mRtu_Tx, ComBase.mkUInt16Buffer(mLock_param.getLock_addr_set()))) {
+// mLock_param.setOp_cmd(ElectLock_ComBase.CMD_SetLockAddr_Ack);
+//
+// tmp_log = new ElectLock_Ctl_Log(client_id, ElectLock_ComBase.CtlType_SetLockAddr, true,mLock_param.getLock_addr_set(),mLock_param.getCtl_uname());
+// Lock_Task_SQL.insertLock_Ctl_Log_Table(pool, tmp_log);
+// } else {
+// mLock_param.setOp_cmd(ElectLock_ComBase.CMD_Fail);
+// tmp_log = new ElectLock_Ctl_Log(client_id, ElectLock_ComBase.CtlType_SetLockAddr, false,mLock_param.getLock_addr_set(),mLock_param.getCtl_uname());
+// Lock_Task_SQL.insertLock_Ctl_Log_Table(pool, tmp_log);
+// }
}else if(mLock_param.getOp_cmd() == ElectLock_ComBase.CMD_AddIdCard) {
//娣诲姞ID鍗℃巿鏉�
mRtu_Tx.mkBusRtu(MyModBusRtu.CMD_TYPE_WRITE_MULTY, ElectLock_ComBase.LOCK_Add_ID_AUTH_ADDR, ElectLock_ComBase.RegCount_Double);
@@ -256,6 +256,8 @@
} finally {
logger.info("璁惧鏂紑杩炴帴锛欴evIp:" + client_ip + " DevId:" + mLock_State.getLockDevId());
mLock_State.setLock_online(0);
+ //閲嶇疆mac鍦板潃浼氬奖鍝峚pp寮�濮嬶紝寰呭畾閫昏緫
+ //mLock_State.resetLockMacAddr();
Lock_Task_SQL.updateLock_Inf_Table(pool,ele_lock,mLock_State);
}
--
Gitblit v1.9.1