From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 195 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 192 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 39f7e68..094f4fd 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -97,6 +97,63 @@
}
+void CHsmsPassive::addReport(unsigned int id, const char* pszName)
+{
+ Lock();
+ REPORT report;
+ report.id = id;
+ strcpy_s(report.szName, REPORT_NAME_MAX, pszName);
+ m_mapReport[id] = report;
+ Unlock();
+}
+
+void CHsmsPassive::linkEventReport(unsigned int RPTID, unsigned int CEID)
+{
+ m_mapReportIdToCEID[RPTID] = CEID;
+}
+
+void CHsmsPassive::unlinkEventReport(unsigned int CEID)
+{
+ for (auto it = m_mapReportIdToCEID.begin(); it != m_mapReportIdToCEID.end(); ) {
+ if (it->second == CEID) {
+ m_mapReportIdToCEID.erase(it++); // 更新迭代器
+ }
+ else {
+ ++it;
+ }
+ }
+
+}
+
+unsigned int CHsmsPassive::getCEID(int RPTID)
+{
+ auto iter = m_mapReportIdToCEID.find(RPTID);
+ if (iter != m_mapReportIdToCEID.end()) return iter->second;
+ return 0;
+}
+
+void CHsmsPassive::deleteReport(unsigned int RPTID)
+{
+ for (auto it = m_mapValueIdToPRTID.begin(); it != m_mapValueIdToPRTID.end(); ) {
+ if (it->second == RPTID) {
+ m_mapValueIdToPRTID.erase(it++); // 更新迭代器
+ }
+ else {
+ ++it;
+ }
+ }
+}
+
+void CHsmsPassive::deleteAllReport()
+{
+ m_mapValueIdToPRTID.clear();
+}
+
+void CHsmsPassive::defineReport(unsigned int VID, unsigned int RPTID)
+{
+ m_mapValueIdToPRTID[VID] = RPTID;
+}
+
void CHsmsPassive::OnTimer(UINT nTimerid)
{
// 所有已发送的Action自加1
@@ -210,6 +267,12 @@
}
else if (nStream == 2 && pHeader->function == 31) {
replyDatetime(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 33) {
+ replyDefineReport(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 35) {
+ replyLinkEventReport(pMessage);
}
else if (nStream == 2 && pHeader->function == 37) {
replyEanbleDisableEventReport(pMessage);
@@ -512,7 +575,7 @@
if (pItemEqc->getSubItemU2(0, eqcid)
&& pItemEqc->getSubItemString(1, pszValue)) {
eqc.id = eqcid;
- strcpy_s(eqc.szValue, 256, pszValue);
+ strcpy_s(eqc.szValue, EQCONSTANT_VALUE_MAX, pszValue);
eqcs.push_back(eqc);
}
}
@@ -563,6 +626,100 @@
}
replyAck(2, 32, pRecv->getHeader()->systemBytes, BYTE(0), "TIACK");
+ return 0;
+}
+
+// S2F33
+int CHsmsPassive::replyDefineReport(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ ISECS2Item* pBody = pRecv->getBody();
+ ISECS2Item* defineItem, *rptListItem, * vidListItem;
+ unsigned int dataId, rptid, vid;
+ if (!pBody->getSubItemU4(0, dataId)) goto MYREPLY;
+ rptListItem = pBody->getSubItem(1);
+ if (rptListItem == nullptr) goto MYREPLY;
+ if (rptListItem->getSubItemSize() == 0) {
+ deleteAllReport();
+ goto MYREPLY;
+ }
+ for (int i = 0; i < rptListItem->getSubItemSize(); i++) {
+ defineItem = rptListItem->getSubItem(i);
+ if (defineItem == nullptr) continue;
+ vidListItem = defineItem->getSubItem(1);
+ if (defineItem->getSubItemU4(0, rptid)
+ && vidListItem != nullptr) {
+ int vidCount = vidListItem->getSubItemSize();
+ if (vidCount == 0) {
+ deleteReport(rptid);
+ }
+ else {
+ for (int k = 0; k < vidCount; k++) {
+ if (vidListItem->getSubItemU4(k, vid)) {
+ defineReport(vid, rptid);
+ }
+ }
+ }
+ }
+ }
+
+
+MYREPLY:
+ // 检验结果是否正确
+ for (auto item : m_mapValueIdToPRTID) {
+ LOGE("=== vid:%d, prtid:%d", item.first, item.second);
+ }
+
+ replyAck(2, 34, pRecv->getHeader()->systemBytes, BYTE(0), "DRACK");
+ return 0;
+}
+
+// S2F35
+int CHsmsPassive::replyLinkEventReport(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ ISECS2Item* pBody = pRecv->getBody();
+ ISECS2Item* linkItem, *ceidListItem, *rptListItem;
+ unsigned int dataId, ceid, rptid;
+ if (!pBody->getSubItemU4(0, dataId)) goto MYREPLY;
+ ceidListItem = pBody->getSubItem(1);
+ if (ceidListItem == nullptr) goto MYREPLY;
+ for (int i = 0; i < ceidListItem->getSubItemSize(); i++) {
+ linkItem = ceidListItem->getSubItem(i);
+ if (linkItem == nullptr) continue;
+ rptListItem = linkItem->getSubItem(1);
+ if (linkItem->getSubItemU4(0, ceid)
+ && rptListItem != nullptr) {
+ int prtCount = rptListItem->getSubItemSize();
+ if (prtCount == 0) {
+ unlinkEventReport(ceid);
+ }
+ else {
+ for (int k = 0; k < prtCount; k++) {
+ if (rptListItem->getSubItemU4(k, rptid)) {
+ linkEventReport(rptid, ceid);
+ }
+ }
+ }
+ }
+ }
+
+
+ // 检验结果是否正确
+ for (auto item : m_mapReportIdToCEID) {
+ LOGE("=== prtid:%d, ceid:%d", item.first, item.second);
+ }
+
+MYREPLY:
+ replyAck(2, 36, pRecv->getHeader()->systemBytes, BYTE(0), "LRACK");
return 0;
}
@@ -634,8 +791,8 @@
&& pItemParam->getSubItemString(0, pszParamName)
&& pItemParam->getSubItemString(1, pszParamValue)) {
CommandParameter cp;
- strcpy_s(cp.szName, 256, pszParamName);
- strcpy_s(cp.szValue, 256, pszParamValue);
+ strcpy_s(cp.szName, COMMAND_NAME_MAX, pszParamName);
+ strcpy_s(cp.szValue, COMMAND_VALUE_MAX, pszParamValue);
params.push_back(cp);
}
}
@@ -797,4 +954,36 @@
return ER_NOERROR;
}
+// S6F11
+int CHsmsPassive::requestEventReportSend(unsigned int DATAID, unsigned int RPTID, const std::vector<std::string>& values)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+ Lock();
+ CHsmsAction* pAction = new CHsmsAction(ACTION_EVENT_REPORT, TRUE, m_nActionTimeout);
+ m_listAction.push_back(pAction);
+ IMessage* pMessage = NULL;
+ HSMS_Create1Message(pMessage, m_nSessionId, 6 | REPLY, 11, ++m_nSystemByte);
+ ASSERT(pMessage);
+ ISECS2Item* pItem = pMessage->getBody();
+ pItem->addU4Item(DATAID, "DATAID");
+ pItem->addU4Item(getCEID(RPTID), "CEID");
+ ISECS2Item* pItemList1 = pItem->addItem();
+ ISECS2Item* pItemList2 = pItemList1->addItem();
+ pItemList2->addU4Item(RPTID, "RPTID");
+ ISECS2Item* pItemList3 = pItemList2->addItem();
+ for (auto item : values) {
+ pItemList3->addItem(item.c_str(), "V");
+ }
+ pAction->setSendMessage(pMessage);
+
+ SetEvent(m_hCimWorkEvent);
+ Unlock();
+
+ return ER_NOERROR;
+}
+
+
--
Gitblit v1.9.3