DELL
2025-04-21 41bf76509e409a3df14c323ba3ac00fac73a6e9f
修改提交
3个文件已添加
11个文件已修改
113342 ■■■■■ 已修改文件
ElectLock_Alarm/bin/com/dev/lock/alarm/ElectLock_Alarm_Thread_SQL.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/bin/com/dev/lock/data/ElectLock_Array.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/bin/com/dev/lock/data/ElectLock_Inf.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/bin/com/sql/Sql_Mysql.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/bin/main/main_ElectLock_Alarm.class 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/electlock_alarm_x64_logs/error-20250211-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/electlock_alarm_x64_logs/error.log 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/electlock_alarm_x64_logs/info-20250211-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/electlock_alarm_x64_logs/info-20250421-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/electlock_alarm_x64_logs/info.log 113201 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/src/com/dev/lock/data/ElectLock_Array.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/src/com/dev/lock/data/ElectLock_Inf.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/src/com/sql/Sql_Mysql.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/src/main/main_ElectLock_Alarm.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectLock_Alarm/bin/com/dev/lock/alarm/ElectLock_Alarm_Thread_SQL.class
Binary files differ
ElectLock_Alarm/bin/com/dev/lock/data/ElectLock_Array.class
Binary files differ
ElectLock_Alarm/bin/com/dev/lock/data/ElectLock_Inf.class
Binary files differ
ElectLock_Alarm/bin/com/sql/Sql_Mysql.class
Binary files differ
ElectLock_Alarm/bin/main/main_ElectLock_Alarm.class
Binary files differ
ElectLock_Alarm/electlock_alarm_x64_logs/error-20250211-1.log.gz
Binary files differ
ElectLock_Alarm/electlock_alarm_x64_logs/error.log
@@ -1,51 +1,11 @@
2025-02-11 16:49:05.656 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:05.912 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:06.162 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:06.414 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:06.666 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:06.904 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:07.157 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:07.405 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:07.658 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:07.909 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:08.158 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:08.411 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:08.665 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:08.903 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:09.156 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:09.399 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-02-11 16:49:09.656 [Thread-10] [ERROR] com.dev.lock.alarm.ElectLock_Alarm_Thread - java.lang.NullPointerException
java.lang.NullPointerException: null
    at com.dev.lock.alarm.ElectLock_Alarm_Thread.run(ElectLock_Alarm_Thread.java:62) [bin/:?]
2025-04-21 08:50:17.639 [main] [ERROR] com.sql.Sql_Mysql - java.sql.SQLException: Column 'area_id' not found.
java.sql.SQLException: Column 'area_id' not found.
    at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:1084) ~[mysql-connector-java-5.1.30-bin.jar:?]
    at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:987) ~[mysql-connector-java-5.1.30-bin.jar:?]
    at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:973) ~[mysql-connector-java-5.1.30-bin.jar:?]
    at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:918) ~[mysql-connector-java-5.1.30-bin.jar:?]
    at com.mysql.jdbc.ResultSetImpl.findColumn(ResultSetImpl.java:1162) ~[mysql-connector-java-5.1.30-bin.jar:?]
    at com.mysql.jdbc.ResultSetImpl.getInt(ResultSetImpl.java:2846) ~[mysql-connector-java-5.1.30-bin.jar:?]
    at com.mchange.v2.c3p0.impl.NewProxyResultSet.getInt(NewProxyResultSet.java:372) ~[c3p0-0.9.5.jar:0.9.5]
    at com.dev.lock.data.ElectLock_Array.initEleLockData(ElectLock_Array.java:37) [bin/:?]
    at main.main_ElectLock_Alarm.main(main_ElectLock_Alarm.java:52) [bin/:?]
ElectLock_Alarm/electlock_alarm_x64_logs/info-20250211-1.log.gz
Binary files differ
ElectLock_Alarm/electlock_alarm_x64_logs/info-20250421-1.log.gz
Binary files differ
ElectLock_Alarm/electlock_alarm_x64_logs/info.log
Diff too large
ElectLock_Alarm/src/com/dev/lock/data/ElectLock_Array.java
@@ -34,7 +34,7 @@
            res = sql.sqlMysqlQuery(sql_str);
            while(res.next()) {
                int lock_id = res.getInt("lock_id");
                int area_id = res.getInt("area_id");                    //区域ID
                int station_id = res.getInt("station_id");                //区域ID
                String lock_name = res.getString("lock_name");            //锁名称
                String lock_type = res.getString("lock_type");            //锁类型(无源,蓝牙)
                int lock_state = res.getInt("lock_state");                //锁状态
@@ -62,7 +62,7 @@
                } else {
                    ElectLock_Inf tmp_lock = new ElectLock_Inf(pool);
                    tmp_lock.setLock_id(lock_id);
                    tmp_lock.setArea_id(area_id);                //'区域id',
                    tmp_lock.setStation_id(station_id);                //'区域id',
                    tmp_lock.setLock_name(lock_name);            //'锁名称',
                    tmp_lock.setLock_type(lock_type);            //'锁类型(无源,蓝牙)',
                    tmp_lock.setLock_state(lock_state);            //'锁状态',
ElectLock_Alarm/src/com/dev/lock/data/ElectLock_Inf.java
@@ -8,7 +8,7 @@
    
    private boolean StoreDataBusy = false;
    
    private int area_id;            //'区域id',
    private int station_id;            //'区域id',
    private String lock_name;        //'锁名称',
    private String lock_type;        //'锁类型(无源,蓝牙)',
    private int lock_state;            //'锁状态',
@@ -44,9 +44,6 @@
        return store_state;
    }
    
    public int getArea_id() {
        return area_id;
    }
    public String getLock_name() {
        return lock_name;
    }
@@ -65,9 +62,16 @@
    public String getLock_ip() {
        return lock_ip;
    }
    public void setArea_id(int area_id) {
        this.area_id = area_id;
    public int getStation_id() {
        return station_id;
    }
    public void setStation_id(int station_id) {
        this.station_id = station_id;
    }
    public void setLock_name(String lock_name) {
        this.lock_name = lock_name;
    }
ElectLock_Alarm/src/com/sql/Sql_Mysql.java
@@ -10,35 +10,40 @@
import org.apache.logging.log4j.Logger;
public class Sql_Mysql {
    public static final String DB_AREA                     = "`db_area`";
    public static final String DB_LOCK_RAM                 = "`db_lock_ram`";
    public static final String DB_USER                     = "`db_user`";
    public static final String DB_LOCK_HIS                 = "`db_lock_his`";      //锁具历史状态库
    public static final String DB_LOCK_ALARM             = "`db_lock_alarm`";    //锁具告警库
    public static final String PLUS_INF                 = "`plus_inf`";
    public static final String PLUS_LOCK_RAM             = "`plus_lock_ram`";
    public static final String PLUS_USER                 = "`plus_user`";
    public static final String PLUS_LOCK_HIS             = "`plus_lock_his`";                      //锁具历史状态库
    public static final String PLUS_LOCK_ALARM             = "`plus_lock_alarm`";                    //锁具告警库
//    public static final String DB_AREA                     = "`db_area`";
//    public static final String DB_LOCK_RAM                 = "`db_lock_ram`";
//    public static final String DB_USER                     = "`db_user`";
//    public static final String DB_LOCK_HIS                 = "`db_lock_his`";                      //锁具历史状态库
//    public static final String DB_LOCK_ALARM             = "`db_lock_alarm`";                    //锁具告警库
    /*********************************************************/
    public static final String Lock_Rt_Table             = DB_LOCK_RAM + ".tb_lock_rt";
    public static final String Lock_Ctl_Log_Table         = DB_LOCK_RAM + ".tb_lock_ctl_log";
    public static final String Lock_Report_Table         = DB_LOCK_RAM + ".tb_lock_report";        //锁具开锁次数统计表
    public static final String Lock_Rt_Table             = PLUS_LOCK_RAM + ".tb_lock_rt";
    public static final String Lock_Ctl_Log_Table         = PLUS_LOCK_RAM + ".tb_lock_ctl_log";
    public static final String Lock_Report_Table         = PLUS_LOCK_RAM + ".tb_lock_report";        //锁具开锁次数统计表
    /*********************************************************/
    /***************  ************ db_area  ******************************/
    public static final String Lock_Inf_Table             = DB_AREA + ".tb_lock_inf";
    public static final String Key_Inf_Table             = DB_AREA + ".tb_key_inf";
    public static final String Auth_Idcard_Table         = DB_AREA + ".tb_auth_idcard";            //批量添加授权和取消授权表
    public static final String Auth_Idcard_His_Table     = DB_AREA + ".tb_auth_idcard_his";        //批量添加授权和取消授权历史表
    /***************  ************ plus_inf  ******************************/
    public static final String Lock_Inf_Table             = PLUS_INF + ".tb_lock_inf";
    public static final String Key_Inf_Table             = PLUS_INF + ".tb_key_inf";
    public static final String Auth_Idcard_Table         = PLUS_INF + ".tb_auth_idcard";            //批量添加授权和取消授权表
    public static final String Auth_Idcard_His_Table     = PLUS_INF + ".tb_auth_idcard_his";        //批量添加授权和取消授权历史表
    /*********************************************************/
    /***************************** db_lock_his ****************************/
    public static final String Lock_His_Table             = DB_LOCK_HIS + ".tb_lock_his_";        //锁具开锁次数统计表
    /***************************** plus_lock_his ****************************/
    public static final String Lock_His_Table             = PLUS_LOCK_HIS + ".tb_lock_his_";        //锁具开锁次数统计表
    
    /*********************************************************/
    /***************************** db_user ****************************/
    public static final String Process_Survey_Table     = DB_USER + ".tb_process_survey";        //线程管理表
    /***************************** plus_user ****************************/
    public static final String Process_Survey_Table     = PLUS_USER + ".tb_process_survey";        //线程管理表
    
    /***************************** db_lock_alarm ****************************/
    public static final String Lock_Alarm_Table     = DB_LOCK_ALARM + ".tb_lock_alarm";        //实时告警
    public static final String Lock_Alm_Temp_Table     = DB_LOCK_ALARM + ".tb_lock_alm_temp";    //告警临时表
    public static final String Lock_Alarm_His_Table = DB_LOCK_ALARM + ".tb_lock_alarm_";    //历史告警表
    /***************************** plus_lock_alarm ****************************/
    public static final String Lock_Alarm_Table     = PLUS_LOCK_ALARM + ".tb_lock_alarm";        //实时告警
    public static final String Lock_Alm_Temp_Table     = PLUS_LOCK_ALARM + ".tb_lock_alm_temp";    //告警临时表
    public static final String Lock_Alarm_His_Table = PLUS_LOCK_ALARM + ".tb_lock_alarm_";    //历史告警表
    
    /*********************************************************/
    
ElectLock_Alarm/src/main/main_ElectLock_Alarm.java
@@ -34,10 +34,11 @@
        GB_ElLock_Array = new ElectLock_Array();
        
        logger = LogManager.getLogger(main_ElectLock_Alarm.class);
        String ver = "Welcome To Use BattMonitorFBS9600S V"+m_VersionNum+" RC_20180324";
        String ver = "Welcome To Use main_ElectLock_Alarm V"+m_VersionNum+" RC_20180324";
        ver = ver + " app_for_FBS9600S_only";
        ver = ver + " app_for_ElectLock_Alarm_only";
        logger.info(ver);
        logger.info("Server Started At DateTime: " + Com.getDateTimeFormat(new Date(), "yyyy-MM-dd HH:mm:ss"));
        m_AppConfig = new AppConfig();
@@ -87,7 +88,10 @@
            try {
                logger.info(" 开始检测数据库连接 ");
                conn =  GB_MysqlConnPool.getConn();
                if(conn != null){ }else {
                if(conn != null){
                    logger.info("检测数据库连接成功 ");
                    break;
                }else {
                    logger.info("连接数据库失败,稍后重新连接....");
                }
            } catch (Exception e) {