ElectLock_Monitor/bin/com/dev/lock/comm/Lock_Task_SQL.classBinary files differ
ElectLock_Monitor/bin/com/dev/lock/data/ElectLock_Array.classBinary files differ
ElectLock_Monitor/bin/com/dev/lock/data/ElectLock_Inf.classBinary files differ
ElectLock_Monitor/bin/com/dev/lock/data/ElectLock_State.classBinary files differ
ElectLock_Monitor/bin/com/version_inf/version_inf.txt
@@ -10,10 +10,11 @@ V1.110 edit by lijun 2025-01-20 1.新增锁具告警记录功能 2.新增触发告警 - 2.记录每年月季度的开锁次数,以及每年锁具状态变化记录-已完成 3.新增触发告警 - 通信故障告警 开锁失败 记录每年月季度的开锁次数,以及每年锁具状态变化记录 开锁失败 V1.109 edit by lijun 2025-01-15 ElectLock_Monitor/src/com/dev/lock/comm/Lock_Task_SQL.java
@@ -88,7 +88,8 @@ " Set lock_state = " + state.getLock_state() + " ,lock_online = " + state.getLock_online() + " ,lock_mac = '" + state.getLockMacAddr() + "'" + " ,last_update_time = '" + Com.getDateTimeFormat(inf.getLast_update_time(), Com.DTF_YMDhms) + "'" + " ,lock_open_count = " + state.getLock_open_count() + " ,last_update_time = '" + Com.getDateTimeFormat(state.getLast_update_time(), Com.DTF_YMDhms) + "'" + " WHERE lock_id = " + inf.getLock_id(); Sql_Mysql sql = new Sql_Mysql(pool.getConn()); try { ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
@@ -71,8 +71,8 @@ tmp_lock.setLock_path(lock_path); //'图片路径', tmp_lock.setLock_ip(lock_ip);; //'电子锁IP地址[内网可通过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); ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Inf.java
@@ -18,9 +18,6 @@ private String lock_ip; //'电子锁IP地址[内网可通过IP地址识别设备]', private int lock_id; //电子锁ID private int lock_open_count; //'锁具开启次数' private Date last_update_time; //上一次锁具开启或关闭时间 public ElectLock_State lockState; public ElectLock_Report lockReport; public ElectLock_RecordState lockRecordState; @@ -110,21 +107,6 @@ this.lockState = lockState; } public int getLock_open_count() { return lock_open_count; } public Date getLast_update_time() { return last_update_time; } public void setLock_open_count(int lock_open_count) { this.lock_open_count = lock_open_count; } public void setLast_update_time(Date last_update_time) { this.last_update_time = last_update_time; } public void clearStoreDataBusyTag() { ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
@@ -43,7 +43,9 @@ private String ctl_uname = ""; //操作用户名 private boolean StoreDataBusy = false; private int lock_open_count; //'锁具总开启次数' private Date last_update_time; //上一次锁具开启或关闭时间 public ElectLock_State() { @@ -78,14 +80,19 @@ // System.out.println("BlutoothMAC:" + getLockMacAddr()); //System.out.println("this.lock_state:"+tmp_lock_state+"********lock_state:"+lock_state); if(this.lock_state != tmp_lock_state && this.lock_state == 1) { //锁具状态变化;锁从关闭变为打开 if(this.unlock_type == Unlock_Type_ID) { //ID最近ID卡开锁 isIDOpen = true; last_unlock_type = unlock_type; //'上一次开锁方式[0-485开锁 1-刷卡开锁 2-蓝牙开锁 3-DI开锁]', last_unlock_id = unlock_id; //'上一次刷开开锁卡号[仅刷开开锁时有效]', if(this.lock_state != tmp_lock_state) { if(this.lock_state == 1) { //锁具状态变化;锁从关闭变为打开 if(this.unlock_type == Unlock_Type_ID) { //ID最近ID卡开锁 isIDOpen = true; last_unlock_type = unlock_type; //'上一次开锁方式[0-485开锁 1-刷卡开锁 2-蓝牙开锁 3-DI开锁]', last_unlock_id = unlock_id; //'上一次刷开开锁卡号[仅刷开开锁时有效]', } this.lock_open_count ++; } //锁具状态变化 this.last_update_time = new Date(); } record_time = new Date(); buffer.compact(); @@ -119,7 +126,21 @@ public String getCtl_uname() { return ctl_uname; } public int getLock_open_count() { return lock_open_count; } public Date getLast_update_time() { return last_update_time; } public void setLock_open_count(int lock_open_count) { this.lock_open_count = lock_open_count; } public void setLast_update_time(Date last_update_time) { this.last_update_time = last_update_time; } public void setCtl_uname(String ctl_uname) { this.ctl_uname = ctl_uname; ElectLock_Monitor/src/com/version_inf/version_inf.txt
@@ -10,10 +10,11 @@ V1.110 edit by lijun 2025-01-20 1.新增锁具告警记录功能 2.新增触发告警 - 2.记录每年月季度的开锁次数,以及每年锁具状态变化记录-已完成 3.新增触发告警 - 通信故障告警 开锁失败 记录每年月季度的开锁次数,以及每年锁具状态变化记录 开锁失败 V1.109 edit by lijun 2025-01-15
