added:delete message support

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/DBModule_Define.h

@@ -111,6 +111,20 @@ extern "C" bool DBModule_MQData_Destory();
 *********************************************************************/
 extern "C" bool DBModule_MQData_Insert(XENGINE_DBMESSAGEQUEUE * pSt_DBInfo);
 /********************************************************************
+函数名称：DBModule_MQData_Delete
+函数功能：删除消息
+ 参数.一：pSt_DBInfo
+  In/Out：In
+  类型：数据结构指针
+  可空：N
+  意思：输入要删除的消息
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+extern "C" bool DBModule_MQData_Delete(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo);
+/********************************************************************
 函数名称：DBModule_MQData_Query
 函数功能：查询数据
  参数.一：pSt_DBInfo

XEngine_Source/MQCore_DBModule/DBModule_MQData/DBModule_MQData.cpp

@@ -145,6 +145,46 @@ bool CDBModule_MQData::DBModule_MQData_Insert(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo
     return true;
 }
 /********************************************************************
+函数名称：DBModule_MQData_Delete
+函数功能：删除消息
+ 参数.一：pSt_DBInfo
+  In/Out：In
+  类型：数据结构指针
+  可空：N
+  意思：输入要删除的消息
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+bool CDBModule_MQData::DBModule_MQData_Delete(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo)
+{
+	DBModule_IsErrorOccur = false;
+
+	if (NULL == pSt_DBInfo)
+	{
+		DBModule_IsErrorOccur = true;
+		DBModule_dwErrorCode = ERROR_XENGINE_MQCORE_DATABASE_PARAMENT;
+		return false;
+	}
+	XCHAR tszSQLStatement[10240];
+	memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
+
+	_xstprintf(tszSQLStatement, _X("DELETE FROM `%s` WHERE tszQueueName = '%s' AND nQueueSerial = '%lld'"), pSt_DBInfo->tszQueueName, pSt_DBInfo->tszQueueName, pSt_DBInfo->nQueueSerial);
+
+	if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
+	{
+		DBModule_IsErrorOccur = true;
+		DBModule_dwErrorCode = DataBase_GetLastError();
+		return false;
+	}
+	if (m_bMemoryQuery)
+	{
+		MemoryCache_DBData_DataDelete(pSt_DBInfo);
+	}
+	return true;
+}
+/********************************************************************
 函数名称：DBModule_MQData_Query
 函数功能：查询数据
  参数.一：pSt_DBInfo

XEngine_Source/MQCore_DBModule/DBModule_MQData/DBModule_MQData.h

@@ -20,6 +20,7 @@ class CDBModule_MQData
 	bool DBModule_MQData_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector, bool bMemoryQuery = true, bool bMemoryInsert = true);
 	bool DBModule_MQData_Destory();
 	bool DBModule_MQData_Insert(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo);
+	bool DBModule_MQData_Delete(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo);
 	bool DBModule_MQData_Query(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo);
 	bool DBModule_MQData_Modify(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo);
 	bool DBModule_MQData_GetSerial(LPCXSTR lpszName, __int64x* pInt_DBCount, XENGINE_DBMESSAGEQUEUE* pSt_DBStart, XENGINE_DBMESSAGEQUEUE* pSt_DBEnd);

XEngine_Source/MQCore_DBModule/MQCore_DBModule.def

@@ -6,6 +6,7 @@ EXPORTS
 	DBModule_MQData_Init
 	DBModule_MQData_Destory
 	DBModule_MQData_Insert
+	DBModule_MQData_Delete
 	DBModule_MQData_Query
 	DBModule_MQData_Modify
 	DBModule_MQData_GetSerial

XEngine_Source/MQCore_DBModule/pch.cpp

@@ -43,6 +43,10 @@ extern "C" bool DBModule_MQData_Insert(XENGINE_DBMESSAGEQUEUE * pSt_DBManage)
 {
 	return m_DBData.DBModule_MQData_Insert(pSt_DBManage);
 }
+extern "C" bool DBModule_MQData_Delete(XENGINE_DBMESSAGEQUEUE* pSt_DBInfo)
+{
+	return m_DBData.DBModule_MQData_Delete(pSt_DBInfo);
+}
 extern "C" bool DBModule_MQData_Query(XENGINE_DBMESSAGEQUEUE * pSt_DBInfo)
 {
 	return m_DBData.DBModule_MQData_Query(pSt_DBInfo);

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -654,6 +654,30 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 			XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("%s消息端:%s,主题:%s,序列:%lld,获取消息数据成功,消息大小:%d"), lpszClientType, lpszClientAddr, st_MQProtocol.tszMQKey, st_MessageQueue.nQueueSerial, st_MessageQueue.nMsgLen);
 		}
+		else if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQDELETE == pSt_ProtocolHdr->unOperatorCode)
+		{
+			XENGINE_DBMESSAGEQUEUE st_MessageQueue;
+			memset(&st_MessageQueue, '\0', sizeof(XENGINE_DBMESSAGEQUEUE));
+
+			pSt_ProtocolHdr->unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REPDELETE;
+			if (st_MQProtocol.nSerial <= 0)
+			{
+				pSt_ProtocolHdr->wReserve = 722;
+				ProtocolModule_Packet_Common(nNetType, pSt_ProtocolHdr, &st_MQProtocol, tszSDBuffer, &nSDLen);
+				XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("%s消息端:%s,主题:%s,获取消息数据失败,获取指定消息序列:%lld 失败,错误:%lX"), lpszClientType, lpszClientAddr, st_MQProtocol.tszMQKey, st_MQProtocol.nSerial, DBModule_GetLastError());
+				return false;
+			}
+			st_MessageQueue.nQueueSerial = st_MQProtocol.nSerial;
+			_tcsxcpy(st_MessageQueue.tszQueueName, st_MQProtocol.tszMQKey);
+			DBModule_MQData_Delete(&st_MessageQueue);
+
+			pSt_ProtocolHdr->wReserve = 0;
+			pSt_ProtocolHdr->byVersion = st_MessageQueue.byMsgType;
+			ProtocolModule_Packet_Common(nNetType, pSt_ProtocolHdr, &st_MQProtocol, tszSDBuffer, &nSDLen);
+			XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("%s消息端:%s,主题:%s,序列:%lld,删除消息数据成功"), lpszClientType, lpszClientAddr, st_MQProtocol.tszMQKey, st_MessageQueue.nQueueSerial);
+		}
 		else if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQTOPICCREATE == pSt_ProtocolHdr->unOperatorCode)
 		{
 			pSt_ProtocolHdr->unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REPTOPICCREATE;