From 4d9d8d22e3666076988c30afb4e7c6fe365c19aa Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 06 一月 2026 18:53:04 +0800
Subject: [PATCH] 1.修复一个回复错误的问题；
---
SourceCode/Bond/Servo/HsmsPassive.h | 205 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 169 insertions(+), 36 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 38ba909..995aa66 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -1,10 +1,14 @@
-#pragma once
+锘�#pragma once
#include <string>
#include <list>
#include "HsmsAction.h"
#include <functional>
#include <vector>
#include <map>
+#include <set>
+#include "CCollectionEvent.h"
+#include "ProcessJob.h"
+#include "CControlJob.h"
#define EQCONSTANT_VALUE_MAX 64
@@ -14,14 +18,28 @@
#define VALUE_NAME_MAX 64
-#define ER_NOERROR 0
-#define ER_NOTSELECT -1
-#define ER_BUSY -2
-#define ER_PARAM_ERROR -3
+#define ER_NOERROR 0
+#define ER_NOTSELECT -1
+#define ER_BUSY -2
+#define ER_PARAM_ERROR -3
+#define ER_NO_EVENT -4
+#define ER_UNLINK_EVENT_REPORT -5
+#define ER_NO_PPID_LIST -6
+#define ER_NOT_SUPPORTED -7
+
+/* CAACK */
+
+#define CAACK_0 0 /* ok */
+#define CAACK_1 1 /* invalid command */
+#define CAACK_2 2 /* cannot perform now */
+#define CAACK_3 3 /* invalid data or argument */
+#define CAACK_4 4 /* initiated for asynchronous completion */
+#define CAACK_5 5 /* rejected - invalid state */
+#define CAACK_6 6 /* command performed with errors */
/*
- * 常量数据结构
+ * 甯搁噺鏁版嵁缁撴瀯
*/
typedef struct _EQConstant
{
@@ -30,7 +48,7 @@
} EQConstant;
/*
- * Command 数据结构
+ * Command 鏁版嵁缁撴瀯
*/
typedef struct _CommandParameter
{
@@ -39,7 +57,7 @@
} CommandParameter;
/*
- * Report 数据结构
+ * Report 鏁版嵁缁撴瀯
*/
typedef struct _REPORT
{
@@ -48,7 +66,7 @@
} REPORT;
/*
- * Value 数据结构
+ * Value 鏁版嵁缁撴瀯
*/
typedef struct _VALUE
{
@@ -61,6 +79,17 @@
typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
typedef std::function<void(void* pFrom, const char*, std::vector<CommandParameter>&)> SECSCommand;
typedef std::function<void(void* pFrom, SYSTEMTIME& time)> DATETIMESYNC;
+typedef std::function<void(void* pFrom, bool bEnable, std::vector<unsigned int>& ids)> EDEVENTREPORT;
+typedef std::function<void(void* pFrom, bool bEnable, unsigned int id)> EDALARMREPORT;
+typedef std::function<std::vector<std::string> (void* pFrom)> QUERYPPIDLIST;
+typedef std::function<unsigned int (void* pFrom,
+ unsigned int DATAID,
+ const char* pszCarrierAction,
+ const char* pszCarrierId,
+ unsigned char PTN,
+ std::string& strErrorTxt)> CARRIERACTION;
+typedef std::function<int(void* pFrom, std::vector<SERVO::CProcessJob*>& pjs)> PRJOBMULTICREATE;
+typedef std::function<int(void* pFrom, SERVO::CControlJob& controlJob)> CONTROLJOBCREATE;
typedef struct _SECSListener
{
SECSEQOFFLINE onEQOffLine;
@@ -69,6 +98,12 @@
SECSEQCONSTANTREQUEST onEQConstantSend;
SECSCommand onCommand;
DATETIMESYNC onDatetimeSync;
+ EDEVENTREPORT onEnableDisableEventReport;
+ EDALARMREPORT onEnableDisableAlarmReport;
+ QUERYPPIDLIST onQueryPPIDList;
+ CARRIERACTION onCarrierAction;
+ PRJOBMULTICREATE onPRJobMultiCreate;
+ CONTROLJOBCREATE onControlJobCreate;
} SECSListener;
@@ -80,51 +115,121 @@
~CHsmsPassive();
public:
- /* 设置机器型号 最大长度 20 bytes */
+ /* 璁剧疆鏈哄櫒鍨嬪彿 鏈�澶ч暱搴� 20 bytes */
void setEquipmentModelType(const char* pszMode);
- /* 设置软件版本号 最大长度 20 bytes */
+ /* 璁剧疆杞欢鐗堟湰鍙� 鏈�澶ч暱搴� 20 bytes */
void setSoftRev(const char* pszRev);
- /* 添加Report */
- void addReport(unsigned int id, const char* pszName);
+ /* 娣诲姞鍙橀噺鍊煎埌ISECS2Item */
+ void addVariableValueToItem(ISECS2Item* pParent, SERVO::CVariable* pVariable);
- // 连接Report
- void linkEventReport(unsigned int RPTID, unsigned int CEID);
+ // 杩炴帴Report
+ void linkEventReport(unsigned int CEID, unsigned int RPTID);
- // 取消连接report
+ // 鍙栨秷杩炴帴report
void unlinkEventReport(unsigned int CEID);
- unsigned int getCEID(int RPTID);
-
// define Report
- void defineReport(unsigned int VID, unsigned int RPTID);
+ SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);
- // 取消 define report
- void deleteReport(unsigned int RPTID);
+ // 鍙栨秷 define report
+ bool removeReport(int rptid);
+ int deleteReport(int rptid);
+ int addReport(int rptid, const std::vector<unsigned int>& vids);
+ int updateReport(int rptid, const std::vector<unsigned int>& vids);
+ void clearAllReport(BOOL bSave = FALSE);
- // 取消/删除所有 define report
- void deleteAllReport();
+ // 浠庢枃浠朵腑鍔犺浇CVariable鍒楄〃
+ int loadVarialbles(const char* pszFilepath);
+
+ // 鍙栧緱CVariable鍒楄〃
+ std::vector<SERVO::CVariable*>& getVariables();
+ unsigned int getMaxVariableId() const;
+
+ // 鍙栧緱鎸囧畾Variable
+ SERVO::CVariable* getVariable(int variableId);
+ SERVO::CVariable* getVariable(const char* pszName);
+ int deleteVariable(int variableId);
+ int addVariable(const char* pszName, const char* pszFormat, const char* pszRemark, int& outId);
+ int updateVariable(int variableId, const char* pszName, const char* pszFormat, const char* pszRemark);
+
+ // 璁剧疆鍙橀噺鍊�
+ void setVariableValue(const char* pszName, __int64 value);
+ void setVariableValue(const char* pszName, const char* value);
+ void setVariableValue(const char* pszName, std::vector<SERVO::CVariable>& vars);
+
+ // 浠庢枃浠朵腑鍔犺浇CReport鍒楄〃
+ int loadReports(const char* pszFilepath);
+
+ // 鍙栧緱Report鍒楄〃
+ std::vector<SERVO::CReport*>& getReports();
+ unsigned int getMaxReportId() const;
+
+ // 浠庢枃浠朵腑鍔犺浇CCollectionEvent鍒楄〃
+ int loadCollectionEvents(const char* pszFilepath);
+
+ // 鍙栧緱CCollectionEvent鍒楄〃
+ std::vector<SERVO::CCollectionEvent*>& getCollectionEvents();
+ unsigned int getMaxCollectionEventId() const;
+
+ // 鍙栨秷/鍒犻櫎鎵�鏈塁ollectionEvent
+ void clearAllCollectionEvent();
+ int deleteCollectionEvent(unsigned short CEID);
+ int addCollectionEvent(unsigned int CEID, const char* name, const char* desc, const std::vector<unsigned int>& rptids);
+ int updateCollectionEvent(unsigned int CEID, const char* name, const char* desc, const std::vector<unsigned int>& rptids);
+
+ // 鍙栧緱CCollectionEvent
+ SERVO::CCollectionEvent* getEvent(unsigned short CEID);
+
+ // 鍙栧緱Report
+ SERVO::CReport* getReport(int rptid);
void setListener(SECSListener listener);
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
void setActionTimeout(int nSecond);
int init(CModel* pModel, const char* pszName, unsigned int port);
+ int loadCacheFromFile(const char* pszFilepath);
+ int saveCache();
int term();
+ int serialize(char* pszBuffer, int nBufferSize);
+ int unserialize(const char* pszBuffer, int nBufferSize);
public:
- /* request开头的函数为主动发送数据的函数 */
+ /* request寮�澶寸殑鍑芥暟涓轰富鍔ㄥ彂閫佹暟鎹殑鍑芥暟 */
int requestAreYouThere();
int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
- int requestEventReportSend(unsigned int DATAID, unsigned int RPTID, const std::vector<std::string>& values);
+ int requestEventReportSend(unsigned int CEID);
+ int requestEventReportSend(const char* pszEventName);
+ int requestEventReportSend_CarrierID_Readed();
+ int requestEventReportSend_CheckSlotMap();
+ int requestEventReportSend_SlotMapVerificationOK();
+ int requestEventReportSend_SlotMapVerificationNG();
+ int requestEventReportSend_Port_Unload_Ready();
+ int requestEventReportSend_Port_Load_Ready();
+ int requestEventReportSend_Port_Ready_To_Release();
+ int requestEventReportSend_Port_Blocked();
+ int requestEventReportSend_PJ_Queued();
+ int requestEventReportSend_PJ_Start();
+ int requestEventReportSend_PJ_End();
+ int requestEventReportSend_CJ_Start();
+ int requestEventReportSend_CJ_End();
+ int requestEventReportSend_Panel_Start();
+ int requestEventReportSend_Panel_End();
+ int requestEventReportSend_OCR_PanelID_Read_OK();
+ int requestEventReportSend_LoadPortNotAssoc();
+ int requestEventReportSend_ProcessDataReport();
+ int requestEventReportSend_SubEqpStart();
+ int requestEventReportSend_SubEqpEnd();
private:
void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
- /* reply开头的函数为回复函数 */
+ /* reply寮�澶寸殑鍑芥暟涓哄洖澶嶅嚱鏁� */
int replyAreYouThere(IMessage* pRecv);
int replyEstablishCommunications(IMessage* pRecv);
+ int replySelectedEquipmentStatusData(IMessage* pRecv);
int replyOnLine(IMessage* pRecv);
int replyOffLine(IMessage* pRecv);
int replyEquipmentConstantRequest(IMessage* pRecv);
@@ -134,14 +239,24 @@
int replyLinkEventReport(IMessage* pRecv);
int replyEanbleDisableEventReport(IMessage* pRecv);
int replyCommand(IMessage* pRecv);
+ int replyConfigureSpooling(IMessage* pRecv);
+ int replyCarrierAction(IMessage* pRecv);
int replyEanbleDisableAlarmReport(IMessage* pRecv);
+ int replyPurgeSpooledData(IMessage* pRecv);
int replyQueryPPIDList(IMessage* pRecv);
int replyTerminalDisplay(IMessage* pRecv);
+ int replyCreateObj(IMessage* pRecv);
+ int replyPRJobMultiCreate(IMessage* pRecv);
private:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
int onRecvMsg(IMessage* pMessage);
+ void clearAllVariabel();
+ std::vector<unsigned int> parseVidList(CString& strNums);
+ int writeVariablesToFile(const std::string& filepath);
+ int writeReportsToFile(const std::string& filepath);
+ int writeCollectionEventsToFile(const std::string& filepath);
private:
CModel* m_pModel;
@@ -155,25 +270,43 @@
CRITICAL_SECTION m_criticalSection;
std::list<CHsmsAction*> m_listAction;
std::list<CHsmsAction*> m_listActionSent;
+ std::list<CHsmsAction*> m_listActionSpooling;
private:
SECSListener m_listener;
+ std::string m_strVariableFilepath;
+ bool m_bVariableUtf8{ false };
+ bool m_bVariableUtf8Bom{ false };
+ std::string m_strReportFilepath;
+ bool m_bReportUtf8{ false };
+ bool m_bReportUtf8Bom{ false };
+ std::string m_strCollectionEventFilepath;
+ bool m_bCollectionUtf8{ false };
+ bool m_bCollectionUtf8Bom{ false };
BOOL m_bCimWorking;
HANDLE m_hCimWorkEvent;
HANDLE m_hCimWorkThreadHandle;
unsigned m_nCimWorkThrdaddr;
+ std::string m_strCacheFilepath;
+ CHsmsAction* m_pActiveAction;
private:
- // RPTID to CEID
- std::map<unsigned int, unsigned int> m_mapReportIdToCEID;
-
- // RPTID to Report
- std::map<unsigned int, REPORT> m_mapReport;
+ // CVariable vector
+ std::vector<SERVO::CVariable*> m_variabels;
- // VID to RPTID
- std::map<unsigned int, unsigned int> m_mapValueIdToPRTID;
+ // CReport vector
+ std::vector<SERVO::CReport*> m_reports;
- // VID to Report
- std::map<unsigned int, VALUE> m_mapValue;
+ // CollectionEvent vector
+ std::vector<SERVO::CCollectionEvent*> m_collectionEvents;
+
+ // Spooling blacklist: StreamId -> {FunctionId...}
+ // In this map means DO NOT spool/cache.
+ // Special case: stream 1 is not spooled regardless of config.
+ // If a stream key exists with empty set => blacklist ALL functions in that stream.
+ std::map<uint16_t, std::set<uint16_t>> m_spoolBlacklistByStream;
+ bool m_spoolingEnabled{ true };
+
+private:
+ bool shouldSpool(uint8_t streamId, uint8_t functionId) const;
};
-
--
Gitblit v1.9.3