V1.112 2025-01-15 lijun 1.修复紫晶第二套DCDC电源读取的是第一套点位bug

DELL

2025-06-15 a36ef7b97944ba92fee19bee2db4b3c13e43adf5

 IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java

@@ -225,7 +225,8 @@
      bool_rand_data = (int_rand_data%2==0)?true:false;

      rand_index++;

      */

      if(pwrDev_rtData.PowerDevProtocolName.contains("DDPS")) {	
      if(pwrDev_rtData.PowerDevProtocolName.contains("DDPS")) {

         //DDPS电源

         if(devIndex%3 == 0) {

            if(pwrDev_rtData.PowerDevProtocolName.contains("G10")) {

               //云鑫为DCDC电源

@@ -765,9 +766,9 @@
         DataSet ds = null;

         //************ 遥测量 **************

         //---------------------------------Log Level.TRACE-------------------------------------//

         logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsMeasure1)", dcdcDeviceName);

         logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsMeasure1)", dcdcDeviceName + pwrDev_rtData.PowerDevProtocolIndex);

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

         ds = m_ServerModel.getDataSet(dcdcDeviceName + "/LLN0.dsMeasure1");

         ds = m_ServerModel.getDataSet(dcdcDeviceName + pwrDev_rtData.PowerDevProtocolIndex + "/LLN0.dsMeasure1");

         if(null == ds) {

            setErrCommCountInc(0);

            return;

@@ -863,9 +864,9 @@
         DataSet ds = null;

         //************ 遥信量 **************

         //---------------------------------Log Level.TRACE-------------------------------------//

         logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsState1)", dcdcDeviceName);

         logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsState1)", dcdcDeviceName + pwrDev_rtData.PowerDevProtocolIndex);

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

         ds = m_ServerModel.getDataSet(dcdcDeviceName + "/LLN0.dsState1");

         ds = m_ServerModel.getDataSet(dcdcDeviceName + pwrDev_rtData.PowerDevProtocolIndex + "/LLN0.dsState1");

         if(null == ds) {

            setErrCommCountInc(0);

            return;

@@ -1262,9 +1263,9 @@
         DataSet ds = null;

         //************ 告警量 **************

         //---------------------------------Log Level.TRACE-------------------------------------//

         logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsAlm1)", dcdcDeviceName);

         logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsAlm1)", dcdcDeviceName + pwrDev_rtData.PowerDevProtocolIndex);

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

         ds = m_ServerModel.getDataSet(dcdcDeviceName + "/LLN0.dsAlm1");

         ds = m_ServerModel.getDataSet(dcdcDeviceName + pwrDev_rtData.PowerDevProtocolIndex + "/LLN0.dsAlm1");

         if(null == ds) {

            setErrCommCountInc(0);

            return;