Administrator
2022-06-25 116069857be673be1ccaf1f13399602a0afdfbfe
Merge branch 'master' of http://whyclj@118.89.139.230:10101/r/~whyclj/IEC61850_ForPowerSupply_ForNW.git
2个文件已修改
5 ■■■■ 已修改文件
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java
@@ -243,6 +243,8 @@
        pwrDev_rtData.m_acdcData.loader_curr = readFloatNodeData(acdcDeviceName + "/dbmGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.loader_curr);
        
        pwrDev_rtData.m_acdcData.battgroup1_curr = readFloatNodeData(acdcDeviceName + "/btgGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.battgroup1_curr);        
        //battgroup2Curr
        pwrDev_rtData.m_acdcData.battgroup2_curr = readFloatNodeData(acdcDeviceName + "/btgGGIO2.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.battgroup2_curr);
        
        pwrDev_rtData.m_acdcData.chargLimitCurr = readFloatNodeData(acdcDeviceName + "/cheGGIO1.AnIn4.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.chargLimitCurr);        
        pwrDev_rtData.m_acdcData.junChargeVol = readFloatNodeData(acdcDeviceName + "/cheGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.junChargeVol);        
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java
@@ -49,7 +49,8 @@
        AL_POWER_RT_DATA_INDEX.clear();
        
        for(int n=0;n<m_AL_Data.getItemCount();n++) {
            if(110 != (m_AL_Data.getItem(n).PowerDevDeviceId/1000000)) {
            if(115 != (m_AL_Data.getItem(n).PowerDevDeviceId/1000000)) {
                System.out.println(m_AL_Data.getItem(n).PowerDevDeviceId);
                continue;
            }