iec61852_forQGN/bin/com/battdata_rt/BattData_RT_Array.class | 补丁 | 查看 | 原始文档 | blame | 历史 | |
iec61852_forQGN/bin/com/dec/fbs9100/MysqlConnPool.class | 补丁 | 查看 | 原始文档 | blame | 历史 | |
iec61852_forQGN/bin/config.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
iec61852_forQGN/config.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
iec61852_forQGN/src/com/battdata_rt/BattData_RT_Array.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
iec61852_forQGN/src/com/dec/fbs9100/MysqlConnPool.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
iec61852_forQGN/bin/com/battdata_rt/BattData_RT_Array.classBinary files differ
iec61852_forQGN/bin/com/dec/fbs9100/MysqlConnPool.classBinary files differ
iec61852_forQGN/bin/config.xml
@@ -2,7 +2,7 @@ <root> <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en> <mysql_server_ip>127.0.0.1</mysql_server_ip> <mysql_server_ip>192.168.10.82</mysql_server_ip> <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0--> <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1--> <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2--> iec61852_forQGN/config.xml
@@ -2,7 +2,7 @@ <root> <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en> <mysql_server_ip>127.0.0.1</mysql_server_ip> <mysql_server_ip>192.168.10.82</mysql_server_ip> <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0--> <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1--> <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2--> iec61852_forQGN/src/com/battdata_rt/BattData_RT_Array.java
@@ -102,6 +102,7 @@ } boolean batt_group_exist = false; String reg_code = res.getString("BattGroupName6").trim(); String dev_ip = res.getString("FBSDeviceIp").trim(); float float_vol_lev = res.getFloat("FloatVolLevel"); float float_curr_lev = res.getFloat("BattFloatCurrent"); int GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice"); @@ -127,6 +128,12 @@ brt.updateMonCnt(mon_cnt); param_changed = true; } if(!dev_ip.equals(brt.FBSDeviceIp)) { //设备IP地址更新 brt.setFBSDeviceIp(dev_ip); param_changed = true; } if(GroupIndexInFBSDevice != brt.GroupIndexInFBSDevice) { brt.GroupIndexInFBSDevice = GroupIndexInFBSDevice; param_changed = true; @@ -226,16 +233,16 @@ boolean config_reinit_en = false; Sql_Mysql sql = new Sql_Mysql(m_Conn_Pool); try { String sql_str = "SELECT AppServer_Reinit_BattGroupData_EN, AppServer_Reinit_Config_EN" String sql_str = "SELECT AppServer_Reinit_BattGroupData_61852_EN, AppServer_Reinit_Config_EN" + " FROM " + Sql_Mysql.AppSys_Table; ResultSet res = sql.sqlMysqlQuery(sql_str); if(res.next()) { bg_reinit_en = res.getBoolean("AppServer_Reinit_BattGroupData_EN"); bg_reinit_en = res.getBoolean("AppServer_Reinit_BattGroupData_61852_EN"); config_reinit_en = res.getBoolean("AppServer_Reinit_Config_EN"); } if(true == bg_reinit_en) { sql_str = "UPDATE " + Sql_Mysql.AppSys_Table + " SET AppServer_Reinit_BattGroupData_EN=false WHERE num>0"; + " SET AppServer_Reinit_BattGroupData_61852_EN=false WHERE num>0"; sql.sqlMysqlExecute(sql_str); } if(true == config_reinit_en) { iec61852_forQGN/src/com/dec/fbs9100/MysqlConnPool.java
@@ -33,10 +33,10 @@ mysql_ds.setTestConnectionOnCheckout(false); mysql_ds.setDriverClass("com.mysql.jdbc.Driver"); mysql_ds.setJdbcUrl("jdbc:mysql://" + server_ip + ":" + mSqlPort + "/db_app_sys"); mysql_ds.setUser("whyc"); //天一电厂账号 mysql_ds.setPassword("Fg001@hdw"); //天一电厂密码 // mysql_ds.setUser("root"); // mysql_ds.setPassword("lmx8688139"); // mysql_ds.setUser("whyc"); //天一电厂账号 // mysql_ds.setPassword("Fg001@hdw"); //天一电厂密码 mysql_ds.setUser("root"); mysql_ds.setPassword("lmx8688139"); mysql_ds.setMaxPoolSize(conncount_max); mysql_ds.setMinPoolSize(2); mysql_ds.setAcquireIncrement(4);