Z991239-1500 #comment fix:日志埋点和告警实体修改编译第一次上传

Signed-Off-By: commit-hook

Module/mod_alarm/Alarm.cpp

@@ -2,7 +2,7 @@
 #include "SpBase.h"
 #include "SpIni.h"
 
-#include "alarm.h"
+#include "Alarm.h"
 #include <memutil.h>
 #include <fileutil.h>
 #include <array.h>

Module/mod_alarm/Alarm.h

@@ -34,7 +34,7 @@ struct alarmUpgraded_t
 
 struct alarm_state_t 
 {
-	unsigned __int64 SN;
+	unsigned long long SN;
 	unsigned long LifeID;
 	unsigned long Item;
 	char Level;

Module/mod_alarm/AlarmFSM.h

@@ -41,7 +41,7 @@ struct AlarmReply
 struct AlarmStateUpload
 {
 	char TerminalNo[16];
-	unsigned __int64 SN;
+	unsigned long long SN;
 	unsigned long  LifeID;
 	unsigned long Item;
 	char Level;

Module/mod_alarm/CMakeLists.txt

@@ -1,10 +1,15 @@
 #实体命名
-define_module("Alarm")
+define_module("alarm")
 
 #整个实体加载的文件
-file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
+set(${MODULE_PREFIX}_SRCS
+	mod_alarm.cpp
+	mod_alarm.h
+	Alarm.cpp
+	Alarm.h
+	AlarmFSM.cpp
+	AlarmFSM.h
+	)
 #设置版本
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})

Module/mod_alarm/mod_alarm.cpp

@@ -1,5 +1,9 @@
 #include "stdafx.h"
 #include "mod_alarm.h"
+#ifdef RVC_OS_WIN
+#else
+#include <sys/timeb.h>
+#endif
 
 void CAlarmEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 	const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
@@ -31,14 +35,22 @@ void CAlarmEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		//strncpy(cDescription,pszMessage,512-1);
 		//Alarm->Description	= _strdup(cDescription);
 
-		char cDescription[512]={0};
-		char clogTime[32]={0};//2020-20-20 12:12:12.100 日志时间，记得释放
-		SYSTEMTIME st ;
+		char cDescription[512] = { 0 };
+		char clogTime[32] = { 0 };//2020-20-20 12:12:12.100 日志时间
+#ifdef RVC_OS_WIN
+		SYSTEMTIME st;
 		GetLocalTime(&st);
 		sprintf(clogTime, "%04d-%02d-%02d %02d:%02d:%02d.%03d  ", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
-		strncpy(cDescription,clogTime,32);
-		strncat(cDescription,pszMessage,512-32-1);
-		Alarm->Description	= _strdup(cDescription);
+#else
+		struct timeb stime = { 0, 0 };
+		tm nowTm = { 0 };
+		ftime(&stime);
+		localtime_r(&stime.time, &nowTm);
+		sprintf(clogTime, "%04d-%02d-%02d %02d:%02d:%02d.%03d", nowTm.tm_year + 1900, nowTm.tm_mon + 1, nowTm.tm_mday, nowTm.tm_hour, nowTm.tm_min, nowTm.tm_sec, stime.millitm);
+#endif
+		strncpy(cDescription, clogTime, 32);
+		strncat(cDescription, pszMessage, 512 - 32 - 1);
+		Alarm->Description = _strdup(cDescription);
 
 
 		//modify by lwt 20200528 去除去重功能，

Module/mod_uplog/CMakeLists.txt

@@ -2,9 +2,12 @@
 define_module("UpLog")
 
 #整个实体加载的文件
-file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
+set(${MODULE_PREFIX}_SRCS
+	mod_uplog.cpp
+	mod_uplog.h
+	UpLogFSM.cpp
+	UpLogFSM.h
+	)
 #设置版本
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
@@ -19,7 +22,7 @@ BUILD missing)
 target_include_directories(${MODULE_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_INCLUDE_DIRS_JSONCPP}/json
+	${CONAN_INCLUDE_DIRS_JSONCPP}
 )
 
 target_link_directories(${MODULE_NAME} PRIVATE

Module/mod_uplog/UpLogFSM.cpp

@@ -1,7 +1,10 @@
 #include "stdafx.h"
 #include "UpLogFSM.h"
 //#include "Event.h"
-
+#ifdef RVC_OS_WIN
+#else
+#include <sys/timeb.h>
+#endif
 
 UpLogFSM::UpLogFSM() : m_pConnection(NULL),m_isSendLog(false),m_branchSendLog(false),m_logTypeList("")
 {
@@ -615,9 +618,17 @@ void UpLogFSM::printDebugLog( const char* debugStr )
 	char* clogTime = (char*)malloc(30);
 	if(clogTime!=NULL){
 		memset(clogTime,0,30);//2020-20-20 12:12:12.100 日志时间，记得释放
+#ifdef RVC_OS_WIN
 		SYSTEMTIME st ;
 		GetLocalTime(&st);
 		sprintf(clogTime, "%04d-%02d-%02d %02d:%02d:%02d.%03d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+#else
+		struct timeb stime = { 0, 0 };
+		tm nowTm = { 0 };
+		ftime(&stime);
+		localtime_r(&stime.time, &nowTm);
+		sprintf(clogTime, "%04d-%02d-%02d %02d:%02d:%02d.%03d", nowTm.tm_year + 1900, nowTm.tm_mon + 1, nowTm.tm_mday, nowTm.tm_hour, nowTm.tm_min, nowTm.tm_sec, stime.millitm);
+#endif
 		logt->LogTime =clogTime;
 	}else{
 		succ=false;
@@ -644,7 +655,13 @@ void UpLogFSM::printDebugLog( const char* debugStr )
 		ErrorCodeEnum ec = GetEntityBase()->GetFunction()->GetSelfEntityRunInfo(eri);
 		if(ec == Error_Succeed)
 		{
-			ultoa(eri.dwEntityInstanceID,cEntityInstanceID,10);//实体ID,记得释放
+#ifdef RVC_OS_WIN
+			ultoa(eri.dwEntityInstanceID, cEntityInstanceID, 10);//实体ID,记得释放
+#else
+			sprintf(cEntityInstanceID, "%ul", eri.dwEntityInstanceID);
+#endif
+
+			
 			logt->Item = cEntityInstanceID;
 		}else{
 			logt->Item = cEntityInstanceID;//实体ID,记得释放
@@ -660,7 +677,11 @@ void UpLogFSM::printDebugLog( const char* debugStr )
 	if (cSysError!=NULL)
 	{
 		memset(cSysError,0,20);
+#ifdef RVC_OS_WIN
 		ultoa(0xffff,cSysError,16);//系统errorcode,记得释放
+#else
+		sprintf(cSysError, "%x", 0xffff);
+#endif
 		logt->SysCode=cSysError;
 	}else{
 		succ=false;
@@ -671,7 +692,12 @@ void UpLogFSM::printDebugLog( const char* debugStr )
 	if (cUserCode!=NULL)
 	{
 		memset(cUserCode,0,20);
-		ultoa(0xffff,cUserCode,16);//用户定义Usercode,记得释放
+#ifdef RVC_OS_WIN
+		ultoa(0xffff, cUserCode, 16);//用户定义Usercode,记得释放
+#else
+		sprintf(cUserCode, "%x", 0xffff);
+#endif
+		
 		logt->UserCode = cUserCode;
 	}else{
 		succ=false;

Module/mod_uplog/UpLogFSM.h

@@ -6,7 +6,7 @@
 #include "SpSecureClient.h"
 #include <map>
 #include <vector>
-#include "json.h"
+#include "json/json.h"
 
 
 

Module/mod_uplog/mod_uplog.cpp

@@ -1,5 +1,9 @@
 #include "stdafx.h"
 #include "mod_uplog.h"
+#ifdef RVC_OS_WIN
+#else
+#include <sys/timeb.h>
+#endif
 
 void CUpLogEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 	const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
@@ -50,9 +54,17 @@ void CUpLogEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		char* clogTime = (char*)malloc(30);
 		if(clogTime!=NULL){
 			memset(clogTime,0,30);//2020-20-20 12:12:12.100 日志时间，记得释放
-			SYSTEMTIME st ;
+#ifdef RVC_OS_WIN
+			SYSTEMTIME st;
 			GetLocalTime(&st);
 			sprintf(clogTime, "%04d-%02d-%02d %02d:%02d:%02d.%03d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+#else
+			struct timeb stime = { 0, 0 };
+			tm nowTm = { 0 };
+			ftime(&stime);
+			localtime_r(&stime.time, &nowTm);
+			sprintf(clogTime, "%04d-%02d-%02d %02d:%02d:%02d.%03d", nowTm.tm_year + 1900, nowTm.tm_mon + 1, nowTm.tm_mday, nowTm.tm_hour, nowTm.tm_min, nowTm.tm_sec, stime.millitm);
+#endif
 			logt->LogTime =clogTime;
 		}else{
 			succ=false;
@@ -74,7 +86,12 @@ void CUpLogEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		if (cEntityInstanceID!=NULL)
 		{
 			memset(cEntityInstanceID,0,20);
-			ultoa(dwEntityInstanceID,cEntityInstanceID,10);//实体ID,记得释放
+#ifdef RVC_OS_WIN
+			ultoa(dwEntityInstanceID, cEntityInstanceID, 10);//实体ID,记得释放
+#else
+			sprintf(cEntityInstanceID, "%ul", dwEntityInstanceID);
+#endif
+			
 			logt->Item = cEntityInstanceID;
 		}else{
 			succ=false;
@@ -85,7 +102,11 @@ void CUpLogEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		if (cSysError!=NULL)
 		{
 			memset(cSysError,0,20);
+#ifdef RVC_OS_WIN
 			ultoa(dwSysError,cSysError,16);//系统errorcode,记得释放
+#else
+			sprintf(cSysError, "%x", dwSysError);
+#endif
 			logt->SysCode=cSysError;
 		}else{
 			succ=false;
@@ -96,7 +117,11 @@ void CUpLogEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		if (cUserCode!=NULL)
 		{
 			memset(cUserCode,0,20);
+#ifdef RVC_OS_WIN
 			ultoa(dwUserCode,cUserCode,16);//用户定义Usercode,记得释放
+#else
+			sprintf(cUserCode, "%x", dwUserCode);
+#endif
 			logt->UserCode = cUserCode;
 		}else{
 			succ=false;