Modify:Move Query Code into Manage cpp

Author: xengine-qyt

XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp

@@ -103,10 +103,6 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 		{
 			XEngine_Task_Pass(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
 		}
-		else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_QUERY, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_QUERY)))
-		{
-			XEngine_Task_Query(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
-		}
 		else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_EVENT, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_EVENT)))
 		{
 			XEngine_Task_Event(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);

XEngine_Source/XEngine_StorageApp/StorageApp_Center.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #define XENGINE_STORAGE_APP_TASK_EVENT  _T("Event")
-#define XENGINE_STORAGE_APP_TASK_QUERY  _T("Query")
 #define XENGINE_STORAGE_APP_TASK_PASS  _T("Pass")
 #define XENGINE_STORAGE_APP_TASK_MANAGE  _T("Manage")
 
@@ -11,6 +10,7 @@
 #define XENGINE_STORAGE_APP_METHOD_FILE  _T("File")
 #define XENGINE_STORAGE_APP_METHOD_ADD  _T("Add")
 #define XENGINE_STORAGE_APP_METHOD_DEL  _T("Del")
+#define XENGINE_STORAGE_APP_METHOD_QUERY  _T("Query")
 
 XHTHREAD CALLBACK XEngine_Center_HTTPThread(LPVOID lParam);
 BOOL XEngine_Task_HttpCenter_APIList(LPCTSTR lpszUrlName, TCHAR* ptszAPIVersion, TCHAR* ptszAPIMethod, TCHAR* ptszAPIName);

XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h

@@ -112,7 +112,6 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
 #include "StorageApp_P2XPNet.h"
 #include "Storage_APPTask/Storage_TaskEvent.h"
 #include "Storage_APPTask/Storage_TaskPass.h"
-#include "Storage_APPTask/Storage_TaskQuery.h"
 #include "Storage_APPTask/Storage_TaskP2p.h"
 #include "Storage_APPTask/Storage_TaskManage.h"
 #include "Storage_APPHelp/Storage_APPHelp.h"

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

@@ -163,5 +163,54 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 		XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
 		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_DBFile, nListCount);
 	}
+	else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_METHOD_QUERY, lpszAPIName, _tcslen(XENGINE_STORAGE_APP_METHOD_QUERY)))
+	{
+		//查询文件列表
+		int nMsgLen = 10240;
+		TCHAR tszFileName[MAX_PATH];
+		TCHAR tszFileHash[MAX_PATH];
+		TCHAR tszTimeStart[128];
+		TCHAR tszTimeEnd[128];
+		TCHAR tszMsgBuffer[10240];
+
+		memset(tszFileName, '\0', MAX_PATH);
+		memset(tszFileHash, '\0', MAX_PATH);
+		memset(tszTimeStart, '\0', sizeof(tszTimeStart));
+		memset(tszTimeEnd, '\0', sizeof(tszTimeEnd));
+		memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
+
+		int nListCount = 0;
+		XSTORAGECORE_DBFILE** ppSt_ListFile;
+		XStorageProtocol_Core_REQQueryFile(lpszMsgBuffer, tszTimeStart, tszTimeEnd, tszFileHash);
+
+		if (0 == st_ServiceCfg.st_XSql.nSQLType)
+		{
+			st_HDRParam.bIsClose = TRUE;
+			st_HDRParam.nHttpCode = 406;
+
+			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("业务客户端:%s,请求查询文件列表失败,服务器没有启用这个功能"), lpszClientAddr);
+		}
+		else
+		{
+			if (1 == st_ServiceCfg.st_XSql.nSQLType)
+			{
+				XStorageSQL_File_FileQuery(&ppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash);
+			}
+			else
+			{
+				XStorage_SQLite_FileQuery(&ppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash);
+			}
+			st_HDRParam.bIsClose = TRUE;
+			st_HDRParam.nHttpCode = 200;
+
+			XStorageProtocol_Core_REPQueryFile(tszMsgBuffer, &nMsgLen, &ppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
+			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszMsgBuffer, nMsgLen);
+			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
+			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListFile, nListCount);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求查询文件列表成功,列表个数:%d"), lpszClientAddr, nListCount);
+		}
+	}
 	return TRUE;
 }

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskQuery.cpp

@@ -160,7 +160,6 @@
     <ClCompile Include="Storage_APPTask\Storage_TaskManage.cpp" />
     <ClCompile Include="Storage_APPTask\Storage_TaskP2p.cpp" />
     <ClCompile Include="Storage_APPTask\Storage_TaskPass.cpp" />
-    <ClCompile Include="Storage_APPTask\Storage_TaskQuery.cpp" />
     <ClCompile Include="StorageApp_P2XPNet.cpp" />
     <ClCompile Include="XEngine_StorageApp.cpp" />
   </ItemGroup>
@@ -177,7 +176,6 @@
     <ClInclude Include="Storage_APPTask\Storage_TaskManage.h" />
     <ClInclude Include="Storage_APPTask\Storage_TaskP2p.h" />
     <ClInclude Include="Storage_APPTask\Storage_TaskPass.h" />
-    <ClInclude Include="Storage_APPTask\Storage_TaskQuery.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskQuery.h

@@ -51,9 +51,6 @@
     <ClCompile Include="Storage_APPTask\Storage_TaskPass.cpp">
       <Filter>源文件\Storage_APPTask</Filter>
     </ClCompile>
-    <ClCompile Include="Storage_APPTask\Storage_TaskQuery.cpp">
-      <Filter>源文件\Storage_APPTask</Filter>
-    </ClCompile>
     <ClCompile Include="Storage_APPHelp\Storage_APPHelp.cpp">
       <Filter>源文件\Storage_APPHelp</Filter>
     </ClCompile>
@@ -92,9 +89,6 @@
     <ClInclude Include="Storage_APPTask\Storage_TaskPass.h">
       <Filter>头文件\Storage_APPTask</Filter>
     </ClInclude>
-    <ClInclude Include="Storage_APPTask\Storage_TaskQuery.h">
-      <Filter>头文件\Storage_APPTask</Filter>
-    </ClInclude>
     <ClInclude Include="Storage_APPHelp\Storage_APPHelp.h">
       <Filter>头文件\Storage_APPHelp</Filter>
     </ClInclude>