tsurumure 8 hónapja
szülő
commit
8f57b2d129
77 módosított fájl, 30 hozzáadás és 102 törlés
  1. 0 1
      db/ai_chat.sql
  2. 0 1
      db/ai_chat_config.sql
  3. 0 1
      db/ai_chat_history.sql
  4. 0 1
      db/ai_generate_timbre.sql
  5. 0 1
      db/ai_generate_video_task.sql
  6. 0 1
      db/ai_ivh_anchor.sql
  7. 0 1
      db/ai_ivh_anchor_public.sql
  8. 0 1
      db/ai_ivh_make_broadcast_audio_task.sql
  9. 0 1
      db/ai_ivh_make_broadcast_task.sql
  10. 0 1
      db/ai_ivh_make_virtualman_task.sql
  11. 0 1
      db/ai_ivh_quota.sql
  12. 0 1
      db/ai_ivh_quota_history.sql
  13. 0 1
      db/ai_ivh_quota_order.sql
  14. 0 1
      db/ai_ivh_timbre.sql
  15. 0 1
      db/ai_ivh_timbre_emotional_category.sql
  16. 0 1
      db/ai_ivh_timbre_public.sql
  17. 0 1
      db/ai_zn_image_incantation.sql
  18. 0 1
      db/ai_zn_image_incantation_description.sql
  19. 0 1
      db/ai_zn_image_task.sql
  20. 0 1
      db/ali_dashscope_task.sql
  21. 0 1
      db/ali_dashscope_task_result.sql
  22. 0 1
      db/b2c_goods.sql
  23. 0 1
      db/b2c_goods_brand.sql
  24. 0 1
      db/b2c_goods_category.sql
  25. 0 1
      db/b2c_goods_spec.sql
  26. 0 1
      db/b2c_goods_spec_sku.sql
  27. 0 1
      db/b2c_goods_unit.sql
  28. 0 1
      db/b2c_member.sql
  29. 0 1
      db/b2c_member_recipient.sql
  30. 0 1
      db/b2c_order.sql
  31. 2 2
      db/b2c_order_snapshoot_good.sql
  32. 2 2
      db/b2c_order_snapshoot_member.sql
  33. 0 1
      db/b2c_shopping_cart.sql
  34. 0 1
      db/b2c_warehouse.sql
  35. 0 1
      db/b2c_warehouse_operation_record.sql
  36. 0 1
      db/b2c_warehouse_shelf.sql
  37. 0 1
      db/b2c_warehouse_shelf_good_relation.sql
  38. 0 1
      db/cms_article.sql
  39. 0 1
      db/cms_article_category.sql
  40. 0 1
      db/cms_article_category_i18n.sql
  41. 0 1
      db/cms_article_i18n.sql
  42. 0 1
      db/cms_banner.sql
  43. 0 1
      db/cms_banner_i18n.sql
  44. 0 1
      db/cms_navigation.sql
  45. 0 1
      db/cms_navigation_i18n.sql
  46. 0 1
      db/cms_page.sql
  47. 0 1
      db/cms_page_translations.sql
  48. 0 1
      db/cms_site_info.sql
  49. 0 1
      db/med_material.sql
  50. 0 1
      db/med_material_category.sql
  51. 0 1
      db/med_my_material.sql
  52. 0 1
      db/sys_agreement.sql
  53. 0 2
      db/sys_city.sql
  54. 0 3
      db/sys_dictionary.sql
  55. 0 1
      db/sys_file.sql
  56. 0 1
      db/sys_file_category.sql
  57. 0 1
      db/sys_language.sql
  58. 0 1
      db/sys_mobile_area_code.sql
  59. 0 1
      db/sys_queue.sql
  60. 0 1
      db/sys_resource_points.sql
  61. 0 1
      db/sys_sms.sql
  62. 0 1
      db/sys_sms_history.sql
  63. 0 1
      db/sys_upload_category.sql
  64. 0 1
      db/sys_user.sql
  65. 0 2
      db/sys_user_info.sql
  66. 0 1
      db/sys_user_points_history.sql
  67. 0 1
      db/sys_user_role.sql
  68. 3 3
      db/sys_user_role_permission.sql
  69. 1 2
      db/sys_user_role_permission_relation.sql
  70. 0 1
      db/sys_user_role_relation.sql
  71. 2 2
      src/main/java/com/backendsys/controller/Systems/SysUserRoleV1Controller.java
  72. 4 4
      src/main/java/com/backendsys/mapper/System/SysUserRoleMapper.xml
  73. 1 1
      src/main/java/com/backendsys/modules/common/utils/ResultEnum.java
  74. 10 10
      src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleV2ServiceImpl.java
  75. 2 2
      src/main/java/com/backendsys/service/System/SysUserRoleServiceImpl.java
  76. 1 2
      src/main/java/com/backendsys/utils/response/ResultEnum.java
  77. 2 2
      src/main/resources/mapper/system/SysUserRoleDao.xml

+ 0 - 1
db/ai_chat.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `ai_chat`;
-
 CREATE TABLE `ai_chat` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_chat_config.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `ai_chat_config`;
-
 CREATE TABLE `ai_chat_config` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_chat_history.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `ai_chat_history`;
-
 CREATE TABLE `ai_chat_history` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_generate_timbre.sql

@@ -5,7 +5,6 @@ Date: 2024/04/06 11:06:18
 */
 
 DROP TABLE IF EXISTS `ai_generate_video_timbre`;
-
 CREATE TABLE `ai_generate_video_timbre` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_generate_video_task.sql

@@ -5,7 +5,6 @@ Date: 2024/04/02 11:04:21
 */
 
 DROP TABLE IF EXISTS `ai_generate_video_task`;
-
 CREATE TABLE `ai_generate_video_task` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_anchor.sql

@@ -7,7 +7,6 @@ Date: 2024/03/25 14:48:02
 /* ai_person_virtualman_custom */
 
 DROP TABLE IF EXISTS `ai_ivh_anchor`;
-
 CREATE TABLE `ai_ivh_anchor` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_anchor_public.sql

@@ -7,7 +7,6 @@ Date: 2024/03/25 14:48:02
 /* ai_person_virtualman */
 
 DROP TABLE IF EXISTS `ai_ivh_anchor_public`;
-
 CREATE TABLE `ai_ivh_anchor_public` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_make_broadcast_audio_task.sql

@@ -5,7 +5,6 @@ Date: 2024/04/11 14:31:21
 */
 
 DROP TABLE IF EXISTS `ai_ivh_make_broadcast_audio_task`;
-
 CREATE TABLE `ai_ivh_make_broadcast_audio_task` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_make_broadcast_task.sql

@@ -5,7 +5,6 @@ Date: 2024/03/25 11:10:21
 */
 
 DROP TABLE IF EXISTS `ai_ivh_make_broadcast_task`;
-
 CREATE TABLE `ai_ivh_make_broadcast_task` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_make_virtualman_task.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `ai_ivh_make_virtualman_task`;
-
 CREATE TABLE `ai_ivh_make_virtualman_task` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_quota.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `ai_ivh_quota`;
-
 CREATE TABLE `ai_ivh_quota` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_quota_history.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `ai_ivh_quota_history`;
-
 CREATE TABLE `ai_ivh_quota_history` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_quota_order.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `ai_ivh_quota_order`;
-
 CREATE TABLE `ai_ivh_quota_order` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_timbre.sql

@@ -5,7 +5,6 @@ Date: 2024/03/25 14:48:02
 */
 
 DROP TABLE IF EXISTS `ai_ivh_timbre`;
-
 CREATE TABLE `ai_ivh_timbre` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_timbre_emotional_category.sql

@@ -5,7 +5,6 @@ Date: 2024/03/29 13:24:01
 */
 
 DROP TABLE IF EXISTS `ai_ivh_timbre_emotional_category`;
-
 CREATE TABLE `ai_ivh_timbre_emotional_category` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_ivh_timbre_public.sql

@@ -5,7 +5,6 @@ Date: 2024/03/25 14:48:02
 */
 
 DROP TABLE IF EXISTS `ai_ivh_timbre_public`;
-
 CREATE TABLE `ai_ivh_timbre_public` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_zn_image_incantation.sql

@@ -5,7 +5,6 @@ Date: 2024/04/29 15:13:34
 */
 
 DROP TABLE IF EXISTS `ai_zn_image_incantation`;
-
 CREATE TABLE `ai_zn_image_incantation` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_zn_image_incantation_description.sql

@@ -5,7 +5,6 @@ Date: 2024/04/29 15:13:34
 */
 
 DROP TABLE IF EXISTS `ai_zn_image_incantation_description`;
-
 CREATE TABLE `ai_zn_image_incantation_description` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ai_zn_image_task.sql

@@ -5,7 +5,6 @@ Date: 2024/04/27 10:12:01
 */
 
 DROP TABLE IF EXISTS `ai_zn_image_task`;
-
 CREATE TABLE `ai_zn_image_task` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ali_dashscope_task.sql

@@ -5,7 +5,6 @@ Date: 2024/03/12 14:32:14
 */
 
 DROP TABLE IF EXISTS `ali_dashscope_task`;
-
 CREATE TABLE `ali_dashscope_task` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/ali_dashscope_task_result.sql

@@ -5,7 +5,6 @@ Date: 2024/03/12 14:32:14
 */
 
 DROP TABLE IF EXISTS `ali_dashscope_task_result`;
-
 CREATE TABLE `ali_dashscope_task_result` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_goods.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_goods`;
-
 CREATE TABLE `b2c_goods` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_goods_brand.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_goods_brand`;
-
 CREATE TABLE `b2c_goods_brand` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_goods_category.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_goods_category`;
-
 CREATE TABLE `b2c_goods_category` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_goods_spec.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_goods_spec`;
-
 CREATE TABLE `b2c_goods_spec` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_goods_spec_sku.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_goods_spec_sku`;
-
 CREATE TABLE `b2c_goods_spec_sku` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_goods_unit.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_goods_unit`;
-
 CREATE TABLE `b2c_goods_unit` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_member.sql

@@ -5,7 +5,6 @@ Date: 2023/11/26 08:05:21
 */
 
 DROP TABLE IF EXISTS `b2c_member`;
-
 CREATE TABLE `b2c_member` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT,

+ 0 - 1
db/b2c_member_recipient.sql

@@ -5,7 +5,6 @@ Date: 2023/09/05 00:20:22
 */
 
 DROP TABLE IF EXISTS `b2c_member_recipient`;
-
 CREATE TABLE `b2c_member_recipient` (
    PRIMARY KEY (`id`),
    `id` BIGINT AUTO_INCREMENT,

+ 0 - 1
db/b2c_order.sql

@@ -5,7 +5,6 @@ Date: 2023/09/05 00:20:22
 */
 
 DROP TABLE IF EXISTS `b2c_order`;
-
 CREATE TABLE `b2c_order` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT,

+ 2 - 2
db/b2c_order_snapshoot_good.sql

@@ -4,9 +4,9 @@ Source Database: backendsys
 Date: 2023/09/05 00:20:22
 */
 
-DROP TABLE IF EXISTS `b2c_order_snapshoot_good`;
-
 # 一个订单对应多个商品规格,一条记录显示一个规格信息
+
+DROP TABLE IF EXISTS `b2c_order_snapshoot_good`;
 CREATE TABLE `b2c_order_snapshoot_good` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT,

+ 2 - 2
db/b2c_order_snapshoot_member.sql

@@ -4,9 +4,9 @@ Source Database: backendsys
 Date: 2023/09/05 00:20:22
 */
 
-DROP TABLE IF EXISTS `b2c_order_snapshoot_member`;
-
 # 一个订单对应一个用户信息
+
+DROP TABLE IF EXISTS `b2c_order_snapshoot_member`;
 CREATE TABLE `b2c_order_snapshoot_member` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT,

+ 0 - 1
db/b2c_shopping_cart.sql

@@ -5,7 +5,6 @@ Date: 2023/12/16 16:26:13
 */
 
 DROP TABLE IF EXISTS `b2c_shopping_cart`;
-
 CREATE TABLE `b2c_shopping_cart` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT,

+ 0 - 1
db/b2c_warehouse.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_warehouse`;
-
 CREATE TABLE `b2c_warehouse` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_warehouse_operation_record.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_warehouse_operation_record`;
-
 CREATE TABLE `b2c_warehouse_operation_record` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_warehouse_shelf.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_warehouse_shelf`;
-
 CREATE TABLE `b2c_warehouse_shelf` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/b2c_warehouse_shelf_good_relation.sql

@@ -5,7 +5,6 @@ Date: 2023/08/18 12:51:10
 */
 
 DROP TABLE IF EXISTS `b2c_warehouse_shelf_good_relation`;
-
 CREATE TABLE `b2c_warehouse_shelf_good_relation` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_article.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `cms_article`;
-
 CREATE TABLE `cms_article` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_article_category.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `cms_article_category`;
-
 CREATE TABLE `cms_article_category` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_article_category_i18n.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `cms_article_category_i18n`;
-
 CREATE TABLE `cms_article_category_i18n` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_article_i18n.sql

@@ -1,5 +1,4 @@
 DROP TABLE IF EXISTS `cms_article_i18n`;
-
 CREATE TABLE `cms_article_i18n` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_banner.sql

@@ -5,7 +5,6 @@ Date: 2023/12/08 21:00:15
 */
 
 DROP TABLE IF EXISTS `cms_banner`;
-
 CREATE TABLE `cms_banner` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_banner_i18n.sql

@@ -5,7 +5,6 @@ Date: 2023/12/08 21:00:15
 */
 
 DROP TABLE IF EXISTS `cms_banner_i18n`;
-
 CREATE TABLE `cms_banner_i18n` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_navigation.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `cms_navigation`;
-
 CREATE TABLE `cms_navigation` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_navigation_i18n.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `cms_navigation_i18n`;
-
 CREATE TABLE `cms_navigation_i18n` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_page.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `cms_page`;
-
 CREATE TABLE `cms_page` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_page_translations.sql

@@ -1,5 +1,4 @@
 DROP TABLE IF EXISTS `cms_page_translations`;
-
 CREATE TABLE `cms_page_translations` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/cms_site_info.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `cms_site_info`;
-
 CREATE TABLE `cms_site_info` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/med_material.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `med_material`;
-
 CREATE TABLE `med_material` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/med_material_category.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `med_material_category`;
-
 CREATE TABLE `med_material_category` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/med_my_material.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `med_my_material`;
-
 CREATE TABLE `med_my_material` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_agreement.sql

@@ -5,7 +5,6 @@ Date: 2024/06/16 01:37:21
 */
 
 DROP TABLE IF EXISTS `sys_agreement`;
-
 CREATE TABLE `sys_agreement` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 2
db/sys_city.sql

@@ -5,7 +5,6 @@ Date: 2024/06/12 16:59:21
 */
 
 DROP TABLE IF EXISTS `sys_city`;
-
 CREATE TABLE `sys_city` (
     `code` VARCHAR(255) NOT NULL COMMENT '地区代码',
     `name` VARCHAR(255) NOT NULL COMMENT '地区名称',
@@ -15,7 +14,6 @@ CREATE TABLE `sys_city` (
     INDEX `parent_code` (`parent_code`)
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='省市区域信息表';
 
-
 INSERT INTO `sys_city` (`code`, `name`, `parent_code`, `full_name`) VALUES
     ('110000', '北京市', '1', '北京'),
     ('110100', '北京市', '110000', '北京北京市'),

+ 0 - 3
db/sys_dictionary.sql

@@ -5,9 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_dictionary`;
-
-#     category_translation VARCHAR(50) NOT NULL COMMENT '分类翻译',
-
 CREATE TABLE `sys_dictionary` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_file.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_file`;
-
 CREATE TABLE `sys_file` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_file_category.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_file_category`;
-
 CREATE TABLE `sys_file_category` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_language.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_language`;
-
 CREATE TABLE `sys_language` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_mobile_area_code.sql

@@ -5,7 +5,6 @@ Date: 2024/04/24 18:20:21
 */
 
 DROP TABLE IF EXISTS `sys_mobile_area_code`;
-
 CREATE TABLE `sys_mobile_area_code` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_queue.sql

@@ -5,7 +5,6 @@ Date: 2023-12-30 12:49:53
 */
 
 DROP TABLE IF EXISTS `sys_queue`;
-
 CREATE TABLE `sys_queue` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_resource_points.sql

@@ -5,7 +5,6 @@ Date: 2024/04/09 11:21:58
 */
 
 DROP TABLE IF EXISTS `sys_resource_points`;
-
 CREATE TABLE `sys_resource_points` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_sms.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_sms`;
-
 CREATE TABLE `sys_sms` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_sms_history.sql

@@ -7,7 +7,6 @@
 # /* 即将弃用 */
 #
 # DROP TABLE IF EXISTS `sys_mobile_sms_history`;
-#
 # CREATE TABLE `sys_mobile_sms_history` (
 #     PRIMARY KEY (`id`),
 #     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_upload_category.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_upload_category`;
-
 CREATE TABLE `sys_upload_category` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_user.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_user`;
-
 CREATE TABLE `sys_user` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 2
db/sys_user_info.sql

@@ -5,8 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_user_info`;
-
-/* `role_ids` VARCHAR(256) NOT NULL COMMENT '角色ID (多个,以逗号隔开)', */
 CREATE TABLE `sys_user_info` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_user_points_history.sql

@@ -5,7 +5,6 @@ Date: 2024/04/09 11:21:58
 */
 
 DROP TABLE IF EXISTS `sys_user_points_history`;
-
 CREATE TABLE `sys_user_points_history` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 0 - 1
db/sys_user_role.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_user_role`;
-
 CREATE TABLE `sys_user_role` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 3 - 3
db/sys_user_role_permission.sql

@@ -8,8 +8,8 @@ DROP TABLE IF EXISTS `sys_user_role_permission`;
 CREATE TABLE `sys_user_role_permission` (
     PRIMARY KEY (`id`),
     `id` VARCHAR(10) NOT NULL COMMENT 'ID',
-    `parent_id` VARCHAR(10) COMMENT '父级模块ID (-1为没有父级)',
-    `permission_name` VARCHAR(50) NOT NULL COMMENT '模块名称',
+    `parent_id` VARCHAR(10) COMMENT '父级权限ID (-1为没有父级)',
+    `permission_name` VARCHAR(50) NOT NULL COMMENT '权限名称',
     `sort` INT COMMENT '排序'
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COMMENT='系统角色权限表';
 
@@ -72,7 +72,7 @@ INSERT INTO sys_user_role_permission(id, parent_id, permission_name, sort) VALUE
             ('4.1.2', '4.1', '系统角色-创建', null),
             ('4.1.3', '4.1', '系统角色-编辑', null),
             ('4.1.4', '4.1', '系统角色-删除', null),
-            ('4.1.5', '4.1', '系统角色-模块列表', null),
+            ('4.1.5', '4.1', '系统角色-权限列表', null),
     ('5', -1, '系统日志管理', 901),
         ('5.1', '5', '系统日志-列表', null),
 

+ 1 - 2
db/sys_user_role_permission_relation.sql

@@ -5,12 +5,11 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_user_role_permission_relation`;
-
 CREATE TABLE `sys_user_role_permission_relation` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',
     `role_id` BIGINT NOT NULL COMMENT '角色ID',
-    `permission_id` VARCHAR(10) NOT NULL COMMENT '模块ID',
+    `permission_id` VARCHAR(10) NOT NULL COMMENT '权限ID',
     INDEX `idx_role_id` (`role_id`)
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='系统角色权限关系表';
 

+ 0 - 1
db/sys_user_role_relation.sql

@@ -5,7 +5,6 @@ Date: 2023/05/23 17:09:22
 */
 
 DROP TABLE IF EXISTS `sys_user_role_relation`;
-
 CREATE TABLE `sys_user_role_relation` (
     PRIMARY KEY (`id`),
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'ID',

+ 2 - 2
src/main/java/com/backendsys/controller/Systems/SysUserRoleV1Controller.java

@@ -56,7 +56,7 @@
 ////    public Result createUserRole(@Validated(SysUserRoleDTO.Create.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
 ////        // 判断 role.modules 是否重复
 ////        if (hasDuplicateIds(sysUserRoleDTO.getModules())) {
-////            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "模块ID出现重复值");
+////            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "权限ID出现重复值");
 ////        }
 ////        // 创建
 ////        return Result.success(sysUserRoleService.insertUserRole(sysUserRoleDTO), "创建成功");
@@ -69,7 +69,7 @@
 ////    public Result updateUserRole(@Validated(SysUserRoleDTO.Update.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
 ////        // 判断 role.modules 是否重复
 ////        if (hasDuplicateIds(sysUserRoleDTO.getModules())) {
-////            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "模块ID出现重复值");
+////            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "权限ID出现重复值");
 ////        }
 ////        // 更新
 ////        return Result.success(sysUserRoleService.updateUserRole(sysUserRoleDTO), "更新成功");

+ 4 - 4
src/main/java/com/backendsys/mapper/System/SysUserRoleMapper.xml

@@ -40,7 +40,7 @@
 <!--            <result property="module_name" column="module_name" />-->
 <!--        </collection>-->
 <!--    </resultMap>-->
-<!--    &lt;!&ndash; [嵌套查询] 查询角色下的全部模块 &ndash;&gt;-->
+<!--    &lt;!&ndash; [嵌套查询] 查询角色下的全部权限 &ndash;&gt;-->
 <!--    &lt;!&ndash;um.module_code,&ndash;&gt;-->
 <!--    <select id="queryModulesByRoleId" resultType="java.util.LinkedHashMap">-->
 <!--        SELECT-->
@@ -102,7 +102,7 @@
 <!--            <if test="status != null">, #{status}</if>-->
 <!--        )-->
 <!--    </insert>-->
-<!--    &lt;!&ndash; 创建 用户角色 对应的 模块关系 &ndash;&gt;-->
+<!--    &lt;!&ndash; 创建 用户角色 对应的 权限关系 &ndash;&gt;-->
 <!--    <insert id="insertUserRolePermissionRelation" parameterType="com.backendsys.entity.System.SysUserRoleDTO">-->
 <!--        INSERT INTO sys_user_role_module_relation (role_id, module_id)-->
 <!--        VALUES-->
@@ -123,7 +123,7 @@
 <!--        </trim>-->
 <!--        WHERE id = #{role_id}-->
 <!--    </update>-->
-<!--    &lt;!&ndash; 编辑 用户角色 对应的 模块关系&ndash;&gt;-->
+<!--    &lt;!&ndash; 编辑 用户角色 对应的 权限关系&ndash;&gt;-->
 <!--    <update id="updateUserRolePermissionRelation" parameterType="com.backendsys.entity.System.SysUserRoleDTO">-->
 <!--        &lt;!&ndash;删除符合条件的数据&ndash;&gt;-->
 <!--        DELETE FROM sys_user_role_module_relation WHERE role_id = #{role_id};-->
@@ -137,7 +137,7 @@
 <!--        </if>-->
 <!--    </update>-->
 
-<!--    &lt;!&ndash; 删除 用户角色 (同时删除模块关系) &ndash;&gt;-->
+<!--    &lt;!&ndash; 删除 用户角色 (同时删除权限关系) &ndash;&gt;-->
 <!--    <delete id="deleteUserRole" parameterType="java.lang.Long">-->
 <!--        DELETE FROM sys_user_role WHERE id = #{role_id};-->
 <!--        DELETE FROM sys_user_role_module_relation WHERE role_id = #{role_id};-->

+ 1 - 1
src/main/java/com/backendsys/modules/common/utils/ResultEnum.java

@@ -14,7 +14,7 @@ public enum ResultEnum {
     AUTH_ROLE_ERROR(403, "该用户角色没有访问权限"),
     AUTH_USER_ERROR(403, "该用户不可操作"),
     /**
-     * 用户模块枚举
+     * 用户权限枚举
      */
 
     TOKEN_EMPTY_ERROR(401, "请先登录以获取有效的Token"),

+ 10 - 10
src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleV2ServiceImpl.java

@@ -51,13 +51,13 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
         Long count = sysUserRoleRelationDao.selectCount(queryWrapper);
         roleDetail.setUser_count(Convert.toInt(count));
 
-        // 查询角色对应的模块
-        List<SysUserRolePermission> modules = sysUserRolePermissionRelationDao.selectUserRolePermissionByRoleId(role_id);
+        // 查询角色对应的权限
+        List<SysUserRolePermission> permissions = sysUserRolePermissionRelationDao.selectUserRolePermissionByRoleId(role_id);
 
-        System.out.println("modules:");
-        System.out.println(modules);
+        System.out.println("permissions:");
+        System.out.println(permissions);
 
-        roleDetail.setPermissions(modules);
+        roleDetail.setPermissions(permissions);
 
         return roleDetail;
     }
@@ -69,12 +69,12 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
         // 判断 modules 是否重复
         List<String> permissionIds = sysUserRole.getPermission_ids();
         if (CollUtil.isNotEmpty(permissionIds) && permissionIds.size() != CollUtil.distinct(permissionIds).size()) {
-            throw new CustException("模块ID出现重复值");
+            throw new CustException("权限ID出现重复值");
         }
 
         // 创建角色
         sysUserRoleDao.insertUserRole(sysUserRole);
-        // 创建角色与模块关系
+        // 创建角色与权限关系
         sysUserRoleDao.insertUserRolePermissionRelation(sysUserRole);
 
         return Map.of("role_id", sysUserRole.getId());
@@ -87,7 +87,7 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
         // 判断 modules 是否重复
         List<String> permissionIds = sysUserRole.getPermission_ids();
         if (CollUtil.isNotEmpty(permissionIds) && permissionIds.size() != CollUtil.distinct(permissionIds).size()) {
-            throw new CustException("模块ID出现重复值");
+            throw new CustException("权限ID出现重复值");
         }
 
         SysUserRole detail = sysUserRoleDao.selectById(sysUserRole.getRole_id());
@@ -95,7 +95,7 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
 
         // 更新角色
         sysUserRoleDao.updateUserRole(sysUserRole);
-        // 更新角色与模块关系 (需要先删除全部,再重新插入)
+        // 更新角色与权限关系 (需要先删除全部,再重新插入)
         sysUserRoleDao.updateUserRolePermissionRelation(sysUserRole);
 
         return Map.of("role_id", sysUserRole.getRole_id());
@@ -115,7 +115,7 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
 
         // 删除角色
         sysUserRoleDao.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRole_id, role_id));
-        // 删除角色与模块关系
+        // 删除角色与权限关系
         sysUserRolePermissionRelationDao.delete(new LambdaQueryWrapper<SysUserRolePermissionRelation>().eq(SysUserRolePermissionRelation::getRole_id, role_id));
 
         return Map.of("role_id", sysUserRole.getRole_id());

+ 2 - 2
src/main/java/com/backendsys/service/System/SysUserRoleServiceImpl.java

@@ -71,7 +71,7 @@
 //
 //        // 创建角色
 //        sysUserRoleMapper.insertUserRole(sysUserRoleDTO);
-//        // 创建角色与模块关系
+//        // 创建角色与权限关系
 //        sysUserRoleMapper.insertUserRolePermissionRelation(sysUserRoleDTO);
 //        return Map.of("role_id", sysUserRoleDTO.getId());
 //    }
@@ -91,7 +91,7 @@
 //
 //        // 更新角色
 //        sysUserRoleMapper.updateUserRole(sysUserRoleDTO);
-//        // 更新角色与模块关系 (需要先删除全部,再重新插入)
+//        // 更新角色与权限关系 (需要先删除全部,再重新插入)
 //        sysUserRoleMapper.updateUserRolePermissionRelation(sysUserRoleDTO);
 //
 //        return Map.of("role_id", sysUserRoleDTO.getRole_id());

+ 1 - 2
src/main/java/com/backendsys/utils/response/ResultEnum.java

@@ -14,9 +14,8 @@ public enum ResultEnum {
     AUTH_ROLE_ERROR(403, "该用户角色没有访问权限"),
     AUTH_USER_ERROR(403, "该用户不可操作"),
     /**
-     * 用户模块枚举
+     * 用户权限枚举
      */
-
     TOKEN_EMPTY_ERROR(401, "请先登录以获取有效的Token"),
     INVALID_CREDENTIALS(402, "用户名或密码错误"),
     LOCK_CREDENTIALS(4024, "错误次数过多,为账号安全,请等待1分钟后重新尝试"),

+ 2 - 2
src/main/resources/mapper/system/SysUserRoleDao.xml

@@ -63,7 +63,7 @@
             <if test="status != null">, #{status}</if>
         )
     </insert>
-    <!-- 创建 用户角色 对应的 模块关系 -->
+    <!-- 创建 用户角色 对应的 权限关系 -->
     <insert id="insertUserRolePermissionRelation" parameterType="com.backendsys.entity.System.SysUserRoleDTO">
         INSERT INTO sys_user_role_permission_relation (role_id, permission_id)
         VALUES
@@ -83,7 +83,7 @@
         </trim>
         WHERE id = #{role_id}
     </update>
-    <!-- 编辑 用户角色 对应的 模块关系-->
+    <!-- 编辑 用户角色 对应的 权限关系-->
     <update id="updateUserRolePermissionRelation" parameterType="com.backendsys.entity.System.SysUserRoleDTO">
         <!--删除符合条件的数据-->
         DELETE FROM sys_user_role_permission_relation WHERE role_id = #{role_id};