From 452e31fbe5404d2ec8eb4c5b2e02138d837c146c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 10 六月 2025 14:44:18 +0800
Subject: [PATCH] 1.Panel Data Report数据的获取,

---
 SourceCode/Bond/Servo/CStep.cpp |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CStep.cpp b/SourceCode/Bond/Servo/CStep.cpp
index 7ffc65d..d1907c7 100644
--- a/SourceCode/Bond/Servo/CStep.cpp
+++ b/SourceCode/Bond/Servo/CStep.cpp
@@ -53,11 +53,14 @@
 
 	void CStep::getAttributeVector(CAttributeVector& attrubutes)
 	{
+		unsigned int weight = 1;
 		attrubutes.clear();
 		attrubutes.addAttribute(new CAttribute("Network", 
-			std::to_string(m_station.nNetNo).c_str(), ""));
+			std::to_string(m_station.nNetNo).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Station",
-			std::to_string(m_station.nStNo).c_str(), ""));
+			std::to_string(m_station.nStNo).c_str(), "", weight++));
+		attrubutes.addAttributeVector(m_attributeVector);
+
 	}
 
 	void CStep::init()
@@ -70,6 +73,33 @@
 
 	}
 
+	void CStep::setProp(const char* pszKey, void* pValue)
+	{
+		m_mapProp[pszKey] = pValue;
+	}
+
+	void* CStep::getProp(const char* pszKey)
+	{
+		auto iter = m_mapProp.find(pszKey);
+		if (iter == m_mapProp.end()) return nullptr;
+		return iter->second;
+	}
+
+	void CStep::addAttribute(CAttribute* pAttribute)
+	{
+		// 添加attribute时,要前删除存在的同名的attribute
+		m_attributeVector.addAttribute(pAttribute, TRUE);
+	}
+
+	void CStep::addAttributeVector(CAttributeVector& attributeVector)
+	{
+		// 添加attribute时,要前删除存在的同名的attribute
+		unsigned int size = attributeVector.size();
+		for (unsigned int i = 0; i < size; i++) {
+			m_attributeVector.addAttribute(attributeVector.getAttribute(i), TRUE);
+		}
+	}
+
 	void CStep::convertString(const char* pszBuffer, int size, std::string& strOut)
 	{
 		strOut.clear();

--
Gitblit v1.9.3