Skip to content

Commit 4459a91

Browse files
xengine-qytxengine-qyt
committed
added:all task list query
1 parent 136034b commit 4459a91

File tree

8 files changed

+141
-3
lines changed

8 files changed

+141
-3
lines changed

‎XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ XHTHREAD CALLBACK XEngine_Download_SendThread(LPVOID lParam)
5656
for (; stl_ListIterator != stl_ListClient.end(); stl_ListIterator++)
5757
{
5858
int nMsgLen = 4096;
59-
if (!Session_DLStroage_GetList(nThreadPos, stl_ListIterator->c_str(), tszMsgBuffer, &nMsgLen))
59+
if (!Session_DLStroage_GetBuffer(nThreadPos, stl_ListIterator->c_str(), tszMsgBuffer, &nMsgLen))
6060
{
6161
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("下载客户端:%s,获取用户对应文件内容失败,错误：%lX"), stl_ListIterator->c_str(), Session_GetLastError());
6262
continue;

‎XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ typedef std::string tstring;
5555
#endif
5656

5757
#include "../XStorage_Protocol.h"
58+
#include "../StorageModule_Session/Session_Define.h"
59+
#include "../StorageModule_Session/Session_Error.h"
5860
#include "../XEngine_StorageComponents/XStorage_SQLPacket/SQLPacket_Define.h"
5961
#include "../XEngine_StorageComponents/XStorage_SQLPacket/SQLPacket_Error.h"
6062
#include "../XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Define.h"
@@ -63,8 +65,6 @@ typedef std::string tstring;
6365
#include "../XEngine_P2XPComponents/XEngine_P2XPPeer/P2XPPeer_Error.h"
6466
#include "../XEngine_P2XPComponents/XEngine_P2XPProtocol/P2XPProtocol_Define.h"
6567
#include "../XEngine_P2XPComponents/XEngine_P2XPProtocol/P2XPProtocol_Error.h"
66-
#include "../StorageModule_Session/Session_Define.h"
67-
#include "../StorageModule_Session/Session_Error.h"
6868
#include "../StorageModule_Config/Config_Define.h"
6969
#include "../StorageModule_Config/Config_Error.h"
7070
#include "../StorageModule_APIHelp/APIHelp_Define.h"

‎XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Core/XStorageProtocol_Core.cpp‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,98 @@ BOOL CXStorageProtocol_Core::XStorageProtocol_Core_ReportFileParse(LPCTSTR lpszM
301301
return TRUE;
302302
}
303303
/********************************************************************
304+
函数名称：XStorageProtocol_Core_REPInfo
305+
函数功能：返回信息获取请求打包函数
306+
参数.一：ptszMsgBuffer
307+
In/Out：Out
308+
类型：字符指针
309+
可空：N
310+
意思：输出打好包的缓冲区内容
311+
参数.二：pInt_MsgLen
312+
In/Out：Out
313+
类型：整数型指针
314+
可空：N
315+
意思：输出缓冲区大小
316+
参数.三：pppSt_DLInfo
317+
In/Out：In
318+
类型：数据结构指针
319+
可空：N
320+
意思：下载信息列表
321+
参数.四：pppSt_UPInfo
322+
In/Out：In
323+
类型：数据结构指针
324+
可空：N
325+
意思：上传信息列表
326+
参数.五：nDLCount
327+
In/Out：In
328+
类型：整数型
329+
可空：N
330+
意思：下载列表个数
331+
参数.六：nUPCount
332+
In/Out：In
333+
类型：整数型
334+
可空：N
335+
意思：上传列表个数
336+
返回值
337+
类型：逻辑型
338+
意思：是否成功
339+
备注：
340+
*********************************************************************/
341+
BOOL CXStorageProtocol_Core::XStorageProtocol_Core_REPInfo(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO*** pppSt_DLInfo, SESSION_STORAGEINFO*** pppSt_UPInfo, int nDLCount, int nUPCount)
342+
{
343+
XStorage_IsErrorOccur = FALSE;
344+
345+
if ((NULL == pppSt_DLInfo) || (NULL == pppSt_UPInfo))
346+
{
347+
XStorage_IsErrorOccur = TRUE;
348+
XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_PROTOCOL_PARAMENT;
349+
return FALSE;
350+
}
351+
Json::Value st_JsonRoot;
352+
Json::Value st_JsonDLArray;
353+
Json::Value st_JsonUPArray;
354+
355+
for (int i = 0; i < nDLCount; i++)
356+
{
357+
Json::Value st_JsonObject;
358+
st_JsonObject["tszClientAddr"] = (*pppSt_DLInfo)[i]->tszClientAddr;
359+
st_JsonObject["tszFilePath"] = (*pppSt_DLInfo)[i]->tszFileDir;
360+
st_JsonObject["ullCount"] = (*pppSt_DLInfo)[i]->ullCount;
361+
st_JsonObject["ullRWCount"] = (*pppSt_DLInfo)[i]->ullRWCount;
362+
st_JsonObject["ullRWLen"] = (*pppSt_DLInfo)[i]->ullRWLen;
363+
st_JsonObject["ullPosStart"] = (*pppSt_DLInfo)[i]->ullPosStart;
364+
st_JsonObject["ullPosEnd"] = (*pppSt_DLInfo)[i]->ullPosEnd;
365+
st_JsonObject["nPoolIndex"] = (*pppSt_DLInfo)[i]->nPoolIndex;
366+
367+
st_JsonDLArray.append(st_JsonObject);
368+
}
369+
for (int i = 0; i < nUPCount; i++)
370+
{
371+
Json::Value st_JsonObject;
372+
st_JsonObject["tszClientAddr"] = (*pppSt_DLInfo)[i]->tszClientAddr;
373+
st_JsonObject["tszFilePath"] = (*pppSt_DLInfo)[i]->tszFileDir;
374+
st_JsonObject["ullCount"] = (*pppSt_DLInfo)[i]->ullCount;
375+
st_JsonObject["ullRWCount"] = (*pppSt_DLInfo)[i]->ullRWCount;
376+
st_JsonObject["ullRWLen"] = (*pppSt_DLInfo)[i]->ullRWLen;
377+
st_JsonObject["ullPosStart"] = (*pppSt_DLInfo)[i]->ullPosStart;
378+
st_JsonObject["ullPosEnd"] = (*pppSt_DLInfo)[i]->ullPosEnd;
379+
380+
st_JsonUPArray.append(st_JsonObject);
381+
}
382+
st_JsonRoot["DLCount"] = st_JsonDLArray.size();
383+
st_JsonRoot["UPCount"] = st_JsonUPArray.size();
384+
385+
st_JsonRoot["DLList"] = st_JsonDLArray;
386+
st_JsonRoot["UPList"] = st_JsonUPArray;
387+
388+
st_JsonRoot["Code"] = 0;
389+
st_JsonRoot["Msg"] = _T("ok");
390+
//打包输出信息
391+
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
392+
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
393+
return TRUE;
394+
}
395+
/********************************************************************
304396
函数名称：XStorageProtocol_Core_REQDirOperator
305397
函数功能：文件夹操作协议
306398
参数.一：lpszMsgBuffer

‎XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Core/XStorageProtocol_Core.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class CXStorageProtocol_Core
2020
BOOL XStorageProtocol_Core_REQQueryFile(LPCTSTR lpszMsgBuffer, TCHAR *ptszTimeStart, TCHAR *ptszTimeEnd, TCHAR *ptszFileName = NULL, TCHAR * ptszFileHash = NULL);
2121
BOOL XStorageProtocol_Core_REPQueryFile(TCHAR *ptszMsgBuffer, int *pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszRootDir, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL);
2222
BOOL XStorageProtocol_Core_ReportFileParse(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int* pInt_ListCount);
23+
BOOL XStorageProtocol_Core_REPInfo(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO*** pppSt_DLInfo, SESSION_STORAGEINFO*** pppSt_UPInfo, int nDLCount, int nUPCount);
2324
public:
2425
BOOL XStorageProtocol_Core_REQDirOperator(LPCTSTR lpszMsgBuffer, TCHAR* ptszUserDir, int* pInt_Operator);
2526
BOOL XStorageProtocol_Core_REPDirOperator(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, TCHAR*** pppszListEnum, int nListCount);

‎XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Define.h‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,45 @@ extern "C" BOOL XStorageProtocol_Core_REPQueryFile(CHAR * ptszMsgBuffer, int* pI
340340
*********************************************************************/
341341
extern "C" BOOL XStorageProtocol_Core_ReportFileParse(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int* pInt_ListCount);
342342
/********************************************************************
343+
函数名称：XStorageProtocol_Core_REPInfo
344+
函数功能：返回信息获取请求打包函数
345+
参数.一：ptszMsgBuffer
346+
In/Out：Out
347+
类型：字符指针
348+
可空：N
349+
意思：输出打好包的缓冲区内容
350+
参数.二：pInt_MsgLen
351+
In/Out：Out
352+
类型：整数型指针
353+
可空：N
354+
意思：输出缓冲区大小
355+
参数.三：pppSt_DLInfo
356+
In/Out：In
357+
类型：数据结构指针
358+
可空：N
359+
意思：下载信息列表
360+
参数.四：pppSt_UPInfo
361+
In/Out：In
362+
类型：数据结构指针
363+
可空：N
364+
意思：上传信息列表
365+
参数.五：nDLCount
366+
In/Out：In
367+
类型：整数型
368+
可空：N
369+
意思：下载列表个数
370+
参数.六：nUPCount
371+
In/Out：In
372+
类型：整数型
373+
可空：N
374+
意思：上传列表个数
375+
返回值
376+
类型：逻辑型
377+
意思：是否成功
378+
备注：
379+
*********************************************************************/
380+
extern "C" BOOL XStorageProtocol_Core_REPInfo(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO*** pppSt_DLInfo, SESSION_STORAGEINFO*** pppSt_UPInfo, int nDLCount, int nUPCount);
381+
/********************************************************************
343382
函数名称：XStorageProtocol_Core_REQDirOperator
344383
函数功能：文件夹操作协议
345384
参数.一：lpszMsgBuffer

‎XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorage_Protocol.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ EXPORTS
1414
XStorageProtocol_Core_REQQueryFile
1515
XStorageProtocol_Core_REPQueryFile
1616
XStorageProtocol_Core_ReportFileParse
17+
XStorageProtocol_Core_REPInfo
1718
XStorageProtocol_Core_REQDirOperator
1819
XStorageProtocol_Core_REPDirOperator
1920
XStorageProtocol_Core_REQUPEvent

‎XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/pch.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ extern "C" BOOL XStorageProtocol_Core_ReportFileParse(LPCTSTR lpszMsgBuffer, int
7575
{
7676
return m_ProtocolCore.XStorageProtocol_Core_ReportFileParse(lpszMsgBuffer, nMsgLen, pppSt_DBFile, pInt_ListCount);
7777
}
78+
extern "C" BOOL XStorageProtocol_Core_REPInfo(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO * **pppSt_DLInfo, SESSION_STORAGEINFO * **pppSt_UPInfo, int nDLCount, int nUPCount)
79+
{
80+
return m_ProtocolCore.XStorageProtocol_Core_REPInfo(ptszMsgBuffer, pInt_MsgLen, pppSt_DLInfo, pppSt_UPInfo, nDLCount, nUPCount);
81+
}
7882
extern "C" BOOL XStorageProtocol_Core_REQDirOperator(LPCTSTR lpszMsgBuffer, TCHAR * ptszUserDir, int* pInt_Operator)
7983
{
8084
return m_ProtocolCore.XStorageProtocol_Core_REQDirOperator(lpszMsgBuffer, ptszUserDir, pInt_Operator);

‎XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/pch.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ using namespace std;
4141
#include <XEngine_Include/XEngine_HelpComponents/DataBase_Define.h>
4242
#include <XEngine_Include/XEngine_HelpComponents/DataBase_Error.h>
4343
#include "../../XStorage_Protocol.h"
44+
#include "../../StorageModule_Session/Session_Define.h"
4445
#include "../XStorage_SQLPacket/SQLPacket_Define.h"
4546
#include "XStorageProtocol_Define.h"
4647
#include "XStorageProtocol_Error.h"

0 commit comments

Comments
 (0)