兼容在icd文件丢失的情况下仍能继续连接设备，读取加载设备端icd文件信息

DELL

2024-04-11 d4ce08da13fe325fcd304e7618ba6169fcd05a9c

兼容在icd文件丢失的情况下仍能继续连接设备，读取加载设备端icd文件信息

 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/config.xml

@@ -2,7 +2,7 @@

<root>
  <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
  <mysql_server_ip>192.168.10.82</mysql_server_ip>
  <mysql_server_ip>192.168.10.79</mysql_server_ip>
  <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
  <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
  <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->

 iec61850_forFoShanAES_Model/config.xml

@@ -2,7 +2,7 @@

<root>
  <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
  <mysql_server_ip>192.168.10.82</mysql_server_ip>
  <mysql_server_ip>192.168.10.79</mysql_server_ip>
  <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
  <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
  <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->

 iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java

@@ -60,7 +60,7 @@
        

        if(null == m_ServerModel) {

            logger.error("error, the iec61850 server model is null....");

            return;

            //return;

        }

        

        AL_BTS_IEC61850_DeviceIp.clear();


 iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java

@@ -155,7 +155,7 @@
                m_ClientSap = new ClientSap();

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

                

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

                if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName()) || null == m_ServerModel) {

                    //与预加载的模型文件不一致时

                    m_ServerModel = m_Association.retrieveModel();

                }