Z991239-825 #comment feat:alarm 实体 首次编译windows版本通过

Signed-Off-By: commit-hook

Module/mod_alarm/Alarm.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef RVC_MOD_ALARM_ALARM_H_
+#define RVC_MOD_ALARM_ALARM_H_
 
 #include <list.h>
 
@@ -53,4 +54,5 @@ static void add_new_upalarm(alarmUpgraded_t*new_alrm,list_head*list)
 static void update_upalarm(alarmUpgraded_t*new_alrm,alarmUpgraded_t*old_alrm)
 {
 	list_replace(&old_alrm->entry, &new_alrm->entry);
-}
+}
+#endif //RVC_MOD_ALARM_ALARM_H_

Module/mod_alarm/AlarmConnection.cpp

@@ -1,31 +0,0 @@
-#include "AlarmConnection.h"
-
-
-AlarmConnection::AlarmConnection(void)
-{
-}
-
-
-AlarmConnection::~AlarmConnection(void)
-{
-}
-
-AlarmConnection::SendAlarmReq(AlarmReq*pAlarm)
-{
-
-}
-
-AlarmConnection::InitConnection()
-{
-
-}
-
-AlarmConnection::CreateConnection()
-{
-	
-}
-
-AlarmConnection::CloseConnection()
-{
-
-}

Module/mod_alarm/AlarmConnection.h

@@ -1,19 +0,0 @@
-#ifndef __ALARMCONNECTION
-#define __ALARMCONNECTION 
-
-
-
-class AlarmConnection:public SpSecureClient
-{
-public:
-	AlarmConnection(CEntityBase *pEntity):SpSecureClient(pEntity);
-	~AlarmConnection(void);
-	SendAlarmReq(AlarmReq*pAlarm);
-	
-private:
-	InitConnection();
-	CreateConnection();
-	CloseConnection();	
-};
-
-#endif

Module/mod_alarm/AlarmFSM.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef RVC_MOD_ALARM_FSM_H_
+#define RVC_MOD_ALARM_FSM_H_
 
 #include "SpBase.h"
 #include "SpFSM.h"
@@ -419,3 +420,4 @@ protected:
 private:
 	AlarmFSM *m_pFSM;
 };
+#endif //RVC_MOD_ALARM_FSM_H_

Module/mod_alarm/CMakeLists.txt

@@ -0,0 +1,27 @@
+#实体命名
+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(MOD_VERSION_STRING "1.0.0-dev1")
+add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
+
+
+
+#附加包含的目录(DevHeadPath:)
+target_include_directories(${MODULE_NAME} PRIVATE
+	${ModuleCommonHeadPath}
+	${RVC_FRAMEWORK_INCLUDES_DIR}
+
+)
+
+# 添加实体需要依赖的其他共享库（包括系统库）：连接器包含的包
+
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS})
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})  
+
+deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

Module/mod_alarm/mod_alarm.h

@@ -1,5 +1,5 @@
-#ifndef __MOD_ALARM_H
-#define __MOD_ALARM_H
+#ifndef RVC_MOD_ALARM_H_
+#define RVC_MOD_ALARM_H_
 
 #include "stdafx.h"
 #include "SpBase.h"
@@ -7,6 +7,9 @@
 #include "AlarmFSM.h"
 #include "EventCode.h"
 
+#include "SpTest.h"
+#include "modVer.h"
+
 class CAlarmEntity : public CEntityBase,public ILogListener
 {
 public:
@@ -14,6 +17,13 @@ public:
 	virtual ~CAlarmEntity() {}
 	virtual const char *GetEntityName() const { return "Alarm"; }
 
+	const char* GetEntityVersion() const override
+	{
+		return MODULE_VERSION_FULL;
+	}
+
+	ON_ENTITYT_TEST()
+
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
 	{
 		ErrorCodeEnum Error = Error_Succeed;
@@ -42,4 +52,4 @@ private:
 		CUUID m_uuidPtr;
 		CUUID m_uuidPtr2;//Ìí¼ÓerrorÈÕÖ¾µ½¸æ¾¯Í¨µÀ
 };
-#endif
+#endif //RVC_MOD_ALARM_H_

Module/mod_alarm/mod_alarm.vcxproj

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D93E4D2B-DE05-4868-87FA-E34D4835A498}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mod_alarm</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\modmake.setting" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath);$(VCInstallDir)include</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_ALARM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(FrameworkHeadRoot)\libtoolkit;$(ModuleCommonHeadPath)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FrameworkLib)\SpBase.lib;$(FrameworkLib)\RVCComm.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-    	<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>    
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_ALARM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(FrameworkHeadRoot)\libtoolkit;$(ModuleCommonHeadPath)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(FrameworkLib)\SpBase.lib;$(FrameworkLib)\RVCComm.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(FrameworkHeadRoot)\Common\stdafx.cpp" />
-    <ClCompile Include="Alarm.cpp" />
-    <ClCompile Include="AlarmFSM.cpp" />
-    <ClCompile Include="mod_alarm.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(FrameworkHeadRoot)\Common\stdafx.h" />
-    <ClInclude Include="Alarm.h" />
-    <ClInclude Include="AlarmFSM.h" />
-    <ClInclude Include="Event.h" />
-    <ClInclude Include="mod_alarm.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Module/mod_alarm/mod_alarm.vcxproj.filters

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Framework\Common\stdafx.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="mod_alarm.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="Alarm.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="AlarmFSM.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Alarm.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="AlarmFSM.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="mod_alarm.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Framework\Common\stdafx.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="Event.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>