diff --git "a/documents/01\343\200\201\351\241\271\347\233\256\350\256\241\345\210\222/\347\211\210\346\234\254\350\256\241\345\210\222.emmx" "b/documents/01\343\200\201\351\241\271\347\233\256\350\256\241\345\210\222/\347\211\210\346\234\254\350\256\241\345\210\222.emmx" index 510b8c383..b3972b6af 100644 Binary files "a/documents/01\343\200\201\351\241\271\347\233\256\350\256\241\345\210\222/\347\211\210\346\234\254\350\256\241\345\210\222.emmx" and "b/documents/01\343\200\201\351\241\271\347\233\256\350\256\241\345\210\222/\347\211\210\346\234\254\350\256\241\345\210\222.emmx" differ diff --git a/hr-cpp/CMakeLists.txt b/hr-cpp/CMakeLists.txt index c2d7c52c1..06301ed1d 100644 --- a/hr-cpp/CMakeLists.txt +++ b/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") diff --git a/hr-cpp/HrCpp.sln b/hr-cpp/HrCpp.sln index 07d85bc7c..4ba39f67d 100644 --- a/hr-cpp/HrCpp.sln +++ b/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 diff --git a/hr-cpp/arch-demo/controller/sample/SampleController.cpp b/hr-cpp/arch-demo/controller/sample/SampleController.cpp index 553881be6..ebd4a1bcb 100644 --- a/hr-cpp/arch-demo/controller/sample/SampleController.cpp +++ b/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) diff --git a/hr-cpp/arch-demo/controller/sample/SampleController.h b/hr-cpp/arch-demo/controller/sample/SampleController.h index d0740cd87..1db8e183b 100644 --- a/hr-cpp/arch-demo/controller/sample/SampleController.h +++ b/hr-cpp/arch-demo/controller/sample/SampleController.h @@ -55,11 +55,12 @@ class SampleController : public oatpp::web::server::api::ApiController // 1 // ҳ API_DEF_ADD_PAGE_PARAMS(); // - info->queryParams.add("name").description = ZH_WORDS_GETTER("sample.field.name"); - info->queryParams["name"].addExample("default", String("li ming")); - info->queryParams["name"].required = false; - info->queryParams.add("sex").description = ZH_WORDS_GETTER("sample.field.sex"); - info->queryParams["sex"].addExample("default", String("N")); + info->queryParams.add("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("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 @@ class SampleController : public oatpp::web::server::api::ApiController // 1 // Ӧ API_HANDLER_RESP_VO(execAddSample(dto)); } + // 3.1 ޸Ľӿ ENDPOINT_INFO(modifySample) { // ӿڱ @@ -93,6 +95,7 @@ class SampleController : public oatpp::web::server::api::ApiController // 1 // Ӧ API_HANDLER_RESP_VO(execModifySample(dto)); } + // 3.1 ɾӿ ENDPOINT_INFO(removeSample) { // ӿڱ diff --git a/hr-cpp/arch-demo/controller/user/UserController.cpp b/hr-cpp/arch-demo/controller/user/UserController.cpp index 577c49651..901fafe6f 100644 --- a/hr-cpp/arch-demo/controller/user/UserController.cpp +++ b/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) { diff --git a/hr-cpp/arch-demo/dao/sample/SampleDAO.cpp b/hr-cpp/arch-demo/dao/sample/SampleDAO.cpp index 7bf37bce9..19c3485d6 100644 --- a/hr-cpp/arch-demo/dao/sample/SampleDAO.cpp +++ b/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 SampleDAO::selectWithPage(const SampleQuery::Wrapper& query) +std::list SampleDAO::selectWithPage(const SampleQuery::Wrapper& query)//װҳѯ { stringstream sql; sql << "SELECT * FROM sample"; @@ -58,7 +58,7 @@ std::list SampleDAO::selectWithPage(const SampleQuery::Wrapper& query) return sqlSession->executeQuery(sqlStr, mapper, params); } -std::list SampleDAO::selectByName(const string& name) +std::list 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); diff --git a/hr-cpp/arch-demo/dao/sample/SampleDAO.h b/hr-cpp/arch-demo/dao/sample/SampleDAO.h index 20d5ead62..31a67ea98 100644 --- a/hr-cpp/arch-demo/dao/sample/SampleDAO.h +++ b/hr-cpp/arch-demo/dao/sample/SampleDAO.h @@ -26,7 +26,7 @@ /** * ʾݿʵ */ -class SampleDAO : public BaseDAO +class SampleDAO : public BaseDAO//ֱӺݽһ { public: // ͳ diff --git a/hr-cpp/arch-demo/public/chat.html b/hr-cpp/arch-demo/public/chat.html index 795ea0a56..f00eb6bc6 100644 --- a/hr-cpp/arch-demo/public/chat.html +++ b/hr-cpp/arch-demo/public/chat.html @@ -30,7 +30,7 @@

Chat Client

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); diff --git a/hr-cpp/arch-demo/public/test.html b/hr-cpp/arch-demo/public/test.html index 3ea030e82..cdcecf428 100644 --- a/hr-cpp/arch-demo/public/test.html +++ b/hr-cpp/arch-demo/public/test.html @@ -29,7 +29,7 @@