Z991239-5799 #comment feat: 上传实体错误码提取，增加上传时hash告警

Signed-Off-By: commit-hook

Module/include/EventCode.h

@@ -34,15 +34,6 @@ static const char* Device_Type_Table[] = {
 #define ERR_MOD_CENTERSETTING_CHANGE_FROM_NONE2SUBBRANCH      0x1010001F //从无切换到分行
 
 
-#define LOG_WARN_UPLOAD_SCANFILE_LOCK_ERROR 0x10400001 //扫描文件时文件独占句柄失败
-#define LOG_WARN_UPLOAD_QUERY_PLAN_ERROR 0x10400002 //查询扫描计划http通讯报错
-#define LOG_WARN_UPLOAD_QUERY_FILE_OVER_LIMIT 0x10400003 //扫描文件文件过大告警
-#define LOG_WARN_UPLOAD_FILE_REPORT 0x10400004 //上传文件统计信息告警
-#define LOG_WARN_UPLOAD_QUERY_PLAN_DATA_ERROR 0x10400005 //查询扫描计划数据效验错误
-
-
-
-#define LOG_WARN_UPLOAD_SCANFILE_LOCK_ERROR 0x10400001 //扫描文件时文件独占句柄失败
 
 #define EVENT_MOD_DOWNLOAD_STARTSYNC			0x10500032		// 开始同步
 #define EVENT_MOD_DOWNLOAD_SYNCHRONIZED			0x10500031		// 完成同步

Module/mod_upload/CMakeLists.txt

@@ -13,6 +13,7 @@ set(${MODULE_PREFIX}_SRCS
 	Upload_server_g.h
 	UploadFSM.cpp
 	UploadFSM.h
+	Upload_UserErrorCode.h
 	${ThirdPartyHeadRoot}/XZip/XZip.h
 	${ThirdPartyHeadRoot}/XZip/XZip.cpp
 	)

Module/mod_upload/UploadFSM.cpp

@@ -346,7 +346,11 @@ namespace Task
 			qTempReq.m_timeOut = 5*60;//设置超时时间
 			//qTempReq.m_printDbg=true;
 			//调用上传接口
-			if(!client->UploadFileBlock(qTempReq,qTempRet)){
+			//最后一次上传时，文件hash和长度告警
+			if (m_fsm->m_currUploadFile->lastMD5Str.length() != 0) {
+				LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_FILE_INFO, CSimpleStringA::Format("upload %s file size is %s byte,sm3 digest is %s.", m_fsm->m_currUploadFile->fileName.c_str(), lastFileLength.c_str(), m_fsm->m_currUploadFile->lastMD5Str.c_str()).GetData());
+			}
+			if (!client->UploadFileBlock(qTempReq, qTempRet)) {
 				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("uploadFile http req fail ,url =%s ,fileName = %s",httpUrl.c_str(), m_fsm->m_currUploadFile->fileName.c_str());
 				return false;
 			}

Module/mod_upload/UploadFSM.h

@@ -17,6 +17,7 @@
 #endif
 #include <map>
 #include "json/json.h"
+#include "Upload_UserErrorCode.h"
 
 #define USER_EVT_JMP_DISABLE	EVT_USER+1
 #define USER_EVT_JMP_ENABLE		EVT_USER+2
@@ -33,8 +34,6 @@
 #define USER_EVT_UPLOAD_SUCC		EVT_USER+12
 #define USER_EVT_UPLOAD_FAIL		EVT_USER+13
 
-#define LOG_WARN_UPLOAD_MAX_ERROR 0x10400006 //查询扫描待上传文件个数超过阈值告警
-
 using namespace std;
 
 

Module/mod_upload/Upload_UserErrorCode.h

@@ -0,0 +1,13 @@
+#ifndef _UPLOAD_USER_ERRORCODE_H
+#define _UPLOAD_USER_ERRORCODE_H
+#pragma once
+
+#define LOG_WARN_UPLOAD_SCANFILE_LOCK_ERROR 0x10400001 //扫描文件时文件独占句柄失败
+#define LOG_WARN_UPLOAD_QUERY_PLAN_ERROR 0x10400002 //查询扫描计划http通讯报错
+#define LOG_WARN_UPLOAD_QUERY_FILE_OVER_LIMIT 0x10400003 //扫描文件文件过大告警
+#define LOG_WARN_UPLOAD_FILE_REPORT 0x10400004 //上传文件统计信息告警
+#define LOG_WARN_UPLOAD_QUERY_PLAN_DATA_ERROR 0x10400005 //查询扫描计划数据效验错误
+#define LOG_WARN_UPLOAD_MAX_ERROR 0x10400006 //查询扫描待上传文件个数超过阈值告警
+#define LOG_WARN_UPLOAD_FILE_INFO 0x10400007 //上传文件打印hash和长度
+
+#endif //_CARDISSUERSTORE_USER_ERRORCODE_H