diff --git a/schoolNewsServ/.bin/mysql/sql/createTableResource.sql b/schoolNewsServ/.bin/mysql/sql/createTableResource.sql index b9bd3e0..d561e89 100644 --- a/schoolNewsServ/.bin/mysql/sql/createTableResource.sql +++ b/schoolNewsServ/.bin/mysql/sql/createTableResource.sql @@ -2,7 +2,8 @@ use school_news; -- 资源/新闻表 DROP TABLE IF EXISTS `tb_resource`; CREATE TABLE `tb_resource` ( - `id` VARCHAR(50) NOT NULL COMMENT '资源ID', + `id` VARCHAR(50) NOT NULL COMMENT 'ID', + `resource_id` VARCHAR(50) NOT NULL COMMENT '资源ID', `title` VARCHAR(255) NOT NULL COMMENT '资源标题', `content` LONGTEXT COMMENT '资源内容', `summary` VARCHAR(500) DEFAULT NULL COMMENT '资源简介', @@ -25,6 +26,7 @@ CREATE TABLE `tb_resource` ( `delete_time` TIMESTAMP NULL DEFAULT NULL COMMENT '删除时间', `deleted` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否删除', PRIMARY KEY (`id`), + KEY `idx_resource_id` (`resource_id`), KEY `idx_category` (`category_id`), KEY `idx_status` (`status`), KEY `idx_publish_time` (`publish_time`), diff --git a/schoolNewsServ/.bin/mysql/sql/initMenuData.sql b/schoolNewsServ/.bin/mysql/sql/initMenuData.sql index 2d24095..adc1952 100644 --- a/schoolNewsServ/.bin/mysql/sql/initMenuData.sql +++ b/schoolNewsServ/.bin/mysql/sql/initMenuData.sql @@ -67,13 +67,6 @@ INSERT INTO `tb_sys_menu` (id, menu_id, name, parent_id, url, component, icon, o ('100', 'menu_home', '首页', NULL, '/home', 'home/HomeView', 'el-icon-house', 1, 1, 'NavigationLayout', '1', now()), -- 资源中心 ('200', 'menu_resource_center', '资源中心', NULL, '/resource-center', 'resource-center/ResourceCenterView', 'el-icon-folder-opened', 2, 1, 'NavigationLayout', '1', now()), -('201', 'menu_party_history', '党史学习', 'menu_resource_center', '/resource-center/party-history', 'resource-center/PartyHistoryView', 'el-icon-trophy', 1, 1, 'NavigationLayout', '1', now()), -('202', 'menu_leader_speech', '领导讲话', 'menu_resource_center', '/resource-center/leader-speech', 'resource-center/LeaderSpeechView', 'el-icon-microphone', 2, 1, 'NavigationLayout', '1', now()), -('203', 'menu_policy_interpretation', '政策解读', 'menu_resource_center', '/resource-center/policy-interpretation', 'resource-center/PolicyInterpretationView', 'el-icon-document', 3, 1, 'NavigationLayout', '1', now()), -('204', 'menu_red_classic', '红色经典', 'menu_resource_center', '/resource-center/red-classic', 'resource-center/RedClassicView', 'el-icon-star-on', 4, 1, 'NavigationLayout', '1', now()), -('205', 'menu_special_report', '专题报告', 'menu_resource_center', '/resource-center/special-report', 'resource-center/SpecialReportView', 'el-icon-document-copy', 5, 1, 'NavigationLayout', '1', now()), -('206', 'menu_world_case', '思政案例', 'menu_resource_center', '/resource-center/world-case', 'resource-center/WorldCaseView', 'el-icon-collection', 6, 1, 'NavigationLayout', '1', now()), - -- 学习计划 ('300', 'menu_study_plan', '学习计划', NULL, '/study-plan', 'study-plan/StudyPlanView', 'el-icon-reading', 3, 1, 'NavigationLayout', '1', now()), ('301', 'menu_study_tasks', '学习任务', 'menu_study_plan', '/study-plan/tasks', 'study-plan/StudyTasksView', 'el-icon-s-order', 1, 1, 'NavigationLayout', '1', now()), @@ -148,12 +141,6 @@ INSERT INTO `tb_sys_menu_permission` (id, permission_id, menu_id, creator, creat -- 前端菜单权限关联 ('100', 'perm_default', 'menu_home', '1', now()), ('101', 'perm_default', 'menu_resource_center', '1', now()), -('102', 'perm_default', 'menu_party_history', '1', now()), -('103', 'perm_default', 'menu_leader_speech', '1', now()), -('104', 'perm_default', 'menu_policy_interpretation', '1', now()), -('105', 'perm_default', 'menu_red_classic', '1', now()), -('106', 'perm_default', 'menu_special_report', '1', now()), -('107', 'perm_default', 'menu_world_case', '1', now()), ('108', 'perm_default', 'menu_study_plan', '1', now()), ('109', 'perm_default', 'menu_study_tasks', '1', now()), ('110', 'perm_default', 'menu_course_center', '1', now()), @@ -172,7 +159,6 @@ INSERT INTO `tb_sys_menu_permission` (id, permission_id, menu_id, creator, creat -- 后端管理菜单权限关联 ('200', 'perm_system_manage', 'menu_admin_overview', '1', now()), ('201', 'perm_system_manage', 'menu_sys_manage', '1', now()), -('202', 'perm_system_user_manage', 'menu_admin_user_manage', '1', now()), ('203', 'perm_system_user_manage', 'menu_admin_user', '1', now()), ('204', 'perm_system_dept_manage', 'menu_admin_dept', '1', now()), ('205', 'perm_system_role_manage', 'menu_admin_role', '1', now()), diff --git a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceServiceImpl.java b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceServiceImpl.java index 0054e98..53d7495 100644 --- a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceServiceImpl.java +++ b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceServiceImpl.java @@ -141,7 +141,9 @@ public class NCResourceServiceImpl implements ResourceService { if (resourceVO.getResource().getID() == null) { resourceVO.getResource().setID(IDUtils.generateID()); } - + if (resourceVO.getResource().getResourceID() == null) { + resourceVO.getResource().setResourceID(IDUtils.generateID()); + } resourceVO.getResource().setCreateTime(new Date()); resourceVO.getResource().setUpdateTime(new Date()); resourceVO.getResource().setDeleted(false);