DELL
2025-02-07 351bbd8738c89c0302465360c1ca0c92abd18eba
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
@@ -2,9 +2,12 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Year;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.dev.lock.comm.Lock_Task_SQL;
import com.sql.MysqlConnPool;
import com.sql.Sql_Mysql;
@@ -27,9 +30,11 @@
      ResultSet res = null;
      boolean isChange = false;
      try {
         int nowYear = Year.now().getValue();
         res = sql.sqlMysqlQuery(sql_str);
         while(res.next()) {
            int lock_id = res.getInt("id");
            int lock_id = res.getInt("lock_id");
            int area_id = res.getInt("area_id");               //区域ID
            String lock_name = res.getString("lock_name");         //锁名称
            String lock_type = res.getString("lock_type");         //锁类型(无源,蓝牙)
@@ -38,10 +43,13 @@
            String lock_path = res.getString("lock_path");         //'图片路径',
            String lock_ip = res.getString("lock_ip").trim();      //'电子锁IP地址[内网可通过IP地址识别设备]',
            
            Date lastUpdateTime = res.getTimestamp("last_update_time");
            int open_count = res.getInt("lock_open_count");
            boolean isexist = false;
            for(int k = 0 ;k<mInfs.size();k++) {
               ElectLock_Inf tmp_lock = getIteam(k);
               if(lock_id == tmp_lock.getId()) {
               if(lock_id == tmp_lock.getLock_id()) {
                  if(!lock_ip.equals(tmp_lock.getLock_ip())) {
                     tmp_lock.setLock_ip(lock_ip);
                     isChange = true;
@@ -53,8 +61,8 @@
            if(isexist) {
               continue;
            } else {
               ElectLock_Inf tmp_lock = new ElectLock_Inf();
               tmp_lock.setId(lock_id);
               ElectLock_Inf tmp_lock = new ElectLock_Inf(pool);
               tmp_lock.setLock_id(lock_id);
               tmp_lock.setArea_id(area_id);            //'区域id',
               tmp_lock.setLock_name(lock_name);         //'锁名称',
               tmp_lock.setLock_type(lock_type);         //'锁类型(无源,蓝牙)',
@@ -62,6 +70,13 @@
               tmp_lock.setLock_address(lock_address);      //'锁地址',
               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);      //锁具开启次数
               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);
               mInfs.add(tmp_lock);
            }