定制提交

DELL

2024-12-12 29ec7a06ce43a377c669db223f140a9bf40b27aa

定制提交

 BattMonitor_FBS9100S_ForXinJiang/batt_ms_x64_fbsdev_logs/info-20240918-1.log.gz

Binary files differ

 BattMonitor_FBS9100S_ForXinJiang/batt_ms_x64_fbsdev_logs/info.log

@@ -1,16 +1,26 @@
2024-05-10 14:48:50.659 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************

2024-05-10 14:48:50.670 [main] [INFO] main.main_MonitorServer_FBS9100S - *****************************************************************

2024-05-10 14:48:50.670 [main] [INFO] main.main_MonitorServer_FBS9100S - ****************************************************************/

2024-05-10 14:48:50.670 [main] [INFO] main.main_MonitorServer_FBS9100S - Welcome To Use BattMonitorFBS9100S V10.655 RC_20201110

2024-05-10 14:48:50.670 [main] [INFO] main.main_MonitorServer_FBS9100S - Server Started ... 
2024-05-10 14:48:50.699 [main] [INFO] main.main_MonitorServer_FBS9100S - 正在连接数据库 DBserver IP：192.168.10.79, port: 3360

2024-05-10 14:48:55.281 [main] [INFO] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool connect to sql server Successs ... 
2024-05-10 14:48:55.282 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-05-10 14:48:56.274 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-05-10 14:48:56.274 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-05-10 14:48:59.106 [main] [WARN] com.battmonitor.data.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()

2024-05-10 14:49:54.327 [main] [INFO] main.main_MonitorServer_FBS9100S - ------------------- AppConfig start -----------------------------------
MysqlServerIp=192.168.10.79
2024-10-12 17:11:35.812 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************

2024-10-12 17:11:35.827 [main] [INFO] main.main_MonitorServer_FBS9100S - *****************************************************************

2024-10-12 17:11:35.827 [main] [INFO] main.main_MonitorServer_FBS9100S - ****************************************************************/

2024-10-12 17:11:35.827 [main] [INFO] main.main_MonitorServer_FBS9100S - Welcome To Use BattMonitorFBS9100S V20.657 RC_20201110

2024-10-12 17:11:35.827 [main] [INFO] main.main_MonitorServer_FBS9100S - Server Started ... 
2024-10-12 17:11:35.857 [main] [INFO] main.main_MonitorServer_FBS9100S - 正在连接数据库 DBserver IP：127.0.0.1, port: 3360

2024-10-12 17:11:37.124 [main] [INFO] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool connect to sql server Successs ... 
2024-10-12 17:11:37.125 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-10-12 17:11:37.143 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-10-12 17:11:37.143 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-10-12 17:12:02.719 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************

2024-10-12 17:12:02.722 [main] [INFO] main.main_MonitorServer_FBS9100S - *****************************************************************

2024-10-12 17:12:02.723 [main] [INFO] main.main_MonitorServer_FBS9100S - ****************************************************************/

2024-10-12 17:12:02.723 [main] [INFO] main.main_MonitorServer_FBS9100S - Welcome To Use BattMonitorFBS9100S V20.657 RC_20201110

2024-10-12 17:12:02.723 [main] [INFO] main.main_MonitorServer_FBS9100S - Server Started ... 
2024-10-12 17:12:02.759 [main] [INFO] main.main_MonitorServer_FBS9100S - 正在连接数据库 DBserver IP：127.0.0.1, port: 3360

2024-10-12 17:12:03.364 [main] [INFO] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool connect to sql server Successs ... 
2024-10-12 17:12:03.365 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-10-12 17:12:03.369 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-10-12 17:12:03.369 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-10-12 17:12:04.043 [main] [WARN] com.battmonitor.data.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()

2024-10-12 17:12:04.318 [main] [INFO] main.main_MonitorServer_FBS9100S - ------------------- AppConfig start -----------------------------------
MysqlServerIp=127.0.0.1
SybaseServerIp=127.0.0.1
MysqlConnCountMax=500
WorkThreadCountMax=340
@@ -24,16 +34,16 @@
BattResStoreDayInterval=7
------------------- AppConfig end -----------------------------------


2024-05-10 14:49:54.328 [main] [INFO] main.main_MonitorServer_FBS9100S - --------------------- App_Param start---------------------------------
2024-10-12 17:12:04.318 [main] [INFO] main.main_MonitorServer_FBS9100S - --------------------- App_Param start---------------------------------
Discharge_TestTimeLongMinimum=60
Discharge_SaveDataTimeInterval=10
Discharge_MonVolChangeLevel=0.01
Discharge_BattTestGroupCountMax=100
Discharge_MonVolChangeLevel=0.05
Discharge_BattTestGroupCountMax=10
Discharge_TestDataRecordCountMax=10000
--------------------------------------------------------------------
Charge_TestTimeLongMinimum=60
Charge_SaveDataTimeInterval=10
Charge_MonVolChangeLevel=0.01
Charge_MonVolChangeLevel=0.05
Charge_BattTestGroupCountMax=10
Charge_TestDataRecordCountMax=10000
--------------------------------------------------------------------
@@ -46,77 +56,33 @@
Discharge_BattJunHengFN=false
--------------------- App_Param end---------------------------------


2024-05-10 14:49:54.327 [Thread-8] [DEBUG] com.battmonitor.sql.MysqlConnPool - OS Inf: windows 10

2024-05-10 14:49:54.328 [main] [INFO] main.main_MonitorServer_FBS9100S - SourceBattDataType is DATA_SOURCE_FBSDEV

2024-05-10 14:49:54.329 [Thread-8] [DEBUG] com.battmonitor.sql.MysqlConnPool - df_path: D:

2024-05-10 14:49:54.329 [main] [INFO] main.main_MonitorServer_FBS9100S - Recreate RamDB Tables State Is 'false'

2024-05-10 14:49:54.342 [Thread-10] [WARN] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread Started By TimerTask ...

2024-05-10 14:49:54.347 [Thread-12] [INFO] com.batttest.BattResStorePro_Thread - BattResStorePro_Thread Started ...

2024-05-10 14:49:56.352 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 2, IdleConnCnt: 1

2024-05-10 14:49:59.344 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():100

2024-05-10 14:50:01.518 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 2, IdleConnCnt: 1

2024-05-10 14:50:17.779 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************

2024-05-10 14:50:17.781 [main] [INFO] main.main_MonitorServer_FBS9100S - *****************************************************************

2024-05-10 14:50:17.781 [main] [INFO] main.main_MonitorServer_FBS9100S - ****************************************************************/

2024-05-10 14:50:17.781 [main] [INFO] main.main_MonitorServer_FBS9100S - Welcome To Use BattMonitorFBS9100S V10.655 RC_20201110

2024-05-10 14:50:17.781 [main] [INFO] main.main_MonitorServer_FBS9100S - Server Started ... 
2024-05-10 14:50:17.807 [main] [INFO] main.main_MonitorServer_FBS9100S - 正在连接数据库 DBserver IP：192.168.10.79, port: 3360

2024-05-10 14:50:20.673 [main] [INFO] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool connect to sql server Successs ... 
2024-05-10 14:50:20.674 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-05-10 14:50:21.315 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-05-10 14:50:21.316 [main] [INFO] main.main_MonitorServer_FBS9100S - /****************************************************************/

2024-05-10 14:50:23.826 [main] [WARN] com.battmonitor.data.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()

2024-05-10 14:50:56.747 [main] [INFO] main.main_MonitorServer_FBS9100S - ------------------- AppConfig start -----------------------------------
MysqlServerIp=192.168.10.79
SybaseServerIp=127.0.0.1
MysqlConnCountMax=500
WorkThreadCountMax=340
SourceBattDataType=0
FbsDeviceBaseIp=192.168.0.1
BattAlarmFnEn=true
BattAlarmFnStartDelay=10
BattAlarmClearedDelay=600
BattResStoreFnEn=true
BattResStoreDelayForTestManual=1200
BattResStoreDayInterval=7
------------------- AppConfig end -----------------------------------


2024-05-10 14:50:56.748 [main] [INFO] main.main_MonitorServer_FBS9100S - --------------------- App_Param start---------------------------------
Discharge_TestTimeLongMinimum=60
Discharge_SaveDataTimeInterval=10
Discharge_MonVolChangeLevel=0.01
Discharge_BattTestGroupCountMax=100
Discharge_TestDataRecordCountMax=10000
--------------------------------------------------------------------
Charge_TestTimeLongMinimum=60
Charge_SaveDataTimeInterval=10
Charge_MonVolChangeLevel=0.01
Charge_BattTestGroupCountMax=10
Charge_TestDataRecordCountMax=10000
--------------------------------------------------------------------
Poweroff_TestTimeLongMinimum=1800
Poweroff_SaveDataTimeInterval=10
Poweroff_MonVolChangeLevel=0.05
Poweroff_BattTestGroupCountMax=10
Poweroff_TestDataRecordCountMax=10000
--------------------------------------------------------------------
Discharge_BattJunHengFN=false
--------------------- App_Param end---------------------------------


2024-05-10 14:50:56.748 [main] [INFO] main.main_MonitorServer_FBS9100S - SourceBattDataType is DATA_SOURCE_FBSDEV

2024-05-10 14:50:56.748 [Thread-8] [DEBUG] com.battmonitor.sql.MysqlConnPool - OS Inf: windows 10

2024-05-10 14:50:56.748 [main] [INFO] main.main_MonitorServer_FBS9100S - Recreate RamDB Tables State Is 'false'

2024-05-10 14:50:56.748 [Thread-8] [DEBUG] com.battmonitor.sql.MysqlConnPool - df_path: D:

2024-05-10 14:50:56.750 [Thread-10] [WARN] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread Started By TimerTask ...

2024-05-10 14:50:56.751 [Thread-12] [INFO] com.batttest.BattResStorePro_Thread - BattResStorePro_Thread Started ...

2024-05-10 14:50:58.752 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 3, IdleConnCnt: 0

2024-05-10 14:51:01.756 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():100

2024-05-10 14:51:06.396 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 1, IdleConnCnt: 5

2024-05-10 14:51:06.773 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():100

2024-05-10 14:51:08.928 [Thread-9] [TRACE] main.FBS9100S_ServerSocketThread - FBS9100S_Listener_Thread Started On Port 9101

2024-05-10 14:51:11.545 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 6

2024-05-10 14:51:11.778 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():100

2024-05-10 14:51:16.667 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 6

2024-05-10 14:51:16.789 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():100

2024-05-10 14:51:21.791 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():100

2024-05-10 14:51:21.928 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 6

2024-10-12 17:12:04.318 [Thread-8] [DEBUG] com.battmonitor.sql.MysqlConnPool - OS Inf: windows 10

2024-10-12 17:12:04.318 [main] [INFO] main.main_MonitorServer_FBS9100S - SourceBattDataType is DATA_SOURCE_FBSDEV

2024-10-12 17:12:04.319 [Thread-8] [DEBUG] com.battmonitor.sql.MysqlConnPool - df_path: D:

2024-10-12 17:12:04.319 [main] [INFO] main.main_MonitorServer_FBS9100S - Recreate RamDB Tables State Is 'false'

2024-10-12 17:12:04.321 [Thread-10] [WARN] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread Started By TimerTask ...

2024-10-12 17:12:04.322 [Thread-12] [INFO] com.batttest.BattResStorePro_Thread - BattResStorePro_Thread Started ...

2024-10-12 17:12:04.324 [Thread-13] [WARN] com.dev.btse.comm.BattRealDataPro_Thread - BattRealDataPro_Thread Started Sleep 60S ...

2024-10-12 17:12:05.211 [Thread-9] [TRACE] main.FBS9100S_ServerSocketThread - FBS9100S_Listener_Thread Started On Port 9101

2024-10-12 17:12:06.336 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:09.333 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:11.362 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:14.346 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:16.377 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:19.348 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:21.410 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:24.363 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:26.442 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:29.371 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:31.467 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:34.373 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:36.495 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:39.386 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:41.521 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:44.392 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:46.540 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:49.404 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:51.573 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:54.415 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10

2024-10-12 17:12:56.602 [main] [TRACE] main.main_MonitorServer_FBS9100S - GB_MysqlConnPool BusyConnCnt: 0, IdleConnCnt: 3

2024-10-12 17:12:59.425 [Thread-10] [TRACE] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread m_BattTestState.getFreeStatCount():10


 BattMonitor_FBS9100S_ForXinJiang/bin/com/battmonitor/data/BattData_RT.class

Binary files differ

 BattMonitor_FBS9100S_ForXinJiang/bin/com/battmonitor/sql/MysqlConnPool.class

Binary files differ

 BattMonitor_FBS9100S_ForXinJiang/bin/com/dev/btse/comm/FBS9100_Task_Thread_SQL.class

Binary files differ

 BattMonitor_FBS9100S_ForXinJiang/config.xml

@@ -2,7 +2,7 @@

<root>
  <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
  <mysql_server_ip>192.168.10.79</mysql_server_ip>
  <mysql_server_ip>127.0.0.1</mysql_server_ip>
  <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
  <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
  <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->

 BattMonitor_FBS9100S_ForXinJiang/src/com/battmonitor/data/BattData_RT.java

@@ -809,7 +809,8 @@
            boolean dt_new = make_al_MonVol_History();

            if(mTestData.recordNum < mTestDataRecordCountMax) 

            {

                if((true == dt_new) || ((mTestData.dataCalCount % mSaveDataTimeInterval)==0))

                if ((true == dt_new) || ((mTestData.dataCalCount

                        % mSaveDataTimeInterval) == 0) /* || (mTestData.testTimeLong <= (60*10)) */)

                {

                    set_al_MonVol_History_New();

                    store_state = true;


 BattMonitor_FBS9100S_ForXinJiang/src/com/battmonitor/sql/MysqlConnPool.java

@@ -32,6 +32,9 @@
        mysql_ds.setUser("root");

        mysql_ds.setPassword("lmx8688139");

        //mysql_ds.setPassword("Dongli&12345678");    //清远电信数据库密码修改

		
//        mysql_ds.setUser("whyc");                    //天一电厂账号

//        mysql_ds.setPassword("Fg001@hdw");                //天一电厂密码

        mysql_ds.setMaxPoolSize(conncount_max);

        mysql_ds.setMinPoolSize(2);

        mysql_ds.setIdleConnectionTestPeriod(300);


 BattMonitor_FBS9100S_ForXinJiang/src/com/dev/btse/comm/FBS9100_Task_Thread_SQL.java

@@ -1077,8 +1077,8 @@
                        + "dev_id=" + m_pm.dev_id + ", "

                        + "dev_ip='" + m_pm.dev_ipaddr + "', "

                        + "dev_version='" + m_pm.m_DevVersion + "', "

                        + "record_datetime="

                        + "'" + Com.getDateTimeFormat(m_pm.m_SysState.Record_DateTime, Com.DTF_YMDhms) + "',"

                        + "record_datetime=NOW(),"

                        //+ "'" + Com.getDateTimeFormat(m_pm.m_SysState.Record_DateTime, Com.DTF_YMDhms) + "',"

                        + "dev_datetime='" + m_pm.m_SysState.DTime.year + "-" 

                                            + m_pm.m_SysState.DTime.month + "-"

                                            + m_pm.m_SysState.DTime.day + " "

@@ -1150,8 +1150,8 @@
                        + "dev_id=" + m_pm.dev_id + ", "

                        + "dev_ip='" + m_pm.dev_ipaddr + "', "

                        + "dev_version='" + m_pm.m_DevVersion + "', "

                        + "record_datetime="

                        + "'" + Com.getDateTimeFormat(m_pm.m_SysState.Record_DateTime, Com.DTF_YMDhms) + "',"

                        + "record_datetime=NOW(), "

                        //+ "'" + Com.getDateTimeFormat(m_pm.m_SysState.Record_DateTime, Com.DTF_YMDhms) + "',"

                        + "dev_datetime='" + m_pm.m_SysState.DTime.year + "-" 

                                            + m_pm.m_SysState.DTime.month + "-"

                                            + m_pm.m_SysState.DTime.day + " "

@@ -1235,8 +1235,8 @@
                        + "dev_id=" + m_pm.dev_id + ", "

                        + "dev_ip='" + m_pm.dev_ipaddr + "', "

                        + "dev_version='" + m_pm.m_DevVersion + "', "

                        + "record_datetime="

                        + "'" + Com.getDateTimeFormat(m_pm.m_SysState.Record_DateTime, Com.DTF_YMDhms) + "',"

                        + "record_datetime=NOW(),"

                        //+ "'" + Com.getDateTimeFormat(m_pm.m_SysState.Record_DateTime, Com.DTF_YMDhms) + "',"

                        + "dev_datetime='" + m_pm.m_SysState.DTime.year + "-" 

                                            + m_pm.m_SysState.DTime.month + "-"

                                            + m_pm.m_SysState.DTime.day + " "