From 11a814e836495cb0de25eaa670c75338d85e5e42 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期四, 13 三月 2025 21:07:01 +0800
Subject: [PATCH] V1.111 edit by lijun 2025-03-13 1.新增锁具工作模式读取 2.新增根据平台锁具模式设置当前所有锁具的模式
---
ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 1d748c8..09074b6 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
@@ -49,6 +49,7 @@
private boolean S_thread_run_flag = true;
+ private int plat_model;
public Lock_SocketClient_Thread(MysqlConnPool pool,ElectLock_Array GB_Lock_Array ,AppConfig config,Socket tmp_socket) {
this.pool = pool;
@@ -178,6 +179,16 @@
Lock_Task_SQL.insertLock_Ctl_Log_Table(pool, tmp_log);
mLock_State.setIDOpen(false);
tmp_log = null;
+ }
+
+ plat_model = Lock_Task_SQL.querySystemLockMode(pool);
+ if(plat_model != ElectLock_ComBase.CMD_Fail) {
+ if(plat_model != mLock_State.getWorkmodel()) {
+ logger.info("LockID:"+client_id + " Start change Model :");
+
+ mRtu_Tx.mkBusRtu(MyModBusRtu.CMD_TYPE_WRITE_STD, ElectLock_ComBase.LOCK_SET_Model_ADDR, ElectLock_ComBase.RegCount_Sigle);
+ SocketComm(mRtu_Tx, ComBase.mkUInt16Buffer(plat_model));
+ }
}
}
}
@@ -489,7 +500,15 @@
isSuccess = true;
logger.info("LockId:" + client_id + " LockIp:"+client_ip + " 璁剧疆閿佸叿鍦板潃锛�" + mLock_param.getLock_addr_set() + "鎴愬姛");
}
+ }else if(ElectLock_ComBase.LOCK_SET_Model_ADDR == mRtu_Rx.reg_addr) {
+ //璁剧疆閿佸叿宸ヤ綔妯″紡
+ if(plat_model == mRtu_Rx.result) {
+ isSuccess = true;
+ logger.info("LockId:" + client_id + " LockIp:"+client_ip + " 璁剧疆閿佸叿妯″紡锛�" + plat_model + "鎴愬姛");
+ }
}
+
+
}else if(MyModBusRtu.CMD_TYPE_WRITE_MULTY == mRtu_Rx.Cmd) {
if(ElectLock_ComBase.LOCK_Add_ID_AUTH_ADDR == mRtu_Rx.reg_addr) {
//娣诲姞鎺堟潈ID鍗�
--
Gitblit v1.9.1