feat: 提交PG数据库配置，大致功能划分菜单配置 #3387
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Caution Review failedThe pull request is closed. WalkthroughThe pull request involves modifications to the Changes
Poem
📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
审阅者指南 by Sourcery此拉取请求引入了系统的全面菜单配置，包括系统管理、物联网管理、权限控制、租户管理、基础数据和对象存储。还包括子菜单及其关联权限的配置。 菜单结构的实体关系图erDiagram
MENU ||--o{ MENU : contains
MENU {
int id
int creator
int editor
datetime create_time
datetime update_time
int del_flag
int version
int tenant_id
int pid
string permission
int type
string name
string path
string icon
int sort
int status
}
文件级变更
提示和命令与Sourcery交互
自定义您的体验访问您的仪表板以：
获取帮助Original review guide in EnglishReviewer's Guide by SourceryThis pull request introduces a comprehensive menu configuration for the system, encompassing system management, IoT management, permission control, tenant management, basic data, and object storage. It also includes the configuration of submenus and their associated permissions. Entity relationship diagram for menu structureerDiagram
MENU ||--o{ MENU : contains
MENU {
int id
int creator
int editor
datetime create_time
datetime update_time
int del_flag
int version
int tenant_id
int pid
string permission
int type
string name
string path
string icon
int sort
int status
}
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
嘿 @KouShenhai - 我已经审查了你的更改，看起来非常棒！
以下是我在审查期间查看的内容
- 🟡 一般性问题：发现1个问题
- 🟢 安全性：一切看起来都很好
- 🟢 测试：一切看起来都很好
- 🟢 复杂性：一切看起来都很好
- 🟢 文档：一切看起来都很好
帮助我变得更有用！请在每条评论上点击 👍 或 👎，我将使用这些反馈来改进你的评论。
Original comment in English
Hey @KouShenhai - I've reviewed your changes and they look great!
Here's what I looked at during the review
- 🟡 General issues: 1 issue found
- 🟢 Security: all looks good
- 🟢 Testing: all looks good
- 🟢 Complexity: all looks good
- 🟢 Documentation: all looks good
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
| INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (13, 1, 1, '2025-01-18 09:26:17', '2025-01-18 09:26:20', 0, 0, 0, 0, NULL, 0, '物联管理', '/iot', 'RobotOutlined', 80000, 0); | ||
| INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (14, 1, 1, '2025-01-18 09:28:42', '2025-01-18 09:28:44', 0, 0, 0, 13, NULL, 0, '设备管理', '/iot/device', NULL, 1000, 0); | ||
| INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (15, 1, 1, '2025-01-18 09:30:03', '2025-01-18 09:30:05', 0, 0, 0, 14, NULL, 0, '设备', '/iot/device/index', NULL, 900, 0); | ||
| INSERT INTO "public"."boot_sys_menu" ("id", "creator", "editor", "create_time", "update_time", "del_flag", "version", "tenant_id", "pid", "permission", "type", "name", "path", "icon", "sort", "status") VALUES (14, 1, 1, '2025-01-18 09:28:42', '2025-01-18 09:28:44', 0, 0, 0, 13, NULL, 0, '设备管理', '/iot/device', NULL, 5000, 0); |
There was a problem hiding this comment.
建议： 考虑在菜单层次结构中标准化排序值的编号方案
当前的排序值似乎不一致 - 例如，ID 14 的 sort=5000，而其子项 ID 15 的 sort=100。建议使用系统化的方法，其中父项使用千位数（1000、2000等），子项使用父项范围内的百位数（1100、1200等）。这将使菜单结构更易于维护和修改。
建议的实现：
VALUES (13, 1, 1, '2025-01-18 09:26:17', '2025-01-18 09:26:20', 0, 0, 0, 0, NULL, 0, '物联管理', '/iot', 'RobotOutlined', 8000, 0);
VALUES (14, 1, 1, '2025-01-18 09:28:42', '2025-01-18 09:28:44', 0, 0, 0, 13, NULL, 0, '设备管理', '/iot/device', NULL, 8100, 0);
VALUES (15, 1, 1, '2025-01-18 09:30:03', '2025-01-18 09:30:05', 0, 0, 0, 14, NULL, 0, '设备', '/iot/device/index', NULL, 8110, 0);
VALUES (16, 1, 1, '2025-01-18 09:37:53', '2025-01-18 09:37:55', 0, 0, 0, 14, NULL, 0, '物模型', '/iot/device/thingModel', NULL, 8140, 0);
VALUES (17, 1, 1, '2025-01-18 09:38:58', '2025-01-18 09:39:00', 0, 0, 0, 14, NULL, 0, '产品', '/iot/device/product', NULL, 8130, 0);
VALUES (18, 1, 1, '2025-01-18 09:39:31', '2025-01-18 09:39:34', 0, 0, 0, 14, NULL, 0, '产品类别', '/iot/device/productCategory', NULL, 8120, 0);
VALUES (19, 1, 1, '2025-01-21 05:15:10', '2025-01-21 05:15:13', 0, 0, 0, 13, NULL, 0, '协议管理', '/iot/protocol', NULL, 8200, 0);
VALUES (20, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 19, NULL, 0, '通讯协议', '/iot/protocol/communication', NULL, 8210, 0);
VALUES (21, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 19, NULL, 0, '传输协议', '/iot/protocol/transport', NULL, 8220, 0);
VALUES (22, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 1, NULL, 0, '权限管理', '/sys/permission', NULL, 1500, 0);
VALUES (23, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 22, NULL, 0, '菜单', '/sys/permission/menu', NULL, 1590, 0);
VALUES (24, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 22, NULL, 0, '部门', '/sys/permission/dept', NULL, 1580, 0);
注意：系统中似乎还有其他菜单项（ID 1-12）没有在此代码片段中显示。为了完全保持一致性，这些项目的排序值也应该按照相同的方案更新：
- 顶级项目（pid=0）：使用千位数（1000、2000等）
- 二级项目：使用父项范围内的百位数（1100、1200等）
- 三级项目：使用父项范围内的十位数（1110、1120等）
Original comment in English
suggestion: Consider standardizing the sort value numbering scheme across the menu hierarchy
The current sort values appear inconsistent - for example ID 14 has sort=5000 while its child ID 15 has sort=100. Consider using a systematic approach where parent items use thousands (1000, 2000, etc) and children use hundreds within their parent's range (1100, 1200, etc). This would make the menu structure easier to maintain and modify.
Suggested implementation:
VALUES (13, 1, 1, '2025-01-18 09:26:17', '2025-01-18 09:26:20', 0, 0, 0, 0, NULL, 0, '物联管理', '/iot', 'RobotOutlined', 8000, 0);
VALUES (14, 1, 1, '2025-01-18 09:28:42', '2025-01-18 09:28:44', 0, 0, 0, 13, NULL, 0, '设备管理', '/iot/device', NULL, 8100, 0);
VALUES (15, 1, 1, '2025-01-18 09:30:03', '2025-01-18 09:30:05', 0, 0, 0, 14, NULL, 0, '设备', '/iot/device/index', NULL, 8110, 0);
VALUES (16, 1, 1, '2025-01-18 09:37:53', '2025-01-18 09:37:55', 0, 0, 0, 14, NULL, 0, '物模型', '/iot/device/thingModel', NULL, 8140, 0);
VALUES (17, 1, 1, '2025-01-18 09:38:58', '2025-01-18 09:39:00', 0, 0, 0, 14, NULL, 0, '产品', '/iot/device/product', NULL, 8130, 0);
VALUES (18, 1, 1, '2025-01-18 09:39:31', '2025-01-18 09:39:34', 0, 0, 0, 14, NULL, 0, '产品类别', '/iot/device/productCategory', NULL, 8120, 0);
VALUES (19, 1, 1, '2025-01-21 05:15:10', '2025-01-21 05:15:13', 0, 0, 0, 13, NULL, 0, '协议管理', '/iot/protocol', NULL, 8200, 0);
VALUES (20, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 19, NULL, 0, '通讯协议', '/iot/protocol/communication', NULL, 8210, 0);
VALUES (21, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 19, NULL, 0, '传输协议', '/iot/protocol/transport', NULL, 8220, 0);
VALUES (22, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 1, NULL, 0, '权限管理', '/sys/permission', NULL, 1500, 0);
VALUES (23, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 22, NULL, 0, '菜单', '/sys/permission/menu', NULL, 1590, 0);
VALUES (24, 1, 1, '2025-01-21 05:19:17', '2025-01-21 05:19:20', 0, 0, 0, 22, NULL, 0, '部门', '/sys/permission/dept', NULL, 1580, 0);
Note: There appear to be other menu items in the system (IDs 1-12) that aren't shown in the snippet. For complete consistency, those items' sort values should also be updated following the same scheme:
- Top level items (pid=0): Use thousands (1000, 2000, etc)
- Second level items: Use hundreds within parent's range (1100, 1200, etc)
- Third level items: Use tens within parent's range (1110, 1120, etc)
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #3387 +/- ##
=========================================
Coverage 23.74% 23.74%
Complexity 201 201
=========================================
Files 158 158
Lines 2089 2089
Branches 142 142
=========================================
Hits 496 496
Misses 1531 1531
Partials 62 62 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary by Sourcery
添加权限管理、租户管理、基础数据管理、对象存储管理和集群管理的菜单项。更新现有菜单项的排序顺序。
新功能：
Original summary in English
Summary by Sourcery
Add menu items for permission management, tenant management, basic data management, object storage management, and cluster management. Update the sort order for existing menu items.
New Features:
Summary by CodeRabbit