DELL
2024-01-10 f967002df0bd09eee498de360ea62bd8a63e4b6f
南瑞版本中间协转调试
6个文件已修改
49 ■■■■■ 已修改文件
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
@@ -53,7 +53,7 @@
    </Appenders>
    <Loggers>
        <Root level="info">
        <Root level="trace">
            <AppenderRef ref="Console" />
            <appenderRef ref="INFO" />
            <appenderRef ref="ERROR" />
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
@@ -53,7 +53,7 @@
    </Appenders>
    <Loggers>
        <Root level="info">
        <Root level="trace">
            <AppenderRef ref="Console" />
            <appenderRef ref="INFO" />
            <appenderRef ref="ERROR" />
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java
@@ -35,8 +35,9 @@
        logger.info("reading model from file...");
        try {
            //加载模型文件
            List<ServerSap> serverSaps = ServerSap.getSapsFromSclFile(" TEMPLATE.iid ");
            List<ServerSap> serverSaps = ServerSap.getSapsFromSclFile("TEMPLATE.iid");
            m_ServerModel = serverSaps.get(0).serverModel;
            System.out.println("SSSS"+m_ServerModel.getBaseDevName());
        } catch (Exception e1) {
            logger.error("Error parsing SCL file:TEMPLATE.iid " + e1.getMessage());
            return;
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -152,11 +152,14 @@
                m_ClientSap = new ClientSap();
                m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 102, null, null);
                
                if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {
                    //与预加载的模型文件不一致时
                    m_ServerModel = m_Association.retrieveModel();
                }
                //System.err.println("Dev_BASE:"+m_ServerModel.getBaseDevName());;
//                if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {
//                    System.err.println("SSSSSSSSSSS");
//                    //与预加载的模型文件不一致时
//                    m_ServerModel = m_Association.retrieveModel();
//                }
                System.err.println("Dev_BASE:"+m_ServerModel.getBaseDevName());;
                
               
            } catch (Exception e) {
@@ -806,10 +809,10 @@
                if(0 == (numberDevState%3)) {
                    System.out.println();
                    //---------------------------------Log Level.TRACE-------------------------------------//
                    logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsMeasure)", FBSDeviceName);
                    logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsBtseYc)", FBSDeviceName);
                    //-------------------------------------------------------------------------------------//
                    //-------------------------------------------------------------------------------------//
                    DataSet ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsMeasure").copy();
                    ///-------------------------------------------------------------------------------------//
                    DataSet ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc").copy();
                    int size_cnt = ds.getMembers().size();
                    m_Association.getDataSetValues(ds);
                    int m = 0;
@@ -997,10 +1000,10 @@
                //System.err.println(m_FBS_VCData.m_SysState.ErrCommCount);
                if(1 == (numberDevState%3)) {
                    //---------------------------------Log Level.TRACE-------------------------------------//
                    logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsDevAlarm)", FBSDeviceName);
                    logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsBtseYx)", FBSDeviceName);
                    //-------------------------------------------------------------------------------------//
                    String c[] = null;
                    DataSet ds_stat = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsDevAlarm");
                    DataSet ds_stat = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYx");
                    int size_cnt_stat = ds_stat.getMembers().size();
                    c = new String[size_cnt_stat];
                    String[] split = null;
@@ -1242,28 +1245,28 @@
                } else if (m_FBS_VCData.m_SysState.WorkState == 5) {
                    count = 8;
                }
                comm_res = checkMakeSuccess(count);
                //comm_res = checkMakeSuccess(count);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Stop, res:%b", FBSDeviceIp, comm_res);
                //-------------------------------------------------------------------------------------//
            } else if (FBS9100_ComBase.CMD_StartDischarge == cmd) {
                if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO1")) return false;
                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO1.Oper", true);
                comm_res = checkMakeSuccess(0);
                //comm_res = checkMakeSuccess(0);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s DevId:%d operate FBS9100_ComBase.CMD_StartDischarge, res:%b", FBSDeviceIp,m_FBSDevId, comm_res);
                //-------------------------------------------------------------------------------------//
            } else if (FBS9100_ComBase.CMD_StartResDischarge == cmd) {
                if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO2")) return false;
                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO2.Oper", true);
                comm_res = checkMakeSuccess(2);
                //comm_res = checkMakeSuccess(2);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StartResDischarge, res:%b", FBSDeviceIp, comm_res);
                //-------------------------------------------------------------------------------------//
            } else if (FBS9100_ComBase.CMD_StartKIDI == cmd) {
                if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO3")) return false;
                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO3.Oper", true);
                comm_res = checkMakeSuccess(1);
                //comm_res = checkMakeSuccess(1);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StartKIDI, res:%b", FBSDeviceIp, comm_res);
                //-------------------------------------------------------------------------------------//
@@ -1523,7 +1526,7 @@
                    comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO9.Oper", true); // 模块41除硫
                }break;
                }
                comm_res = checkMakeSuccess(3);
                //comm_res = checkMakeSuccess(3);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Start_FODCL_test, "
                                + "battgroup_num:%d, res:%b", FBSDeviceIp, m_StatAndParam.clParam.GroupNum, comm_res);
@@ -1556,7 +1559,7 @@
                        comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO13.Oper", false);
                    }break;
                }
                comm_res = checkMakeSuccess(9);
                //comm_res = checkMakeSuccess(9);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Stop_FOD_test, "
                                + "battgroup_num:%d, res:%b", FBSDeviceIp, m_StatAndParam.clParam.GroupNum, comm_res);
@@ -1580,7 +1583,7 @@
                    comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO13.Oper", true);
                }break;
                }
                comm_res = checkMakeSuccess(4);
                //comm_res = checkMakeSuccess(4);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_Start_FODYH_test, "
                                + "battgroup_num:%d, res:%b", FBSDeviceIp, m_StatAndParam.clParam.GroupNum, comm_res);
@@ -1638,14 +1641,14 @@
            } else if (FBS9100_ComBase.CMD_StartOffLineYH == cmd) {
                if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO14")) return false;
                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO14.Oper", true);
                comm_res = checkMakeSuccess(5);
                //comm_res = checkMakeSuccess(5);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StartOffLineYH, res:%b", FBSDeviceIp, comm_res);
                //------------------------------------------------------------------------------------//
            } else if (FBS9100_ComBase.CMD_StopOffLineYH == cmd) {
                if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO14")) return false;
                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO14.Oper", false);
                comm_res = checkMakeSuccess(10);
                //comm_res = checkMakeSuccess(10);
                //---------------------------------Log Level.WARN-------------------------------------//
                logger.printf(Level.WARN, "DevIp:%s operate FBS9100_ComBase.CMD_StopOffLineYH, res:%b", FBSDeviceIp, comm_res);
                //------------------------------------------------------------------------------------//
@@ -1767,6 +1770,7 @@
        }
        int okcount = 0;
        for (int i = 0; i < 85; i++) {
            //南瑞中间协转无当前点位注释调用
            //System.out.println("验签校验返回signOpRes:" + readInt64NodeData(FBSDeviceName + "/btgGGIO1.signOpRes.mag.i", Fc.MX));
            int value = (int) (readInt64NodeData(FBSDeviceName + "/ncdGGIO1.AnIn119.mag.i", Fc.MX));
            if ((value & MyUtil.power(2, count)) == MyUtil.power(2, count)) {