From fa30db43ae7311ad0cdd52d39807efbdfa9f9f39 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Fri, 2 May 2025 17:04:48 +0800 Subject: [PATCH 1/2] update README.md. --- README.en.md | 41 +++++++++------------- README.md | 47 ++++++++++---------------- topsky-hotel-management-system-web-api | 2 +- 3 files changed, 34 insertions(+), 56 deletions(-) diff --git a/README.en.md b/README.en.md index ca7e9a0..fbf221e 100644 --- a/README.en.md +++ b/README.en.md @@ -10,8 +10,6 @@

中文文档 | English Document

- - # :exclamation: Important Notice: **Note: The master branch changes with the v2.x version, which significantly differs from the v1.x version. Those interested in the v1.x version can move to the v1.x branch address**: https://gitee.com/java-and-net/TopskyHotelManagerSystem/tree/v1.x/ @@ -40,11 +38,15 @@ 4. Regarding the database script issue, please first go to the database script folder, choose either the MySQL version or PostgreSQL version folder to download the Data and Table files. In the database, execute the Table.sql first, then the Data.sql! -5. For MySQL and PostgreSQL databases: +5. This project has implemented multi-database support (mainstream) based on the SQL Sugar framework. Below is the list of currently tested and verified database compatibility tables: - 5.1 If your local database is MySQL, please pull the [MySQL special branch](https://gitee.com/java-and-net/topsky-hotel-manager-system-web-api/tree/MySQL_Version/). - - 5.2 If the local database is PostgreSQL, no changes are needed, just configure the pgsqlString constant database connection string in the Common layer’s HttpHelper. + | Database | Version | Support Create Table(Y/N) | Pass(Y/N) | + | ---------- | ---------------- | -------------------------- | ------------------------------------------------------------ | + | MariaDB | 10.11.10-MariaDB | Y | Y | + | PostgreSQL | 130020 | Y | Y | + | MySQL | 5.7+ | Y | Y | + | SQL Server | 2022 | Y | Y | + | Oracle | Unknown | N | Reference SQLSugar Document([SQLSugar](https://www.donet5.com)) | # :thought_balloon: Development Purpose: @@ -56,7 +58,7 @@ Operating System: Windows 11(x64) Development Tools: Microsoft Visual Studio 2022 (latest version of the system) -Database: PostgreSQL16 (highly recommended!) +Database: MariaDB (highly recommended!) Database Management Tools: DbGate @@ -79,7 +81,6 @@ EOM.Client.TopSkyHotelManagerSystem ├─ LICENSE ├─ README.md ├─ EOM.TSHotelManager.Common -├─ EOM.TSHotelManager.Common.Core ├─ EOM.TSHotelManager.FormUI │ ├─ .gitignore │ ├─ App.config @@ -105,23 +106,11 @@ EOM.Client.TopSkyHotelManagerSystem # :books: Summary of System Function Modules: -| Function Summary | | | | | | | -| ---------------------------------------- | -------------------------------- | -------------------------- | ---------------------------- | ---------------------------------- | ------------------ | ------------------ | -| (Front Desk) Room Management | Reserve Room | Check-in Room | Checkout Room | Switch Room | View Customer Info | Modify Room Status | -| (Front Desk) Customer Management | Display Customer Info | Search Customer Info | Add Customer | | | | -| (Front Desk) Product Consumption | Product List | Search Product Info | Product Consumption | Consumption Info | | | -| (Front Desk) Additional Features | None | | | | | | -| (Back Office) Basic Information | Position Type Maintenance | Ethnicity Type Maintenance | Education Type Maintenance | Department Information Maintenance | | | -| (Back Office) Financial Information | Employee Salary Bills | Internal Financial Bills | Hotel Profit Situation | | | | -| (Back Office) Utilities Management | Utilities Info | | | | | | -| (Back Office) Supervision and Statistics | Supervision Department Situation | | | | | | -| (Back Office) Room Management | Room Status Overview | Add New Room | | | | | -| (Back Office) Customer Management | Customer Information Management | Customer Consumption Bills | | | | | -| Function Summary (Continued) | | | | | | | -| (Back Office) HR Management | Employee Management | Announcement Logs | Upload Announcement Logs | | | | -| (Back Office) Material Management | Product Management | Warehouse Supplies | | | | | -| Employee Operation Logs | | | | | | | -| System Management | Add Administrator | Permission Assignment | Enable/Disable Administrator | | | | +| Function Summary | | | | | | | +| -------------------------------- | --------------------- | -------------------- | ------------------- | ---------------- | ------------------ | ------------------ | +| (Front Desk) Room Management | Reserve Room | Check-in Room | Checkout Room | Switch Room | View Customer Info | Modify Room Status | +| (Front Desk) Customer Management | Display Customer Info | Search Customer Info | Add Customer | | | | +| (Front Desk) Product Consumption | Product List | Search Product Info | Product Consumption | Consumption Info | | | # :family: Project Authors: @@ -141,3 +130,5 @@ EOM.Client.TopSkyHotelManagerSystem **1. Link to the PostgreSQL database through a visualization management tool, then create a new database named ‘tshoteldb’.** **2. Open the db_file.sql in the database script\PostgreSQL version folder through the visualization management tool for data table creation and data import.** + +[![java-and-net/TopskyHotelManagementSystem](https://gitee.com/java-and-net/TopskyHotelManagementSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem) diff --git a/README.md b/README.md index 4f64f6f..a060a79 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,6 @@

中文文档 | English Document

- - - - # :exclamation: 重要说明： **注意：目前master分支随v2.x版本变动而变动，v2.x版本与v1.x版本变动极大，因此想要v1.x版本的可移步至v1.x分支地址** ： https://gitee.com/java-and-net/TopskyHotelManagerSystem/tree/v1.x/ @@ -41,11 +37,15 @@ 4、关于数据库脚本问题，请先移步至数据库脚本文件夹下，选择Mysql版本或PostgreSQL版本任意文件夹下载Data和Table两个文件，再数据库中先执行Table.sql，再执行Data.sql! -5、针对MySQL和PostgreSQL数据库的说明： +5、本项目已基于SQL Sugar框架支持多数据库(主流)，以下是目前已通过测试的数据库表格： - 5.1、本地数据库若为MySQL，请拉取[MySQL专用分支](https://gitee.com/java-and-net/topsky-hotel-management-system-web-api/tree/MySQL_Version/)。 - - 5.2、本地数据库若为PostgreSQL，则无需进行任何改动，只需要在Common层对HttpHelper里的pgsqlString常量数据库连接字符串进行配置。 +| 数据库 | 版本 | 支持建库建表(Y/N) | 通过(Y/N) | +| ---------- | ---------------- | ----------------- | ---------------------------------------------------- | +| MariaDB | 10.11.10-MariaDB | Y | Y | +| PostgreSQL | 130020 | Y | Y | +| MySQL | 5.7+ | Y | Y | +| SQL Server | 2022 | Y | Y | +| Oracle | Unknown | N | 请参照SQLSugar文档([果糖网](https://www.donet5.com)) | # :thought_balloon: 开发目的： @@ -57,7 +57,7 @@ 开发工具：Microsoft Visual Studio 2022(系统最新版本) -数据库：PostgreSql16(强烈推荐！) +数据库：MariaDB(强烈推荐！) 数据库管理工具：Dbgate @@ -79,7 +79,6 @@ EOM.Client.TopskyHotelManagementSystem ├─ LICENSE ├─ README.md ├─ EOM.TopskyHotelManagementSystem.Common -├─ EOM.TopskyHotelManagementSystem.Common.Core ├─ EOM.TopskyHotelManagementSystem.FormUI │ ├─ .gitignore │ ├─ App.config @@ -104,23 +103,11 @@ EOM.Client.TopskyHotelManagementSystem # :books: 系统功能模块汇总： -| 功能汇总 | | | | | | | -| -------------- | ------------ | ------------ | ------------- | ------------ | ------------ | ------------ | -| (前台)客房管理 | 预约房间 | 入住房间 | 结算退房 | 转换房间 | 查看用户信息 | 修改房间状态 | -| (前台)用户管理 | 用户信息展示 | 搜索用户信息 | 添加客户 | | | | -| (前台)商品消费 | 商品列表 | 搜索商品信息 | 商品消费 | 消费信息 | | | -| (前台)扩展功能 | 无 | | | | | | -| (后台)基础信息 | 职位类型维护 | 民族类型维护 | 学历类型维护 | 部门信息维护 | | | -| (后台)财务信息 | 员工工资账单 | 内部财务账单 | 酒店盈利情况 | | | | -| (后台)水电管理 | 水电信息 | | | | | | -| (后台)监管统计 | 监管部门情况 | | | | | | -| (后台)客房管理 | 房态图一览 | 新增客房 | | | | | -| (后台)客户管理 | 客户信息管理 | 顾客消费账单 | | | | | -| 功能汇总(续) | | | | | | | -| (后台)人事管理 | 员工管理 | 公告日志 | 上传公告日志 | | | | -| (后台)物资管理 | 商品管理 | 仓库物资 | | | | | -| 员工操作日志 | | | | | | | -| 系统管理 | 添加管理员 | 权限分配 | 启/禁用管理员 | | | | +| 功能汇总 | | | | | | | +| -------------- | ------------ | ------------ | -------- | -------- | ------------ | ------------ | +| (前台)客房管理 | 预约房间 | 入住房间 | 结算退房 | 转换房间 | 查看用户信息 | 修改房间状态 | +| (前台)用户管理 | 用户信息展示 | 搜索用户信息 | 添加客户 | | | | +| (前台)商品消费 | 商品列表 | 搜索商品信息 | 商品消费 | 消费信息 | | | # :family: 项目作者： @@ -136,10 +123,10 @@ EOM.Client.TopskyHotelManagementSystem # :inbox_tray: 数据库运行部署(本地)： -**作者及开发团队强烈建议使用PostgreSQL数据库，安装PostgreSQL数据库并开启服务，通过可视化管理工具对数据库进行建立，可通过打开执行数据库脚本文件夹内的.sql后缀格式文件进行快速建立数据表和导入数据，执行步骤(以PostgreSQL数据库为例)：** +**作者及开发团队强烈建议使用MariaDB数据库，安装MariaDB数据库并开启服务，通过可视化管理工具对数据库进行建立，可通过打开执行数据库脚本文件夹内的.sql后缀格式文件进行快速建立数据表和导入数据，执行步骤(以MariaDB数据库为例)：** -**1、通过可视化管理工具链接PostgreSQL数据库，随后新建名为‘tshoteldb’数据库。** +**1、通过可视化管理工具链接MariaDB数据库，随后新建名为‘tshoteldb’数据库。** -**2、通过可视化管理工具打开：数据库脚本\PostgreSQL版本文件\db_file.sql进行数据表建立和数据导入。** +**2、通过可视化管理工具打开：数据库脚本\MariaDB版本\MDB_tshotel_script_table.sql以及数据库脚本\MariaDB版本\MDB_tshotel_script_data.sql进行数据表建立和数据导入。** [![java-and-net/TopskyHotelManagementSystem](https://gitee.com/java-and-net/TopskyHotelManagementSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem) \ No newline at end of file diff --git a/topsky-hotel-management-system-web-api b/topsky-hotel-management-system-web-api index b6501cf..289aea9 160000 --- a/topsky-hotel-management-system-web-api +++ b/topsky-hotel-management-system-web-api @@ -1 +1 @@ -Subproject commit b6501cf5650b3b4f08d1bcb9b5d97414dae347f1 +Subproject commit 289aea9c838711c0a652110efc499aa1762d4ef3 -- Gitee From 0208a9aeddb9c755ba166d7f67025536ed321f03 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Fri, 2 May 2025 17:04:59 +0800 Subject: [PATCH 2/2] add submodule. --- topsky-hotel-management-system-web-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topsky-hotel-management-system-web-api b/topsky-hotel-management-system-web-api index 289aea9..f3a82fb 160000 --- a/topsky-hotel-management-system-web-api +++ b/topsky-hotel-management-system-web-api @@ -1 +1 @@ -Subproject commit 289aea9c838711c0a652110efc499aa1762d4ef3 +Subproject commit f3a82fb0ed00d5562ebec272be3a675a06e24211 -- Gitee