山西储能通信程序修复log4j2JAR漏洞以及修改记录内阻数据时的建表语句新增标准内阻数据标识

Administrator

2022-01-06 8296c627c4e0774928bf266b5fd361f1b7d2c328

山西储能通信程序修复log4j2JAR漏洞以及修改记录内阻数据时的建表语句新增标准内阻数据标识

 BattMonitor_ESS_ForShanXi/.classpath

@@ -16,12 +16,12 @@
    <classpathentry kind="lib" path="lib/mina-core-2.0.4.jar"/>

    <classpathentry kind="lib" path="lib/mysql-connector-java-5.1.30-bin.jar"/>

    <classpathentry kind="lib" path="lib/sqljdbc4.jar"/>

    <classpathentry kind="lib" path="lib/log4j-api-2.13.3.jar"/>

    <classpathentry kind="lib" path="lib/log4j-core-2.13.3.jar"/>

    <classpathentry kind="lib" path="lib/modbus4j-3.0.4-SNAPSHOT.jar"/>

    <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.2.jar"/>

    <classpathentry kind="lib" path="lib/slf4j-api-1.5.2.jar"/>

    <classpathentry kind="lib" path="lib/commons-lang3-3.11.jar"/>

    <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>

    <classpathentry kind="lib" path="lib/log4j-api-2.15.0.jar"/>

    <classpathentry kind="lib" path="lib/log4j-core-2.15.0.jar"/>

    <classpathentry kind="output" path="bin"/>

</classpath>


 BattMonitor_ESS_ForShanXi/batt_ms_ess_logs/datalog.log

Diff too large

 BattMonitor_ESS_ForShanXi/batt_ms_ess_logs/info-20211118-1.log.gz

Binary files differ

 BattMonitor_ESS_ForShanXi/batt_ms_ess_logs/info-20211127-1.log.gz

Binary files differ

 BattMonitor_ESS_ForShanXi/batt_ms_ess_logs/info.log

@@ -1,14 +1,14 @@
2021-11-18 15:04:04.885 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************

2021-11-18 15:04:04.933 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - *****************************************************************

2021-11-18 15:04:04.934 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ****************************************************************/

2021-11-18 15:04:04.935 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Welcome To Use main_MonitorServer_ESS_ForShanXi V1.101 RC_20210922

2021-11-18 15:04:04.936 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Server Started ... 
2021-11-18 15:04:05.168 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 正在连接数据库 DBserver IP：127.0.0.1, port: 3360

2021-11-18 15:04:06.979 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 成功连接数据库 DBserver IP：127.0.0.1, port: 3360

2021-11-18 15:04:06.980 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2021-11-18 15:04:06.981 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2021-11-18 15:04:07.869 [main] [WARN] com.battmonitor.data.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()

2021-11-18 15:04:08.418 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ------------------- AppConfig start -----------------------------------
2022-01-04 10:47:17.286 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************

2022-01-04 10:47:17.295 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - *****************************************************************

2022-01-04 10:47:17.295 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ****************************************************************/

2022-01-04 10:47:17.295 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Welcome To Use main_MonitorServer_ESS_ForShanXi V1.101 RC_20210922

2022-01-04 10:47:17.295 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Server Started ... 
2022-01-04 10:47:17.321 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 正在连接数据库 DBserver IP：127.0.0.1, port: 3360

2022-01-04 10:47:18.016 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 成功连接数据库 DBserver IP：127.0.0.1, port: 3360

2022-01-04 10:47:18.016 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2022-01-04 10:47:18.016 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2022-01-04 10:47:19.041 [main] [WARN] com.battmonitor.data.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()

2022-01-04 10:47:19.582 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ------------------- AppConfig start -----------------------------------
MysqlServerIp=127.0.0.1
SybaseServerIp=127.0.0.1
MysqlConnCountMax=500
@@ -23,7 +23,7 @@
BattResStoreDayInterval=7
------------------- AppConfig end -----------------------------------


2021-11-18 15:04:08.419 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - --------------------- App_Param start---------------------------------
2022-01-04 10:47:19.582 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - --------------------- App_Param start---------------------------------
Discharge_TestTimeLongMinimum=60
Discharge_SaveDataTimeInterval=10
Discharge_MonVolChangeLevel=0.01
@@ -45,9 +45,109 @@
Discharge_BattJunHengFN=false
--------------------- App_Param end---------------------------------


2021-11-18 15:04:08.422 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - SourceBattDataType is DATA_SOURCE_FBSDEV

2021-11-18 15:04:08.423 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Recreate RamDB Tables State Is 'false'

2021-11-18 15:04:08.453 [Thread-9] [INFO] com.dev.ess.comm.ESS3100_ServerSocket_Thread - ESS5100_ServerSocket_Thread Thread Started: BTS_IEC61850_DEV_Count = 1

2021-11-18 15:04:08.485 [Thread-10] [WARN] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread Started By TimerTask ...

2021-11-18 15:04:17.508 [Thread-9] [INFO] com.dev.ess.comm.ESS3100_ServerSocket_Thread - AL_ESS_STORAGE_DEV1 Id: 310000001, Ip: 192.168.10.122

2021-11-18 15:04:17.509 [Thread-12] [INFO] com.dev.ess.comm.ESS3100_SocketClient_Thread - 设备ID:310000001;电池组组数:1;每组单体数目:240

2022-01-04 10:47:19.583 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - SourceBattDataType is DATA_SOURCE_FBSDEV

2022-01-04 10:47:19.583 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Recreate RamDB Tables State Is 'false'

2022-01-04 10:47:19.583 [Thread-9] [INFO] com.dev.ess.comm.ESS3100_ServerSocket_Thread - ESS5100_ServerSocket_Thread Thread Started: BTS_IEC61850_DEV_Count = 0

2022-01-04 10:47:19.584 [Thread-10] [WARN] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread Started By TimerTask ...

2022-01-04 10:48:53.280 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************

2022-01-04 10:48:53.282 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - *****************************************************************

2022-01-04 10:48:53.282 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ****************************************************************/

2022-01-04 10:48:53.282 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Welcome To Use main_MonitorServer_ESS_ForShanXi V1.101 RC_20210922

2022-01-04 10:48:53.282 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Server Started ... 
2022-01-04 10:48:53.307 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 正在连接数据库 DBserver IP：127.0.0.1, port: 3360

2022-01-04 10:48:53.834 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 成功连接数据库 DBserver IP：127.0.0.1, port: 3360

2022-01-04 10:48:53.834 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2022-01-04 10:48:53.834 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2022-01-04 10:48:54.635 [main] [WARN] com.battmonitor.data.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()

2022-01-04 10:48:55.758 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ------------------- AppConfig start -----------------------------------
MysqlServerIp=127.0.0.1
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 -----------------------------------


2022-01-04 10:48:55.759 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - --------------------- App_Param start---------------------------------
Discharge_TestTimeLongMinimum=60
Discharge_SaveDataTimeInterval=10
Discharge_MonVolChangeLevel=0.01
Discharge_BattTestGroupCountMax=100
Discharge_TestDataRecordCountMax=10000
--------------------------------------------------------------------
Charge_TestTimeLongMinimum=60
Charge_SaveDataTimeInterval=30
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---------------------------------


2022-01-04 10:48:55.760 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - SourceBattDataType is DATA_SOURCE_FBSDEV

2022-01-04 10:48:55.761 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Recreate RamDB Tables State Is 'false'

2022-01-04 10:48:55.762 [Thread-9] [INFO] com.dev.ess.comm.ESS3100_ServerSocket_Thread - ESS5100_ServerSocket_Thread Thread Started: BTS_IEC61850_DEV_Count = 0

2022-01-04 10:48:55.763 [Thread-10] [WARN] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread Started By TimerTask ...

2022-01-04 10:49:58.455 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************

2022-01-04 10:49:58.457 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - *****************************************************************

2022-01-04 10:49:58.457 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ****************************************************************/

2022-01-04 10:49:58.457 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Welcome To Use main_MonitorServer_ESS_ForShanXi V1.101 RC_20210922

2022-01-04 10:49:58.457 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Server Started ... 
2022-01-04 10:49:58.481 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 正在连接数据库 DBserver IP：127.0.0.1, port: 3360

2022-01-04 10:49:59.002 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - 成功连接数据库 DBserver IP：127.0.0.1, port: 3360

2022-01-04 10:49:59.003 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2022-01-04 10:49:59.003 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - /****************************************************************/

2022-01-04 10:49:59.559 [main] [WARN] com.battmonitor.data.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()

2022-01-04 10:49:59.759 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - ------------------- AppConfig start -----------------------------------
MysqlServerIp=127.0.0.1
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 -----------------------------------


2022-01-04 10:49:59.759 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - --------------------- App_Param start---------------------------------
Discharge_TestTimeLongMinimum=60
Discharge_SaveDataTimeInterval=10
Discharge_MonVolChangeLevel=0.01
Discharge_BattTestGroupCountMax=100
Discharge_TestDataRecordCountMax=10000
--------------------------------------------------------------------
Charge_TestTimeLongMinimum=60
Charge_SaveDataTimeInterval=30
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---------------------------------


2022-01-04 10:49:59.759 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - SourceBattDataType is DATA_SOURCE_FBSDEV

2022-01-04 10:49:59.759 [main] [INFO] main.main_MonitorServer_ESS_ForShanXi - Recreate RamDB Tables State Is 'false'

2022-01-04 10:49:59.760 [Thread-9] [INFO] com.dev.ess.comm.ESS3100_ServerSocket_Thread - ESS5100_ServerSocket_Thread Thread Started: BTS_IEC61850_DEV_Count = 0

2022-01-04 10:49:59.761 [Thread-10] [WARN] com.batttest.BattDataTestPro_Thread - BattDataTestPro_Thread Started By TimerTask ...


 BattMonitor_ESS_ForShanXi/bin/.gitignore

File was deleted

 BattMonitor_ESS_ForShanXi/bin/c3p0-oracle-thin-extras-0.9.5.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/c3p0.properties

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/base/AppParam$MonitorParam.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/base/AppParam.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/base/BattTestData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/base/Com.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/base/ComBase.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/base/Crc16.class

Binary files differ

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

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data/BattData_RT_Array.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data/BattData_RT_RamDB_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data/BattData_RT_RamDB_Thread_SQL.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data/BattData_RT_SQL.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data/BattStatData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data/MonVolData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data_store/InsertDataToMysql_Task.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data_store/InsertDataToMysql_Task_SQL.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/data_store/getInsertDataTaskInstant.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/sql/Com.class

Binary files differ

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

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/sql/MysqlDBBackUp_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/battmonitor/sql/Sql_Mysql.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/batttest/BattAutoStorePro_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/batttest/BattDataTestPro_Thread$BattTestState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/batttest/BattDataTestPro_Thread$MyBattTestTask.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/batttest/BattDataTestPro_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/batttest/BattResStorePro_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/config/AppConfig.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/BattRealDataPro_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/FBS9100S_DFU.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/FBS9100S_DFU_SQL.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/FBS9100S_SocketClient2.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/FBS9100_ServerSocketThread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/FBS9100_SocketClient.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/FBS9100_SocketClient2.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/comm/FBS9100_Task_Thread.class

Binary files differ

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

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/ComFn.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/Ecb_Aes.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/Ecb_Crypt.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_BusCoupleState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_LIBMS_AlarmState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_LiBMS_AnalogData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_NT_DCDC_Data.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_NT_DCDC_State.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_NiBian_Data.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_SX_DCDC_Data.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_SX_DCDC_Param.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100S_StemNode_State.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_CMCC_Power.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_CalSet.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_CapState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ChargeState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_Cmd.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ComBase.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ComBuf.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_Crc16.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_DateTime.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_DateTimeSet.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_DeviceInf.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_JHPowerState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_JuHengParam.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ParamAlarm.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ParamAnalyze.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ParamBatt.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ParamCharge.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ParamDischarge.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ParamSystem.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ResCapData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_ResState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_StatAndParam.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_SysLog.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_SysState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_TestTime.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/btse/data/FBS9100_VCData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/ess/comm/ESS3100_ServerSocket_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/ess/comm/ESS3100_SocketClient_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/ess/comm/ESS3100_Task_SQL.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/ess/data/ESS3100_BattData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/ess/data/ESS3100_PCSSysState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/ess/data/ESS3100_SysState$PCSState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev/ess/data/ESS3100_SysState.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev_fbs9600/data/FBS9600_CommData.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev_fbs9600/data/FBS9600_ServerSocket_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev_fbs9600/data/FBS9600_SocketClient.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev_fbs9600/data/FBS9600_SocketClient2.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev_fbs9600/data/FBS9600_State.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev_fbs9600/data/FBS9600_State_SQL.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/dev_fbs9600/data/FBS9600_Task_Thread.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/modbus/data/MyModbusFactory.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/modbus/data/MyModbusMaster.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/modbus/data/MyModbusUtils.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/com/version_inf/version_inf.txt

New file
@@ -0,0 +1,9 @@
山西ESS储能通信程序



V1.101 2021-11-27

    1.已完成山西储能基本数据的解析读取功能

	
V1.102 2022-01-06

    1.创建内阻数据表时新增字段`isStandard`用于标识对比标准内阻值

	
	

 BattMonitor_ESS_ForShanXi/bin/commons-lang3-3.11.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/dom4j-1.6.1.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/ftplet-api-1.0.6.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/ftpserver-core-1.0.6.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/jcl-over-slf4j-1.5.2.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/jconn3.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/jxl.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/log4j-1.2.14.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/log4j-api-2.15.0.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/log4j-core-2.15.0.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/log4j.properties

New file
@@ -0,0 +1,43 @@
log4j.rootLogger=DEBUG, R, O, LOGDB2



# Stdout

log4j.appender.O=org.apache.log4j.ConsoleAppender



# File

log4j.appender.R=org.apache.log4j.RollingFileAppender

log4j.appender.R.File=batt_ms_ess_logs/datalog.log



# Control the maximum log file size

log4j.appender.R.MaxFileSize=10000KB



# Archive log files (one backup file here)

log4j.appender.R.MaxBackupIndex=9



log4j.appender.R.layout=org.apache.log4j.PatternLayout

log4j.appender.O.layout=org.apache.log4j.PatternLayout



log4j.appender.R.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x - %C.%M(%F:%L) - %m%n

log4j.appender.O.layout.ConversionPattern=[%d{ISO8601}]%5p%6.6r[%t]%x - %C.%M(%F:%L) - %m%n





#数据库：

log4j.appender.LOGDB2=org.apache.log4j.jdbc.JDBCAppender



#日志级别：ALL < TRACE < DEBUG <INFO <WARN <ERROR <FATAL <OFF的级别顺序.

log4j.appender.LOGDB2.Threshold=OFF



#驱动：

log4j.appender.LOGDB2.Driver=com.mysql.jdbc.Driver



#连接：

log4j.appender.LOGDB2.URL=jdbc:mysql://127.0.0.1:3360/db_app_sys?useUnicode=true&characterEncoding=UTF-8



#账号密码：

log4j.appender.LOGDB2.user=root

log4j.appender.LOGDB2.password=lmx8688139



#SQL：

log4j.appender.LOGDB2.sql=insert into tb_batt_ms_x64_fbsdev_log4j (level,category,thread,time,location,note) values ("%p","%c","%t","%d{yyyy-MM-dd HH:mm:ss}","%l","%m")



#输出：

log4j.appender.LOGDB2.layout=org.apache.log4j.PatternLayout


 BattMonitor_ESS_ForShanXi/bin/main/main_MonitorServer_ESS_ForShanXi.class

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/mchange-commons-java-0.2.9.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/mchange-commons.properties

 BattMonitor_ESS_ForShanXi/bin/mchange-log.properties

New file
@@ -0,0 +1,2 @@
com.mchange.v2.log.MLog=com.mchange.v2.log.FallbackMLog 
com.mchange.v2.log.FallbackMLog.DEFAULT_CUTOFF_LEVEL=OFF

 BattMonitor_ESS_ForShanXi/bin/mina-core-2.0.4.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/modbus4j-3.0.4-SNAPSHOT.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/mysql-connector-java-5.1.30-bin.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/slf4j-api-1.5.2.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/slf4j-log4j12-1.5.2.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/spring-beans-2.5.5.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/spring-context-2.5.5.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/spring-core-2.5.5.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/bin/sqljdbc4.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/lib/log4j-api-2.13.3.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/lib/log4j-api-2.15.0.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/lib/log4j-core-2.13.3.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/lib/log4j-core-2.15.0.jar

Binary files differ

 BattMonitor_ESS_ForShanXi/src/com/batttest/BattResStorePro_Thread.java

@@ -78,6 +78,7 @@
                        + "`mon_res` FLOAT NOT NULL DEFAULT 0, "

                        + "`mon_ser` FLOAT NOT NULL DEFAULT 0, "

                        + "`conn_res` FLOAT NOT NULL DEFAULT 0, "

                        + "`isStandard` int(11) NOT NULL DEFAULT '0' COMMENT '是否为标准内阻记录[0:不标准;1:标准]',"

                        + "INDEX index_test_record_count (`test_record_count`), "

                        + "PRIMARY KEY (`num`));";

                //System.out.println(sql_str);

@@ -246,6 +247,7 @@
                        + "`mon_res` FLOAT NOT NULL DEFAULT 0, "

                        + "`mon_ser` FLOAT NOT NULL DEFAULT 0, "

                        + "`conn_res` FLOAT NOT NULL DEFAULT 0, "

                        + "`isStandard` int(11) NOT NULL DEFAULT '0' COMMENT '是否为标准内阻记录[0:不标准;1:标准]',"

                        + "INDEX index_test_record_count (`test_record_count`), "

                        + "PRIMARY KEY (`num`));";

                //System.out.println(sql_str);


 BattMonitor_ESS_ForShanXi/src/com/version_inf/version_inf.txt

@@ -3,4 +3,7 @@
V1.101 2021-11-27

    1.已完成山西储能基本数据的解析读取功能

    

V1.102 2022-01-06

    1.创建内阻数据表时新增字段`isStandard`用于标识对比标准内阻值

	
    

 BattMonitor_ESS_ForShanXi/src/main/main_MonitorServer_ESS_ForShanXi.java

@@ -33,7 +33,7 @@
    /**************************************************************************/

    /**************************************************************************/

    public final static boolean app_debug = false;

    public final static double m_VersionNum = 1.101;

    public final static double m_VersionNum = 1.102;

    public final static String m_Version = "Welcome To Use main_MonitorServer_ESS_ForShanXi V" 

                                            + m_VersionNum + " RC_20210922";

    /**************************************************************************/

@@ -207,9 +207,7 @@
        

        /*********************************************************************************/

        while(true) {

            try {

				
				
            try {			
                

                Thread.sleep(2000);