DELL
2024-10-12 1078b4b30c51f103952b44279c9a97972beacca6
新增天一电厂数据库配置
4个文件已修改
95 ■■■■ 已修改文件
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/MysqlConnPool.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/MysqlConnPool.class
Binary files differ
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -187,51 +187,58 @@
                }
            }
            logger.debug("Successfully connected to ied server " + FBSDeviceIp + " " + FBSDeviceName + "\t CPSS:"+ZJDYCPSS);
            logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_Client retrieving model...");
            /*
            /**
             * 添加异常捕获,概率异常报错线程会异常结束
             */
            try {
                m_ServerModel = m_Association.retrieveModel();
            } catch (ServiceError | IOException e) {
                logger.error(e.toString(), e);
                continue;
                logger.debug("Successfully connected to ied server " + FBSDeviceIp + " " + FBSDeviceName + "\t CPSS:"+ZJDYCPSS);
                logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_Client retrieving model...");
                /*
                try {
                    m_ServerModel = m_Association.retrieveModel();
                } catch (ServiceError | IOException e) {
                    logger.error(e.toString(), e);
                    continue;
                }
                */
                /*
                System.out.println("reading model from file...");
                try {
                    m_ServerModel = m_Association.getModelFromSclFile("zjdy_bts_1_2G.icd");
                    //serverModel = association.getModelFromSclFile(modelFileParam.getValue());
                } catch (SclParseException e1) {
                    System.out.println("Error parsing SCL file: " + e1.getMessage());
                    return;
                }
                System.out.println("successfully read model");
                */
                /************************* read m_DevVersion first *************************/
                m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC);
                /***************************************************************************/
                logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion);
                m_FBS_VCData.m_SysState.resetErrCommCount();
                FBS9100_Task_Thread_SQL.inseartOrUpdateFBS9100SFODParam(m_ConnPool, m_StatAndParam.clParam, m_StatAndParam);
                FBS9100_Task_Thread_SQL.queryBTS61850OffLineyhPlanOnRam(m_ConnPool, m_StatAndParam);
                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.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC);                //唯一序列号
                BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam);        //更新当前参数
                //读取主从机功能使能
                m_FBS_VCData.m_SysState.MasterSlave_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn29.mag.f",Fc.MX));
                //读取干接点功能使能
                m_FBS_VCData.m_SysState.DryContact_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn30.mag.f",Fc.MX));
            } catch (Exception e) {
                logger.error(e.toString(),e);
            }
            */
            /*
            System.out.println("reading model from file...");
            try {
                m_ServerModel = m_Association.getModelFromSclFile("zjdy_bts_1_2G.icd");
                //serverModel = association.getModelFromSclFile(modelFileParam.getValue());
            } catch (SclParseException e1) {
                System.out.println("Error parsing SCL file: " + e1.getMessage());
                return;
            }
            System.out.println("successfully read model");
            */
            /************************* read m_DevVersion first *************************/
            m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC);
            /***************************************************************************/
            logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion);
            m_FBS_VCData.m_SysState.resetErrCommCount();
            FBS9100_Task_Thread_SQL.inseartOrUpdateFBS9100SFODParam(m_ConnPool, m_StatAndParam.clParam, m_StatAndParam);
            FBS9100_Task_Thread_SQL.queryBTS61850OffLineyhPlanOnRam(m_ConnPool, m_StatAndParam);
            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.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC);                //唯一序列号
            BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam);        //更新当前参数
            //读取主从机功能使能
            m_FBS_VCData.m_SysState.MasterSlave_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn29.mag.f",Fc.MX));
            //读取干接点功能使能
            m_FBS_VCData.m_SysState.DryContact_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn30.mag.f",Fc.MX));
            
            while (true == Get_AppAliveState()) {
                try {
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/MysqlConnPool.java
@@ -35,6 +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.setMaxPoolSize(conncount_max);
        mysql_ds.setMinPoolSize(2);
        mysql_ds.setAcquireIncrement(4);