From 904fd149e60f984f4459ff295cd6ae6505fa3f21 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期三, 12 二月 2025 17:48:14 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/HsmsPassive.h | 40 ++++++++++++-
SourceCode/Bond/Servo/HsmsPassive.cpp | 83 ++++++++++++++++++++++++++-
2 files changed, 117 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 39f7e68..f714e51 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -97,6 +97,34 @@
}
+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;
+ }
+ }
+
+}
+
void CHsmsPassive::OnTimer(UINT nTimerid)
{
// 所有已发送的Action自加1
@@ -210,6 +238,9 @@
}
else if (nStream == 2 && pHeader->function == 31) {
replyDatetime(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 35) {
+ replyLinkEventReport(pMessage);
}
else if (nStream == 2 && pHeader->function == 37) {
replyEanbleDisableEventReport(pMessage);
@@ -512,7 +543,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 +594,52 @@
}
replyAck(2, 32, pRecv->getHeader()->systemBytes, BYTE(0), "TIACK");
+ return 0;
+}
+
+// S2F35
+int CHsmsPassive::replyLinkEventReport(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ BOOL bCheckData = FALSE;
+ 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 +711,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);
}
}
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 116ce6e..670befa 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -4,6 +4,13 @@
#include "HsmsAction.h"
#include <functional>
#include <vector>
+#include <map>
+
+
+#define EQCONSTANT_VALUE_MAX 64
+#define COMMAND_NAME_MAX 64
+#define COMMAND_VALUE_MAX 64
+#define REPORT_NAME_MAX 64
#define ER_NOERROR 0
@@ -18,7 +25,7 @@
typedef struct _EQConstant
{
unsigned int id;
- char szValue[256];
+ char szValue[EQCONSTANT_VALUE_MAX];
} EQConstant;
/*
@@ -26,9 +33,19 @@
*/
typedef struct _CommandParameter
{
- char szName[256];
- char szValue[256];
+ char szName[COMMAND_NAME_MAX];
+ char szValue[COMMAND_VALUE_MAX];
} CommandParameter;
+
+/*
+ * Report 数据结构
+ */
+typedef struct _REPORT
+{
+ char szName[REPORT_NAME_MAX];
+ unsigned int id;
+} REPORT;
+
typedef std::function<void(void* pFrom)> SECSEQOFFLINE;
typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
@@ -57,6 +74,15 @@
/* 设置软件版本号 最大长度 20 bytes */
void setSoftRev(const char* pszRev);
+ /* 添加Report */
+ void addReport(unsigned int id, const char* pszName);
+
+ // 连接Report
+ void linkEventReport(unsigned int RPTID, unsigned int CEID);
+
+ // 取消连接report
+ void unlinkEventReport(unsigned int CEID);
+
void setListener(SECSListener listener);
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
@@ -80,6 +106,7 @@
int replyEquipmentConstantRequest(IMessage* pRecv);
int replyEquipmentConstantSend(IMessage* pRecv);
int replyDatetime(IMessage* pRecv);
+ int replyLinkEventReport(IMessage* pRecv);
int replyEanbleDisableEventReport(IMessage* pRecv);
int replyCommand(IMessage* pRecv);
int replyEanbleDisableAlarmReport(IMessage* pRecv);
@@ -110,5 +137,12 @@
HANDLE m_hCimWorkEvent;
HANDLE m_hCimWorkThreadHandle;
unsigned m_nCimWorkThrdaddr;
+
+private:
+ // RPTID to CEID
+ std::map<unsigned int, unsigned int> m_mapReportIdToCEID;
+
+ // RPTID to Report
+ std::map<unsigned int, REPORT> m_mapReport;
};
--
Gitblit v1.9.3