修复泰科设备兼容性问题

DELL

3 天以前 002a26056f52f955973054b86f0cf537e0191531

修复泰科设备兼容性问题

 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

@@ -159,6 +159,7 @@
            }

            try {

                m_ClientSap = new ClientSap();

//                m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 44444, null, null);

                m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 102, null, null);

                

//                if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {

@@ -1391,8 +1392,8 @@
                    ds_tmp = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc");

                    

                    

                    if(null == ds_tmp && FBSDeviceName.contains("TEMPLATEBTSE")) {						
                        ds_tmp = m_ServerModel.getDataSet("TEMPLATEBTSE/LLN0.dsDevAlarmTwo");

                    if(null == ds_tmp && FBSDeviceName.contains("TEMPLATEBTSE")) {					
                        ds_tmp = m_ServerModel.getDataSet(ZJDYCPSS + "/LLN0.dsCPSSAin1");

                        if(null != ds_tmp) {

                            isTaiKe = true;

                            

@@ -1506,15 +1507,22 @@
                                            FBSDeviceIp, m_FBS_DiscParamFromDev);

                //-------------------------------------------------------------------------------------//

            } else if (FBS9100_ComBase.CMD_Stop == cmd) {

                if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO1")) return false;

                comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO1.Oper", false);

				
                int count = 1;

                if (m_FBS_VCData.m_SysState.WorkState == 2 || m_FBS_VCData.m_SysState.WorkState == 3) {

                    count = 6;

                    count = 6;  //停止核容测试

                    if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO1")) return false;

                    comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO1.Oper", false);

                } else if (m_FBS_VCData.m_SysState.WorkState == 1) {

                    count = 7;

                } else if (m_FBS_VCData.m_SysState.WorkState == 5) {

                    count = 8;

                    count = 8;  //停止KD测试

                    if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO3")) return false;

                    comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO3.Oper", false);

                } else if (m_FBS_VCData.m_SysState.WorkState == 4) {

                    count = 8;  //停止内阻测试

                    if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO2")) return false;

                    comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO2.Oper", false);

                }

                //comm_res = checkMakeSuccess(count);

                //---------------------------------Log Level.WARN-------------------------------------//