From ceb64b6612309fe384e096dcdc8b5a5e0dfe6cce Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 30 一月 2026 15:08:47 +0800
Subject: [PATCH] 1.增加日志,监控Efem的请求JobData事件;

---
 SourceCode/Bond/Servo/CEqJobEventStep.cpp |   37 ++++++++++---------------------------
 1 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 724f000..b8f998c 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -6,7 +6,7 @@
 namespace SERVO {
 	CEqJobEventStep::CEqJobEventStep() : CReadStep()
 	{
-		m_nJobDataBDev = 0;
+		m_nJobDataADev = 0;
 	}
 
 	CEqJobEventStep::~CEqJobEventStep()
@@ -16,33 +16,16 @@
 
 	void CEqJobEventStep::setJobDataDev(int nDev)
 	{
-		m_nJobDataBDev = nDev;
+		m_nJobDataADev = nDev;
 	}
 
 	void CEqJobEventStep::getAttributeVector(CAttributeVector& attrubutes)
 	{
-		CReadStep::getAttributeVector(attrubutes);
-
+		unsigned int weight = 31;
 		std::string strTemp;
 		attrubutes.addAttribute(new CAttribute("Dev",
-			("W" + CToolUnits::toHexString(m_nJobDataBDev, strTemp)).c_str(), ""));
-		attrubutes.addAttribute(new CAttribute("PortNo",
-			std::to_string(m_jobDataA.getPortNo()).c_str(), ""));
-		attrubutes.addAttribute(new CAttribute("CarrierId",
-			m_jobDataA.getCarrierId().c_str(), ""));
-		attrubutes.addAttribute(new CAttribute("PruductId",
-			m_jobDataA.getPruductId().c_str(), ""));
-		attrubutes.addAttribute(new CAttribute("CarrierState",
-			m_jobDataA.getCarrierStateDescription(strTemp).c_str(), ""));
-		attrubutes.addAttribute(new CAttribute("SlotMapping",
-			std::to_string(m_jobDataA.getSlotMapping()).c_str(), ""));
-		attrubutes.addAttribute(new CAttribute("SlotSelectedFlag",
-			std::to_string(m_jobDataA.getSlotSelectedFlag()).c_str(), ""));
-		std::vector<std::string>& ids = m_jobDataA.getGlassIds();
-		for (int i = 0; i < ids.size(); i++) {
-			attrubutes.addAttribute(new CAttribute((std::string("GlassId") + std::to_string(i+1)).c_str(),
-				ids[i].c_str(), ""));
-		}
+			("W" + CToolUnits::toHexString(m_nJobDataADev, strTemp)).c_str(), "", weight++));
+		m_jobDataS.getAttributeVector(attrubutes, weight);
 	}
 
 	int CEqJobEventStep::onReadData()
@@ -51,13 +34,13 @@
 
 
 		char szBuffer[1024];
-		int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nJobDataBDev,
+		int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nJobDataADev,
 			640, szBuffer);
 		if (0 != nRet) {
 			return -1;
 		}
 
-		m_jobDataA.unserialize(szBuffer, 640);
+		m_jobDataS.unserialize(szBuffer, 640);
 		LOGI("<CEqJobEventStep-%s>Read JobDataA\n", m_strName.c_str());
 
 		return 0;
@@ -74,13 +57,13 @@
 	int CEqJobEventStep::onTimeout()
 	{
 		CReadStep::onTimeout();
-		LOGI("<CEqJobEventStep> onTimeout.");
+		LOGE("<CEqJobEventStep> onTimeout.");
 
 		return 0;
 	}
 
-	CJobDataA* CEqJobEventStep::getJobDataA()
+	CJobDataS* CEqJobEventStep::getJobDataS()
 	{
-		return &m_jobDataA;
+		return &m_jobDataS;
 	}
 }

--
Gitblit v1.9.3