1.S1F11与S1F21对换；

chenluhua1980

3 小时以前 e5fb1e316cd9e1a85abd9c8e9a81f66990a82c6b

1.S1F11与S1F21对换；

 SourceCode/Bond/Servo/HsmsPassive.cpp

@@ -1739,13 +1739,15 @@
            // [EAP_MAPPING][S1F11] Status Variable namelist request -> S1F12.
            // If customer requires swapping SV/DV mapping, this is one of the two switch points.
            // Swap target with S1F21 branch below.
            replyStatusVariableNamelistRequest(pMessage);
            // replyStatusVariableNamelistRequest(pMessage);
            replyDataVariableNamelistRequest(pMessage);
        }
        else if (nStream == 1 && pHeader->function == 21) {
            // [EAP_MAPPING][S1F21] Data Variable namelist request -> S1F22.
            // If customer requires swapping SV/DV mapping, this is one of the two switch points.
            // Swap target with S1F11 branch above.
            replyDataVariableNamelistRequest(pMessage);
            // replyDataVariableNamelistRequest(pMessage);
            replyStatusVariableNamelistRequest(pMessage);
        }
        else if (nStream == 1 && pHeader->function == 23) {
            replyCollectionEventNamelistRequest(pMessage);
@@ -2345,7 +2347,7 @@
    return 0;
}

// S1F11
// S1F21
int CHsmsPassive::replyStatusVariableNamelistRequest(IMessage* pRecv)
{
    // [EAP_MAPPING][SV_HANDLER]
@@ -2386,7 +2388,7 @@
    Unlock();

    IMessage* pMessage = NULL;
    HSMS_Create1Message(pMessage, m_nSessionId, 1, 12, pRecv->getHeader()->systemBytes);
    HSMS_Create1Message(pMessage, m_nSessionId, 1, 22, pRecv->getHeader()->systemBytes);
    ASSERT(pMessage);

    ISECS2Item* pList = pMessage->getBody(); // Body is L[n] of {SVID, SVNAME, UNITS}
@@ -2458,7 +2460,7 @@
    file.Close();
    return 0;
}
// S1F21/S1F22 - Data Variable Namelist
// S1F11/S1F12 - Data Variable Namelist
int CHsmsPassive::replyDataVariableNamelistRequest(IMessage* pRecv)
{
    // [EAP_MAPPING][DV_HANDLER]
@@ -2495,7 +2497,7 @@
    Unlock();

    IMessage* pMessage = NULL;
    HSMS_Create1Message(pMessage, m_nSessionId, 1, 22, pRecv->getHeader()->systemBytes);
    HSMS_Create1Message(pMessage, m_nSessionId, 1, 12, pRecv->getHeader()->systemBytes);
    ASSERT(pMessage);

    ISECS2Item* pList = pMessage->getBody(); // L[n] of {DVID, DVNAME, UNITS}