Lja

hr-cpp/CMakeLists.txt

@@ -1,7 +1,8 @@
 # CMakeList.txt: 顶层 CMake 项目文件，在此处执行全局配置
 # 并包含子项目。
 #
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.10)
+add_definitions(-std=c++11)
 
 # 指定工程名
 project ("zero-one-hrsys")
@@ -82,18 +83,19 @@ add_subdirectory ("lib-mysql")
 add_subdirectory ("lib-common")
 add_subdirectory ("nacos-register")
 # 这是示例模块，后期可以不编译它
-# add_subdirectory ("arch-demo")
+ #add_subdirectory ("arch-demo")
 # 在后面添加你的模块
-add_subdirectory ("hr-c1-orgmanage")
-add_subdirectory ("hr-c1-common")
-add_subdirectory ("hr-c2-basmanager")
-add_subdirectory ("hr-c2-orgmanager")
-add_subdirectory ("hr-c3-assignmentinfo")
-add_subdirectory ("hr-c3-educationinfo")
-add_subdirectory ("hr-c3-employeeinfo")
-add_subdirectory ("hr-c3-familysituation")
-add_subdirectory ("hr-c3-languagecompetence")
-add_subdirectory ("hr-c4-basemgeminfo")
-add_subdirectory ("hr-c6-basemanage")
-add_subdirectory ("hr-c7-datasetting")
-add_subdirectory ("hr-c5-employeeInfo")
+add_subdirectory ("hr-cx")
+#add_subdirectory ("hr-c1-orgmanage")
+#add_subdirectory ("hr-c1-common")
+#add_subdirectory ("hr-c2-basmanager")
+#add_subdirectory ("hr-c2-orgmanager")
+#add_subdirectory ("hr-c3-assignmentinfo")
+#add_subdirectory ("hr-c3-educationinfo")
+#add_subdirectory ("hr-c3-employeeinfo")
+#add_subdirectory ("hr-c3-familysituation")
+#add_subdirectory ("hr-c3-languagecompetence")
+#add_subdirectory ("hr-c4-basemgeminfo")
+#add_subdirectory ("hr-c6-basemanage")
+#add_subdirectory ("hr-c7-datasetting")
+#add_subdirectory ("hr-c5-employeeInfo")

hr-cpp/HrCpp.sln

@@ -47,6 +47,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hr-c7-datasetting", "hr-c7-
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hr-c5-employeeInfo", "hr-c5-employeeInfo\hr-c5-employeeInfo.vcxproj", "{45F81F4E-0D1B-4671-880E-C89B9FACB1E5}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hr-cx", "hr-cx\hr-cx.vcxproj", "{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -191,6 +193,14 @@ Global
 		{45F81F4E-0D1B-4671-880E-C89B9FACB1E5}.Release|x64.Build.0 = Release|x64
 		{45F81F4E-0D1B-4671-880E-C89B9FACB1E5}.Release|x86.ActiveCfg = Release|Win32
 		{45F81F4E-0D1B-4671-880E-C89B9FACB1E5}.Release|x86.Build.0 = Release|Win32
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Debug|x64.ActiveCfg = Debug|x64
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Debug|x64.Build.0 = Debug|x64
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Debug|x86.ActiveCfg = Debug|Win32
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Debug|x86.Build.0 = Debug|Win32
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Release|x64.ActiveCfg = Release|x64
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Release|x64.Build.0 = Release|x64
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Release|x86.ActiveCfg = Release|Win32
+		{72D4D70F-F885-40F1-BFCD-F9F2E3E4AA10}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

hr-cpp/arch-demo/controller/sample/SampleController.cpp

@@ -19,17 +19,19 @@
 #include "stdafx.h"
 #include "SampleController.h"
 #include "../../service/sample/SampleService.h"
-
+//Ҫ�����ݽ��в���������ʹ�� ���� dto
+//Ҫ�����ݽ��в�ѯ��ʹ�� ���� query
 SamplePageJsonVO::Wrapper SampleController::execQuerySample(const SampleQuery::Wrapper& query, const PayloadDTO& payload)
 {
 	// ����һ��Service
 	SampleService service;
 	// ��ѯ����
-	auto result = service.listAll(query);
+	auto result = service.listAll(query);//�õ���ѯ�Ľ��--������㼶��Ӧ�Ľ��
 	// ��Ӧ���
-	auto jvo = SamplePageJsonVO::createShared();
-	jvo->success(result);
+	auto jvo = SamplePageJsonVO::createShared();//
+	jvo->success(result);//���õ��Ľ��������һ�εķ�װ ���ظ���һ��
 	return jvo;
+	//controller ��  ����ʾ�㷵�ص����ݶ��� jvo    
 }
 
 Uint64JsonVO::Wrapper SampleController::execAddSample(const SampleDTO::Wrapper& dto)

hr-cpp/arch-demo/controller/sample/SampleController.h

@@ -55,11 +55,12 @@ namespace multipart = oatpp::web::mime::multipart;
 		// �����ҳ��������
 		API_DEF_ADD_PAGE_PARAMS();
 		// ��������������������
-		info->queryParams.add<String>("name").description = ZH_WORDS_GETTER("sample.field.name");
-		info->queryParams["name"].addExample("default", String("li ming"));
-		info->queryParams["name"].required = false;
-		info->queryParams.add<String>("sex").description = ZH_WORDS_GETTER("sample.field.sex");
-		info->queryParams["sex"].addExample("default", String("N"));
+		info->queryParams.add<String>("name").description = ZH_WORDS_GETTER("sample.field.name");//description ���������ڴ��в��� ��sample.field.name�� ӳ��ij�������
+		info->queryParams["name"].addExample("default", String("li ming"));//��name����ӿ�һ��Ĭ��ֵ
+		info->queryParams["name"].required = false;//���õ��Dz�������-
+
+		info->queryParams.add<String>("sex").description = ZH_WORDS_GETTER("sample.field.sex");//��ѯ�ֵ�---ӳ���ѯ
+		info->queryParams["sex"].addExample("default", String("N"));//���ӿ�һ��Ĭ�ϲ���
 		info->queryParams["sex"].required = false;
 	}
 	// 3.2 �����ѯ�ӿڴ���
@@ -81,6 +82,7 @@ namespace multipart = oatpp::web::mime::multipart;
 		// ��Ӧ���
 		API_HANDLER_RESP_VO(execAddSample(dto));
 	}
+
 	// 3.1 �����޸Ľӿ�����
 	ENDPOINT_INFO(modifySample) {
 		// ����ӿڱ���
@@ -93,6 +95,7 @@ namespace multipart = oatpp::web::mime::multipart;
 		// ��Ӧ���
 		API_HANDLER_RESP_VO(execModifySample(dto));
 	}
+
 	// 3.1 ����ɾ���ӿ�����
 	ENDPOINT_INFO(removeSample) {
 		// ����ӿڱ���

hr-cpp/arch-demo/controller/user/UserController.cpp

@@ -44,7 +44,7 @@ UserPageJsonVO::Wrapper UserController::executeQueryAll(const UserQuery::Wrapper
 	page->calcPages();
 
 	// ģ������ҳ����
-	int64_t start = (page->pageIndex.getValue(1) - 1) * page->pageSize.getValue(1);
+	int64_t start = (page->pageIndex.getValue(1) - 1) * page->pageSize.getValue(1);//��sql ��� select * from ���� limit (ҳ����-1) * ��¼�� ���� ӳ���ϵ
 	int64_t end = start + page->pageSize.getValue(1);
 	// �߽�ֵֵ����
 	if (start >= page->total.getValue(0) || start < 0) {

hr-cpp/arch-demo/dao/sample/SampleDAO.cpp

@@ -38,7 +38,7 @@ if (query->age) { \
 	SQLPARAMS_PUSH(params, "i", int, query->age.getValue(0)); \
 }
 
-uint64_t SampleDAO::count(const SampleQuery::Wrapper & query)
+uint64_t SampleDAO::count(const SampleQuery::Wrapper & query)//��װ��sql��� ��count ������C++��װ
 {
 	stringstream sql;
 	sql << "SELECT COUNT(*) FROM sample";
@@ -47,7 +47,7 @@ uint64_t SampleDAO::count(const SampleQuery::Wrapper & query)
 	return sqlSession->executeQueryNumerical(sqlStr, params);
 }
 
-std::list<SampleDO> SampleDAO::selectWithPage(const SampleQuery::Wrapper& query)
+std::list<SampleDO> SampleDAO::selectWithPage(const SampleQuery::Wrapper& query)//��װ��ҳ��ѯ���
 {
 	stringstream sql;
 	sql << "SELECT * FROM sample";
@@ -58,7 +58,7 @@ std::list<SampleDO> SampleDAO::selectWithPage(const SampleQuery::Wrapper& query)
 	return sqlSession->executeQuery<SampleDO, SampleMapper>(sqlStr, mapper, params);
 }
 
-std::list<SampleDO> SampleDAO::selectByName(const string& name)
+std::list<SampleDO> SampleDAO::selectByName(const string& name)//��װ �������ֵ�mql��ѯ���
 {
 	string sql = "SELECT * FROM sample WHERE `name` LIKE CONCAT('%',?,'%')";
 	SampleMapper mapper;
@@ -71,13 +71,13 @@ uint64_t SampleDAO::insert(const SampleDO& iObj)
 	return sqlSession->executeInsert(sql, "%s%s%i", iObj.getName(), iObj.getSex(), iObj.getAge());
 }
 
-int SampleDAO::update(const SampleDO& uObj)
+int SampleDAO::update(const SampleDO& uObj)//�������ݿ�洢������
 {
 	string sql = "UPDATE `sample` SET `name`=?, `sex`=?, `age`=? WHERE `id`=?";
 	return sqlSession->executeUpdate(sql, "%s%s%i%ull", uObj.getName(), uObj.getSex(), uObj.getAge(), uObj.getId());
 }
 
-int SampleDAO::deleteById(uint64_t id)
+int SampleDAO::deleteById(uint64_t id)//����id ��ɾ������
 {
 	string sql = "DELETE FROM `sample` WHERE `id`=?";
 	return sqlSession->executeUpdate(sql, "%ull", id);

hr-cpp/arch-demo/dao/sample/SampleDAO.h

@@ -26,7 +26,7 @@
 /**
  * ʾ�������ݿ����ʵ��
  */
-class SampleDAO : public BaseDAO
+class SampleDAO : public BaseDAO//ֱ�Ӻ����ݽ�����һ��
 {
 public:
 	// ͳ����������

hr-cpp/arch-demo/public/chat.html

@@ -30,7 +30,7 @@ <h1>Chat Client</h1>
     function init() {
         if (echo_websocket) return;
         let clientId = document.getElementById("clientId").value;
-        let wsUri = "ws://localhost:8090/chat?id=" + clientId;
+        let wsUri = "ws://localhost:8091/chat?id=" + clientId;
         writeToScreen("连接到" + wsUri);
         //1.创建WebSocket客户端对象
         echo_websocket = new WebSocket(wsUri);

hr-cpp/arch-demo/public/test.html

@@ -29,7 +29,7 @@
     <button onclick="uploadFileMore()">上传</button>
 
     <script>
-        let urlPrefix = "http://localhost:8090";
+        let urlPrefix = "http://localhost:8091";
         let pageIndex = 1;
         let pageSize = 2;
         let name = "李四";

hr-cpp/arch-demo/uselib/fastdfs/TestFastDfs.cpp

@@ -39,7 +39,7 @@ void TestFastDfs::testDfs(string fileName)
 #endif
 
 	//�����ϴ�
-	std::string fieldName = client.uploadFile(fileName);
+	std::string fieldName = client.uploadFile(fileName);//ѧ�����üܹ���������
 	std::cout << "upload fieldname is : " << fieldName << std::endl;
 	//��������
 	if (!fieldName.empty())

hr-cpp/hr-c1-orgmanage/CMakeLists.txt

@@ -2,6 +2,7 @@
 # 项目特定的逻辑。
 #
 cmake_minimum_required (VERSION 3.8)
+add_definitions(-std=c++11)
 
 # 设置文件名称
 set (appName hr-c1-orgmanage)

hr-cpp/lib-common/CMakeLists.txt

@@ -2,7 +2,7 @@
 # 项目特定的逻辑。
 #
 cmake_minimum_required (VERSION 3.8)
-
+add_definitions(-std=c++11)
 # 包含库目录
 include_directories ("./")
 include_directories ("include")

hr-cpp/lib-mysql/CMakeLists.txt

@@ -2,7 +2,7 @@
 # 项目特定的逻辑。
 #
 cmake_minimum_required (VERSION 3.8)
-
+add_definitions(-std=c++11)
 # 包含库目录
 include_directories ("./")
 include_directories ("include")

hr-cpp/lib-oatpp/CMakeLists.txt

@@ -2,7 +2,7 @@
 # 项目特定的逻辑。
 #
 cmake_minimum_required (VERSION 3.8)
-
+add_definitions(-std=c++11)
 # 包含库目录
 include_directories ("./")
 include_directories ("include")

hr-cpp/lib-oatpp/include/domain/vo/NoDataJsonVO.h

@@ -34,7 +34,7 @@ class NoDataJsonVO : public oatpp::DTO
 	DTO_INIT(NoDataJsonVO, DTO);
 
 	// ״̬��
-	DTO_FIELD_INFO(code) {
+	DTO_FIELD_INFO(code) {//schema �ֶ�����
 #ifndef LINUX
 		info->description = u8"״̬��";
 #else