DELL
2025-06-12 ef88036890b52ffca5cb97536fc64afa99e3237c
天一电厂配置修改恢复
3个文件已修改
20 ■■■■ 已修改文件
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -230,9 +230,9 @@
                
                FBS9100_Task_Thread_SQL.inseartDev_6185_AlmParam(m_ConnPool, m_StatAndParam.dev_id);
                
                //m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
                m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
                m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC);                //唯一序列号
                //BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam);        //更新当前参数
                BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam);        //更新当前参数
                
                
                //读取主从机功能使能
@@ -301,8 +301,8 @@
                                
                            
                                //读取一次ukey
                                //m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
                                m_StatAndParam.keyID = BTS61850_Task_Thread_SQL.queryDeviceUkeyID(m_ConnPool,m_StatAndParam.dev_id);
                                m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);
//                                m_StatAndParam.keyID = BTS61850_Task_Thread_SQL.queryDeviceUkeyID(m_ConnPool,m_StatAndParam.dev_id);
                                m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC);                //唯一序列号
                                BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam);                                //更新当前参数
                            }
@@ -1366,6 +1366,14 @@
                            //System.out.println(fc_model_str);
                        }
                    }
                    if(m_FBS_DiscParamFromDev.DCVolHighLimit <= 0) {
                        //集合点位中无升压上限[兼容早期设备该参数为绑定到集合以及兼容ICD文件不匹配读取参数异常]
                        m_FBS_DiscParamFromDev.DCVolHighLimit = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.DCVolLimit.mag.f", Fc.MX);
                    }
                    if(m_FBS_DiscParamFromDev.ChargeCurrSet <= 0) {
                        //集合点位中无充电电流[兼容早期设备该参数为绑定到集合以及兼容ICD文件不匹配读取参数异常]
                        m_FBS_DiscParamFromDev.ChargeCurrSet = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.ChargeCurr.mag.f", Fc.MX);
                    }
                    ds_pm = null;
                }else {
                    m_FBS_DiscParamFromDev.DisCurr = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.TestCurr.mag.f", Fc.MX);
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java
@@ -35,8 +35,8 @@
        mysql_ds.setJdbcUrl("jdbc:mysql://" + server_ip + ":" + mSqlPort + "/db_app_sys");
        mysql_ds.setUser("root");
        mysql_ds.setPassword("lmx8688139");
        //mysql_ds.setUser("whyc");                        //天一电厂账号
        //mysql_ds.setPassword("Fg001@hdw");                //天一电厂密码
//        mysql_ds.setUser("whyc");                        //天一电厂账号
//        mysql_ds.setPassword("Fg001@hdw");                //天一电厂密码
        mysql_ds.setMaxPoolSize(conncount_max);
        mysql_ds.setMinPoolSize(2);
        mysql_ds.setAcquireIncrement(4);