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

DELL

2025-06-15 a36ef7b97944ba92fee19bee2db4b3c13e43adf5

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

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error-20250116-1.log.gz

Binary files differ

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/error.log

Diff too large

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info-20250116-1.log.gz

Binary files differ

 IEC61850_ForPowerSupply_ForNW/IEC61850_ForPowerSupply_logs/info.log

Diff too large

 IEC61850_ForPowerSupply_ForNW/log4j2_batt_comm_power_x64.xml

@@ -60,7 +60,7 @@
    </Appenders>



    <Loggers>

        <Root level="info">

        <Root level="trace">

            <AppenderRef ref="Console" />

            <appenderRef ref="INFO" />

            <appenderRef ref="ERROR" />


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

@@ -226,6 +226,7 @@
        rand_index++;

        */

        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;


 IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt

@@ -31,6 +31,9 @@
        

        高频开关柜

        

V1.112 2025-01-15 lijun

    1.修复紫晶第二套DCDC电源读取的是第一套点位bug

		
V1.111  2025-01-15 lijun

    1.新增共济DCDC电源数据解析    [界面展示为直流配电柜和高频开关柜]

        第一套电源协议名称：      TEMPLATEDDPS


 IEC61850_ForPowerSupply_ForNW/src/org/openmuc/jositransport/TConnection.java

@@ -591,7 +591,12 @@
        int li = 0;
        int tPduCode;

        socket.setSoTimeout(messageTimeout);
//        socket.setSoTimeout(messageTimeout);
        
        //System.err.println("超时时间："+messageTimeout);
        //修复Linux环境下不超时，通信故障延迟严重问题
        //socket.setSoTimeout(messageTimeout);
        socket.setSoTimeout(30000);
        byte version;
        try {
            version = is.readByte();