DELL
2025-01-08 2b4592b9be195945169718aac36cf51f6ce9f894
2.新增锁具的在离线状态,方便平台统计
8个文件已修改
19 ■■■■■ 已修改文件
ElectLock_Monitor/bin/com/dev/lock/comm/Lock_SocketClient_Thread.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/bin/com/dev/lock/comm/Lock_Task_SQL.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/bin/com/dev/lock/data/ElectLock_State.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/bin/com/version_inf/version_inf.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/src/com/dev/lock/comm/Lock_Task_SQL.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/src/com/version_inf/version_inf.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Monitor/bin/com/dev/lock/comm/Lock_SocketClient_Thread.class
Binary files differ
ElectLock_Monitor/bin/com/dev/lock/comm/Lock_Task_SQL.class
Binary files differ
ElectLock_Monitor/bin/com/dev/lock/data/ElectLock_State.class
Binary files differ
ElectLock_Monitor/bin/com/version_inf/version_inf.txt
@@ -10,6 +10,7 @@
V1.108 edit by lijun 2025-01-06
    1.新增批量授权逻辑,批量授权或取消时同时记录操作日志
    2.新增锁具的在离线状态,方便平台统计
    
ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java
@@ -71,6 +71,7 @@
        int runCount = 0;
        try {
            if(S_thread_run_flag) {
                mLock_State.setLock_online(1);
                Lock_Task_SQL.insertLock_Rt_Table(pool, client_id, mLock_State);
            }
            while(S_thread_run_flag) {
@@ -219,6 +220,8 @@
            e.printStackTrace();
        } finally {
            logger.info("设备断开连接:DevIp:" + client_ip + " DevId:" + mLock_State.getLockDevId());
            mLock_State.setLock_online(0);
            Lock_Task_SQL.updateLock_Inf_Table(pool,client_id,mLock_State);
        }
        if(null != tmp_socket) {
ElectLock_Monitor/src/com/dev/lock/comm/Lock_Task_SQL.java
@@ -80,6 +80,8 @@
    public static void updateLock_Inf_Table(MysqlConnPool pool,int lock_id,ElectLock_State state) {
        String sql_str = "UPDATE " + Sql_Mysql.Lock_Inf_Table + 
                        " Set lock_state = " +  state.getLock_state() +
                        " ,lock_online =  " + state.getLock_online() +
                        " ,last_update_time = NOW() " +
                        " WHERE lock_id = " + lock_id;
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        try {
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
@@ -26,6 +26,8 @@
    private int id_card_set;            //'授权ID卡号',
    private int lock_addr_set;            //'设置设备地址[慎用]',
    
    private int lock_online;            //锁具在线状态[0-离线  1-在线]
    public ElectLock_State() {
        
    }
@@ -111,6 +113,16 @@
        return err_count;
    }
    public int getLock_online() {
        return lock_online;
    }
    public void setLock_online(int lock_online) {
        this.lock_online = lock_online;
    }
    public int getOp_cmd() {
        return op_cmd;
    }
ElectLock_Monitor/src/com/version_inf/version_inf.txt
@@ -10,6 +10,7 @@
V1.108 edit by lijun 2025-01-06
    1.新增批量授权逻辑,批量授权或取消时同时记录操作日志
    2.新增锁具的在离线状态,方便平台统计