From dfb11c85f1b7e44c98dadb0c676abdc43d1cebf3 Mon Sep 17 00:00:00 2001 From: wangys <3401275564@qq.com> Date: Fri, 28 Nov 2025 17:16:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=92=8Cjson=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schoolNewsCrawler/crawler/rmrb/RmrbCrawler.py | 2 + .../.bin/mysql/sql/initConfigData.sql | 2 +- .../.bin/mysql/sql/initMenuData.sql | 450 +++++++++++++----- .../impl/ACHAchievementServiceImpl.java | 20 +- .../resources/mapper/AchievementMapper.xml | 10 +- .../mapper/UserAchievementMapper.xml | 8 +- .../mapper/UserAchievementProgressMapper.xml | 4 +- .../xyzh/ai/controller/AiChatController.java | 2 +- .../impl/AiAgentConfigServiceImpl.java | 32 +- .../impl/AiChatHistoryServiceImpl.java | 42 +- .../ai/service/impl/AiChatServiceImpl.java | 78 +-- .../impl/AiKnowledgeRedisServiceImpl.java | 2 +- .../service/impl/AiKnowledgeServiceImpl.java | 36 +- .../service/impl/AiUploadFileServiceImpl.java | 32 +- .../resources/mapper/AiUploadFileMapper.xml | 2 +- schoolNewsServ/ai/前端API接口文档.md | 4 +- schoolNewsServ/ai/知识库隔离方案.md | 20 +- .../org/xyzh/auth/domain/UserPrincipal.java | 2 +- .../xyzh/auth/service/LoginServiceImpl.java | 12 +- .../java/org/xyzh/auth/util/JwtTokenUtil.java | 4 +- schoolNewsServ/common/common-core/pom.xml | 12 + .../properties/FastJsonConfiguration.java | 50 ++ schoolNewsServ/common/common-dto/pom.xml | 4 + .../java/org/xyzh/common/dto/BaseDTO.java | 6 +- .../xyzh/common/dto/ai/TbAiAgentConfig.java | 2 +- .../xyzh/common/dto/ai/TbAiConversation.java | 2 +- .../org/xyzh/common/dto/ai/TbAiKnowledge.java | 2 +- .../org/xyzh/common/dto/ai/TbAiMessage.java | 2 +- .../xyzh/common/dto/ai/TbAiUploadFile.java | 2 +- .../common/dto/ai/TbAiUsageStatistics.java | 2 +- .../dto/crontab/TbCrontabEmailDefault.java | 2 +- .../dto/crontab/TbCrontabEmailRecipient.java | 2 +- .../xyzh/common/dto/crontab/TbCrontabLog.java | 2 +- .../common/dto/crontab/TbCrontabTask.java | 2 +- .../common/dto/crontab/TbCrontabTaskMeta.java | 2 +- .../org/xyzh/common/dto/dept/TbSysDept.java | 2 +- .../xyzh/common/dto/dept/TbSysDeptRole.java | 2 +- .../org/xyzh/common/dto/menu/TbSysMenu.java | 2 +- .../common/dto/menu/TbSysMenuPermission.java | 2 +- .../dto/permission/TbResourcePermission.java | 2 +- .../dto/permission/TbSysPermission.java | 2 +- .../xyzh/common/dto/resource/TbBanner.java | 2 +- .../xyzh/common/dto/resource/TbResource.java | 2 +- .../dto/resource/TbResourceRecommend.java | 2 +- .../common/dto/resource/TbResourceTag.java | 2 +- .../org/xyzh/common/dto/resource/TbTag.java | 2 +- .../org/xyzh/common/dto/role/TbSysRole.java | 2 +- .../common/dto/role/TbSysRolePermission.java | 2 +- .../org/xyzh/common/dto/study/TbCourse.java | 2 +- .../common/dto/study/TbCourseChapter.java | 2 +- .../xyzh/common/dto/study/TbCourseNode.java | 2 +- .../xyzh/common/dto/study/TbCourseTag.java | 2 +- .../common/dto/study/TbLearningHistory.java | 2 +- .../common/dto/study/TbLearningRecord.java | 2 +- .../dto/study/TbLearningStatistics.java | 2 +- .../dto/study/TbLearningStatisticsDetail.java | 2 +- .../xyzh/common/dto/study/TbLearningTask.java | 2 +- .../common/dto/study/TbLearningTaskTag.java | 2 +- .../org/xyzh/common/dto/study/TbTaskItem.java | 2 +- .../org/xyzh/common/dto/study/TbTaskUser.java | 2 +- .../xyzh/common/dto/system/TbSysConfig.java | 2 +- .../xyzh/common/dto/system/TbSysDictData.java | 2 +- .../xyzh/common/dto/system/TbSysDictType.java | 2 +- .../xyzh/common/dto/system/TbSysLoginLog.java | 2 +- .../xyzh/common/dto/system/TbSysModule.java | 2 +- .../common/dto/system/TbSysNotification.java | 2 +- .../common/dto/system/TbSysOperationLog.java | 2 +- .../dto/system/TbSysVisitStatistics.java | 2 +- .../org/xyzh/common/dto/user/TbSysUser.java | 2 +- .../common/dto/user/TbSysUserDeptRole.java | 2 +- .../xyzh/common/dto/user/TbSysUserInfo.java | 2 +- .../common/dto/usercenter/TbAchievement.java | 2 +- .../common/dto/usercenter/TbPointsRecord.java | 2 +- .../dto/usercenter/TbUserAchievement.java | 2 +- .../usercenter/TbUserAchievementProgress.java | 2 +- .../dto/usercenter/TbUserBrowseRecord.java | 2 +- .../dto/usercenter/TbUserCollection.java | 2 +- .../common/dto/usercenter/TbUserPoints.java | 2 +- .../org/xyzh/common/vo/AchievementVO.java | 4 +- .../java/org/xyzh/common/vo/CourseItemVO.java | 16 +- .../xyzh/common/vo/ResourcePermissionVO.java | 2 +- .../main/java/org/xyzh/common/vo/TagVO.java | 2 +- .../java/org/xyzh/common/vo/TaskItemVO.java | 4 +- .../org/xyzh/common/vo/UserCollectionVO.java | 2 +- .../crontab/controller/CrontabController.java | 6 +- .../crontab/scheduler/SchedulerManager.java | 4 +- .../xyzh/crontab/scheduler/TaskExecutor.java | 4 +- .../service/impl/CrontabServiceImpl.java | 4 +- .../impl/DataCollectionItemServiceImpl.java | 8 +- .../service/impl/EmailDefaultServiceImpl.java | 2 +- .../impl/EmailRecipientServiceImpl.java | 4 +- .../service/impl/TaskMetaServiceImpl.java | 2 +- .../task/newsTask/NewsCrawlerTask.java | 8 +- .../task/recommendTask/TopRecommendTask.java | 2 +- .../resources/mapper/CrontabLogMapper.xml | 12 +- .../resources/mapper/CrontabTaskMapper.xml | 24 +- .../resources/mapper/EmailDefaultMapper.xml | 4 +- .../resources/mapper/EmailRecipientMapper.xml | 6 +- .../main/resources/mapper/TaskMetaMapper.xml | 4 +- .../xyzh/file/service/FileServiceImpl.java | 4 +- .../src/main/resources/mapper/FileMapper.xml | 4 +- .../service/impl/MessageSendService.java | 10 +- .../service/impl/MessageServiceImpl.java | 40 +- .../news/controller/ResourceController.java | 2 +- .../ResourceRecommendController.java | 4 +- .../service/impl/NCBannerServiceImpl.java | 4 +- .../impl/NCResourceRecommendServiceImpl.java | 20 +- .../service/impl/NCResourceServiceImpl.java | 35 +- .../news/service/impl/NCTagServiceImpl.java | 10 +- .../main/resources/mapper/ResourceMapper.xml | 4 +- schoolNewsServ/pom.xml | 6 + .../controller/LearningRecordController.java | 2 +- .../service/impl/SCCourseServiceImpl.java | 32 +- .../impl/SCLearningHistoryServiceImpl.java | 16 +- .../impl/SCLearningRecordServiceImpl.java | 16 +- .../impl/SCLearningTaskServiceImpl.java | 48 +- .../system/controller/UserController.java | 2 +- .../org/xyzh/system/log/LogEventHandler.java | 2 +- .../config/impl/SysConfigServiceImpl.java | 4 +- .../impl/SysDepartmentServiceImpl.java | 10 +- .../menu/service/impl/SysMenuServiceImpl.java | 4 +- .../module/impl/ModuleServiceImpl.java | 10 +- .../impl/SysPermissionServiceImpl.java | 32 +- .../role/service/impl/SysRoleServiceImpl.java | 12 +- .../user/service/impl/SysUserServiceImpl.java | 42 +- .../java/org/xyzh/system/utils/LoginUtil.java | 4 +- .../main/resources/mapper/SysConfigMapper.xml | 6 +- .../controller/UserCollectionController.java | 2 +- .../controller/UserProfileController.java | 36 +- .../impl/UCUserCollectionServiceImpl.java | 4 +- .../src/components/base/ChangeHome.vue | 13 +- .../src/components/base/UserDropdown.vue | 18 +- .../views/admin/manage/logs/LoginLogsView.vue | 1 + .../admin/manage/logs/SystemLogsView.vue | 1 + .../admin/manage/system/SystemConfigView.vue | 35 +- 135 files changed, 930 insertions(+), 633 deletions(-) create mode 100644 schoolNewsServ/common/common-core/src/main/java/org/xyzh/common/config/properties/FastJsonConfiguration.java diff --git a/schoolNewsCrawler/crawler/rmrb/RmrbCrawler.py b/schoolNewsCrawler/crawler/rmrb/RmrbCrawler.py index 26db54a..e57ac9d 100644 --- a/schoolNewsCrawler/crawler/rmrb/RmrbCrawler.py +++ b/schoolNewsCrawler/crawler/rmrb/RmrbCrawler.py @@ -400,6 +400,8 @@ class RmrbCrawler(BaseCrawler): src = str(src) # 转换为字符串 if not src.startswith("http"): src = self.config.base_url + src + if src=="http://www.people.com.cn/img/2020wbc/imgs/share.png": #分享图片跳过 + continue content = f"" elif p.find('video'): diff --git a/schoolNewsServ/.bin/mysql/sql/initConfigData.sql b/schoolNewsServ/.bin/mysql/sql/initConfigData.sql index 7d69b35..c006d7c 100644 --- a/schoolNewsServ/.bin/mysql/sql/initConfigData.sql +++ b/schoolNewsServ/.bin/mysql/sql/initConfigData.sql @@ -31,7 +31,7 @@ INSERT INTO `tb_sys_config` (`id`, `config_key`, `config_name`, `config_value`, ('46', 'email.timeout', '连接超时时间', '30000', 'integer', 'input', '邮件配置', '连接超时时间（毫秒）', '请输入超时时间', 'SMTP连接超时时间', NULL, 5000, 60000, '毫秒', NULL, 46, 1, '1', now()), -- 短信配置 -('50', 'sms.provider', '短信服务商', 'aliyun', 'string', 'select', '短信配置', '短信服务提供商', NULL, '短信服务提供商类型', NULL, NULL, NULL, NULL, 'aliyun,tencent', 50, 1, '1', now()), +('50', 'sms.provider', '短信服务商', 'aliyun', 'string', 'select', '短信配置', '短信服务提供商', NULL, '短信服务提供商类型', NULL, NULL, NULL, NULL, 'aliyun', 50, 1, '1', now()), ('51', 'sms.accessKeyId', 'AccessKey ID', 'LTAI5t68do3qVXx5Rufugt3X', 'string', 'input', '短信配置', '短信服务AccessKey ID', '请输入AccessKey ID', '云服务商的AccessKey ID', NULL, NULL, NULL, NULL, NULL, 51, 1, '1', now()), ('52', 'sms.accessKeySecret', 'AccessKey Secret', '2vD9ToIff49Vph4JQXsn0Cy8nXQfzA', 'string', 'password', '短信配置', '短信服务AccessKey Secret', '请输入AccessKey Secret', '云服务商的AccessKey Secret', NULL, NULL, NULL, NULL, NULL, 52, 1, '1', now()), ('53', 'sms.signName', '短信签名', '星洋智慧', 'string', 'input', '短信配置', '短信签名', '请输入短信签名', '发送短信使用的签名', NULL, NULL, NULL, NULL, NULL, 53, 1, '1', now()), diff --git a/schoolNewsServ/.bin/mysql/sql/initMenuData.sql b/schoolNewsServ/.bin/mysql/sql/initMenuData.sql index ef8efc8..14edb2f 100644 --- a/schoolNewsServ/.bin/mysql/sql/initMenuData.sql +++ b/schoolNewsServ/.bin/mysql/sql/initMenuData.sql @@ -45,75 +45,246 @@ INSERT INTO `tb_sys_module` (id, module_id, name, code, description, icon, order ('9', 'module_sensitive', '敏感词管理', 'sensitive', '敏感词管理模块', 'el-icon-warning', 9, 1, '1', now()); -- 插入权限数据 -INSERT INTO `tb_sys_permission` (id,permission_id, name, code, description, module_id, creator, create_time) VALUES -('0','perm_default', '默认权限', 'default', '默认权限', 'module_system', '1', now()), -('1','perm_system_manage', '系统管理', 'system:manage', '系统管理权限', 'module_system', '1', now()), -('2','perm_system_dept_manage', '系统部门查看', 'system:dept:manage', '系统部门查看权限', 'module_system', '1', now()), -('3','perm_system_menu_manage', '系统菜单查看', 'system:menu:manage', '系统菜单查看权限', 'module_system', '1', now()), -('4','perm_system_permission_manage', '系统权限查看', 'system:permission:manage', '系统权限查看权限', 'module_system', '1', now()), -('5','perm_system_role_manage', '系统角色查看', 'system:role:manage', '系统角色查看权限', 'module_system', '1', now()), -('6','perm_system_user_manage', '系统用户查看', 'system:user:manage', '系统用户查看权限', 'module_system', '1', now()), -('7','perm_system_module_manage', '系统模块查看', 'system:module:manage', '系统模块查看权限', 'module_system', '1', now()), -('8','perm_news_manage', '新闻管理', 'news:manage', '新闻管理权限', 'module_news', '1', now()), -('9','perm_news_article_add', '文章添加', 'news:manage', '文章添加权限', 'module_news', '1', now()), -('10','perm_study_manage', '学习管理', 'study:manage', '学习管理权限', 'module_study', '1', now()), -('10.1','perm_achievement_manage', '成就管理', 'achievement:manage', '成就管理权限', 'module_study', '1', now()), -('11','perm_ai_manage', 'AI管理', 'ai:manage', 'AI管理权限', 'module_ai', '1', now()), -('12','perm_usercenter_manage', '用户中心管理', 'usercenter:manage', '用户中心管理权限', 'module_usercenter', '1', now()), -('13','perm_file_manage', '文件管理', 'file:manage', '文件管理权限', 'module_file', '1', now()), -('14','perm_crontab_manage', '定时任务管理', 'crontab:manage', '定时任务管理权限', 'module_crontab', '1', now()), -('15','perm_crontab_execute', '定时任务执行', 'crontab:execute', '定时任务执行权限', 'module_crontab', '1', now()), -('16','perm_message_manage', '消息管理', 'message:manage', '消息管理权限（管理端）', 'module_message', '1', now()), -('17','perm_message_send', '消息发送', 'message:send', '消息发送权限', 'module_message', '1', now()), -('18','perm_message_view', '消息查看', 'message:view', '消息查看权限（用户端）', 'module_message', '1', now()), -('19','perm_sensitive_manage', '敏感词管理', 'sensitive:manage', '敏感词管理权限', 'module_sensitive', '1', now()); +-- ============================================ +-- 权限ID分配规则（每个模块预留100个ID）： +-- 9000-9999: 前端用户权限（默认权限） +-- 100-999: 超级管理员专属权限 +-- 1000-8999: 普通管理员权限 +-- ============================================ + +INSERT INTO `tb_sys_permission` (id, permission_id, name, code, description, module_id, creator, create_time) VALUES +-- ========== 前端用户权限 (9000-9999) ========== +-- 9000-9099: 默认权限和基础视图 +('9000', 'perm_default', '默认权限', 'default', '所有登录用户的默认权限', 'module_system', '1', now()), +('9001', 'perm_view_home', '首页访问', 'view:home', '访问首页视图权限', 'module_usercenter', '1', now()), +('9002', 'perm_view_resource_hot', '热门资源访问', 'view:resource:hot', '访问热门资源视图权限', 'module_news', '1', now()), +('9003', 'perm_view_resource_center', '资源中心访问', 'view:resource:center', '访问资源中心视图权限', 'module_news', '1', now()), +('9004', 'perm_view_search', '搜索访问', 'view:search', '访问搜索视图权限', 'module_news', '1', now()), +('9005', 'perm_view_article_show', '文章展示访问', 'view:article:show', '访问文章展示视图权限', 'module_news', '1', now()), + +-- 9100-9199: 学习计划相关 +('9100', 'perm_view_study_tasks', '学习任务访问', 'view:study:tasks', '访问学习任务视图权限', 'module_study', '1', now()), +('9101', 'perm_view_course_center', '课程中心访问', 'view:course:center', '访问课程中心视图权限', 'module_study', '1', now()), +('9102', 'perm_view_task_detail', '任务详情访问', 'view:task:detail', '访问任务详情视图权限', 'module_study', '1', now()), +('9103', 'perm_view_course_detail', '课程详情访问', 'view:course:detail', '访问课程详情视图权限', 'module_study', '1', now()), +('9104', 'perm_view_course_study', '课程学习访问', 'view:course:study', '访问课程学习视图权限', 'module_study', '1', now()), + +-- 9200-9299: 用户中心相关 +('9200', 'perm_view_learning_records', '学习记录访问', 'view:learning:records', '访问学习记录视图权限', 'module_usercenter', '1', now()), +('9201', 'perm_view_my_favorites', '我的收藏访问', 'view:my:favorites', '访问我的收藏视图权限', 'module_usercenter', '1', now()), +('9202', 'perm_view_my_achievements', '我的成就访问', 'view:my:achievements', '访问我的成就视图权限', 'module_usercenter', '1', now()), +('9203', 'perm_view_personal_info', '个人信息访问', 'view:personal:info', '访问个人信息视图权限', 'module_usercenter', '1', now()), +('9204', 'perm_view_account_settings', '账号设置访问', 'view:account:settings', '访问账号设置视图权限', 'module_usercenter', '1', now()), + +-- 9300-9399: 文章和消息相关 +('9300', 'perm_view_article_add', '文章添加访问', 'view:article:add', '访问文章添加视图权限', 'module_news', '1', now()), +('9301', 'perm_view_message_center', '消息中心访问', 'view:message:center', '访问消息中心视图权限', 'module_message', '1', now()), +('9302', 'perm_view_message_detail', '消息详情访问', 'view:message:detail', '访问消息详情视图权限', 'module_message', '1', now()), + +-- ========== 超级管理员专属权限 (100-999) ========== +-- 100-199: 系统总览 +('100', 'perm_admin_overview', '系统总览', 'admin:overview', '访问系统总览视图权限（超级管理员）', 'module_system', '1', now()), + +-- 200-299: 用户管理 +('200', 'perm_admin_user_manage', '用户管理', 'admin:user:manage', '访问用户管理视图权限（超级管理员）', 'module_system', '1', now()), + +-- 300-399: 部门管理 +('300', 'perm_admin_dept_manage', '部门管理', 'admin:dept:manage', '访问部门管理视图权限（超级管理员）', 'module_system', '1', now()), + +-- 400-499: 角色管理 +('400', 'perm_admin_role_manage', '角色管理', 'admin:role:manage', '访问角色管理视图权限（超级管理员）', 'module_system', '1', now()), + +-- 500-599: 菜单管理 +('500', 'perm_admin_menu_manage', '菜单管理', 'admin:menu:manage', '访问菜单管理视图权限（超级管理员）', 'module_system', '1', now()), + +-- 600-699: 模块权限管理 +('600', 'perm_admin_module_permission_manage', '模块权限管理', 'admin:module:permission:manage', '访问模块权限管理视图权限（超级管理员）', 'module_system', '1', now()), + +-- 700-799: 系统日志 +('700', 'perm_admin_system_logs', '系统日志', 'admin:logs:system', '访问系统日志视图权限（超级管理员）', 'module_system', '1', now()), +('701', 'perm_admin_login_logs', '登录日志', 'admin:logs:login', '访问登录日志视图权限（超级管理员）', 'module_system', '1', now()), + +-- 800-899: 系统配置 +('800', 'perm_admin_system_config', '系统配置', 'admin:system:config', '访问系统配置视图权限（超级管理员）', 'module_system', '1', now()), + +-- ========== 普通管理员权限 (1000-8999) ========== +-- 1000-1099: 资源管理 +('1000', 'perm_admin_resource_manage', '资源数据采集', 'admin:resource:manage', '访问资源数据采集视图权限', 'module_news', '1', now()), + +-- 1100-1199: 文章管理 +('1100', 'perm_admin_article_manage', '文章管理', 'admin:article:manage', '访问文章管理视图权限', 'module_news', '1', now()), + +-- 1200-1299: Banner管理 +('1200', 'perm_admin_banner_manage', 'Banner管理', 'admin:banner:manage', '访问Banner管理视图权限', 'module_news', '1', now()), + +-- 1300-1399: 标签管理 +('1300', 'perm_admin_tag_manage', '标签管理', 'admin:tag:manage', '访问标签管理视图权限', 'module_news', '1', now()), + +-- 1400-1499: 栏目管理 +('1400', 'perm_admin_column_manage', '栏目管理', 'admin:column:manage', '访问栏目管理视图权限', 'module_news', '1', now()), + +-- 1500-1599: 敏感词管理 +('1500', 'perm_admin_sensitive_manage', '敏感词管理', 'admin:sensitive:manage', '访问敏感词管理视图权限', 'module_sensitive', '1', now()), + +-- 2000-2099: 任务管理 +('2000', 'perm_admin_task_manage', '任务管理', 'admin:task:manage', '访问任务管理视图权限', 'module_study', '1', now()), + +-- 2100-2199: 学习记录管理 +('2100', 'perm_admin_study_records', '学习记录管理', 'admin:study:records', '访问学习记录管理视图权限', 'module_study', '1', now()), + +-- 2200-2299: 课程管理 +('2200', 'perm_admin_course_manage', '课程管理', 'admin:course:manage', '访问课程管理视图权限', 'module_study', '1', now()), + +-- 2300-2399: 成就管理 +('2300', 'perm_admin_achievement_manage', '成就管理', 'admin:achievement:manage', '访问成就管理视图权限', 'module_study', '1', now()), + +-- 3000-3099: AI配置 +('3000', 'perm_admin_ai_config', 'AI配置', 'admin:ai:config', '访问AI配置视图权限', 'module_ai', '1', now()), + +-- 3100-3199: 知识库管理 +('3100', 'perm_admin_knowledge_manage', '知识库管理', 'admin:knowledge:manage', '访问知识库管理视图权限', 'module_ai', '1', now()), + +-- 5000-5099: 邮件配置 +('5000', 'perm_admin_meta_email_default', '默认接收人配置', 'admin:meta:email:default', '访问默认接收人配置视图权限', 'module_crontab', '1', now()), + +-- 5100-5199: 定时任务日志 +('5100', 'perm_admin_crontab_log', '定时任务执行日志', 'admin:crontab:log', '访问定时任务执行日志视图权限', 'module_crontab', '1', now()), + +-- 5200-5299: 新闻爬虫配置 +('5200', 'perm_admin_news_crawler', '新闻爬虫配置', 'admin:news:crawler', '访问新闻爬虫配置视图权限', 'module_crontab', '1', now()), + +-- 5300-5399: 系统定时任务 +('5300', 'perm_admin_system_task', '系统定时任务配置', 'admin:system:task', '访问系统定时任务配置视图权限', 'module_crontab', '1', now()), + +-- 6000-6099: 消息管理 +('6000', 'perm_admin_message_manage', '消息管理', 'admin:message:manage', '访问消息管理视图权限', 'module_message', '1', now()); -- 插入角色-权限关联数据 --- 超级管理员：拥有所有权限 +-- ============================================ +-- 超级管理员：拥有所有权限（前端用户 + 超级管理员 + 普通管理员） +-- ============================================ INSERT INTO `tb_sys_role_permission` (id, role_id, permission_id, creator, create_time) VALUES +-- 前端用户权限 (9000-9999) ('1', 'superadmin', 'perm_default', '1', now()), -('2', 'superadmin', 'perm_system_manage', '1', now()), -('3', 'superadmin', 'perm_system_dept_manage', '1', now()), -('4', 'superadmin', 'perm_system_menu_manage', '1', now()), -('5', 'superadmin', 'perm_system_permission_manage', '1', now()), -('6', 'superadmin', 'perm_system_role_manage', '1', now()), -('7', 'superadmin', 'perm_system_user_manage', '1', now()), -('8', 'superadmin', 'perm_system_module_manage', '1', now()), -('9', 'superadmin', 'perm_news_manage', '1', now()), -('10', 'superadmin', 'perm_news_article_add', '1', now()), -('11', 'superadmin', 'perm_study_manage', '1', now()), -('12', 'superadmin', 'perm_achievement_manage', '1', now()), -('13', 'superadmin', 'perm_ai_manage', '1', now()), -('14', 'superadmin', 'perm_usercenter_manage', '1', now()), -('15', 'superadmin', 'perm_file_manage', '1', now()), -('16', 'superadmin', 'perm_crontab_manage', '1', now()), -('17', 'superadmin', 'perm_crontab_execute', '1', now()), -('18', 'superadmin', 'perm_message_manage', '1', now()), -('19', 'superadmin', 'perm_message_send', '1', now()), -('20', 'superadmin', 'perm_message_view', '1', now()), -('21', 'superadmin', 'perm_sensitive_manage', '1', now()), +('2', 'superadmin', 'perm_view_home', '1', now()), +('3', 'superadmin', 'perm_view_resource_hot', '1', now()), +('4', 'superadmin', 'perm_view_resource_center', '1', now()), +('5', 'superadmin', 'perm_view_search', '1', now()), +('6', 'superadmin', 'perm_view_article_show', '1', now()), +('7', 'superadmin', 'perm_view_study_tasks', '1', now()), +('8', 'superadmin', 'perm_view_course_center', '1', now()), +('9', 'superadmin', 'perm_view_task_detail', '1', now()), +('10', 'superadmin', 'perm_view_course_detail', '1', now()), +('11', 'superadmin', 'perm_view_course_study', '1', now()), +('12', 'superadmin', 'perm_view_learning_records', '1', now()), +('13', 'superadmin', 'perm_view_my_favorites', '1', now()), +('14', 'superadmin', 'perm_view_my_achievements', '1', now()), +('15', 'superadmin', 'perm_view_personal_info', '1', now()), +('16', 'superadmin', 'perm_view_account_settings', '1', now()), +('17', 'superadmin', 'perm_view_article_add', '1', now()), +('18', 'superadmin', 'perm_view_message_center', '1', now()), +('19', 'superadmin', 'perm_view_message_detail', '1', now()), --- 管理员：拥有业务管理权限，但没有系统日志等系统管理权限 -('22', 'admin', 'perm_default', '1', now()), -('23', 'admin', 'perm_news_manage', '1', now()), -('24', 'admin', 'perm_news_article_add', '1', now()), -('25', 'admin', 'perm_study_manage', '1', now()), -('26', 'admin', 'perm_achievement_manage', '1', now()), -('27', 'admin', 'perm_ai_manage', '1', now()), -('28', 'admin', 'perm_usercenter_manage', '1', now()), -('29', 'admin', 'perm_file_manage', '1', now()), -('30', 'admin', 'perm_message_manage', '1', now()), -('31', 'admin', 'perm_message_send', '1', now()), -('32', 'admin', 'perm_message_view', '1', now()), -('33', 'admin', 'perm_sensitive_manage', '1', now()), +-- 超级管理员专属权限 (100-999) +('20', 'superadmin', 'perm_admin_overview', '1', now()), +('21', 'superadmin', 'perm_admin_user_manage', '1', now()), +('22', 'superadmin', 'perm_admin_dept_manage', '1', now()), +('23', 'superadmin', 'perm_admin_role_manage', '1', now()), +('24', 'superadmin', 'perm_admin_menu_manage', '1', now()), +('25', 'superadmin', 'perm_admin_module_permission_manage', '1', now()), +('26', 'superadmin', 'perm_admin_system_logs', '1', now()), +('27', 'superadmin', 'perm_admin_login_logs', '1', now()), +('28', 'superadmin', 'perm_admin_system_config', '1', now()), --- 自由角色：拥有用户视图相关的所有权限（前台用户权限） -('40', 'freedom', 'perm_default', '1', now()), -('41', 'freedom', 'perm_news_article_add', '1', now()), -('42', 'freedom', 'perm_ai_manage', '1', now()), -('43', 'freedom', 'perm_usercenter_manage', '1', now()), -('44', 'freedom', 'perm_file_manage', '1', now()), -('45', 'freedom', 'perm_message_view', '1', now()); +-- 普通管理员权限 (1000-8999) +('29', 'superadmin', 'perm_admin_resource_manage', '1', now()), +('30', 'superadmin', 'perm_admin_article_manage', '1', now()), +('31', 'superadmin', 'perm_admin_banner_manage', '1', now()), +('32', 'superadmin', 'perm_admin_tag_manage', '1', now()), +('33', 'superadmin', 'perm_admin_column_manage', '1', now()), +('34', 'superadmin', 'perm_admin_sensitive_manage', '1', now()), +('35', 'superadmin', 'perm_admin_task_manage', '1', now()), +('36', 'superadmin', 'perm_admin_study_records', '1', now()), +('37', 'superadmin', 'perm_admin_course_manage', '1', now()), +('38', 'superadmin', 'perm_admin_achievement_manage', '1', now()), +('39', 'superadmin', 'perm_admin_ai_config', '1', now()), +('40', 'superadmin', 'perm_admin_knowledge_manage', '1', now()), +('41', 'superadmin', 'perm_admin_meta_email_default', '1', now()), +('42', 'superadmin', 'perm_admin_crontab_log', '1', now()), +('43', 'superadmin', 'perm_admin_news_crawler', '1', now()), +('44', 'superadmin', 'perm_admin_system_task', '1', now()), +('45', 'superadmin', 'perm_admin_message_manage', '1', now()), + +-- ============================================ +-- 管理员：拥有前端用户权限 + 普通管理员权限（没有超级管理员专属权限） +-- ============================================ +-- 前端用户权限 (9000-9999) +('100', 'admin', 'perm_default', '1', now()), +('101', 'admin', 'perm_view_home', '1', now()), +('102', 'admin', 'perm_view_resource_hot', '1', now()), +('103', 'admin', 'perm_view_resource_center', '1', now()), +('104', 'admin', 'perm_view_search', '1', now()), +('105', 'admin', 'perm_view_article_show', '1', now()), +('106', 'admin', 'perm_view_study_tasks', '1', now()), +('107', 'admin', 'perm_view_course_center', '1', now()), +('108', 'admin', 'perm_view_task_detail', '1', now()), +('109', 'admin', 'perm_view_course_detail', '1', now()), +('110', 'admin', 'perm_view_course_study', '1', now()), +('111', 'admin', 'perm_view_learning_records', '1', now()), +('112', 'admin', 'perm_view_my_favorites', '1', now()), +('113', 'admin', 'perm_view_my_achievements', '1', now()), +('114', 'admin', 'perm_view_personal_info', '1', now()), +('115', 'admin', 'perm_view_account_settings', '1', now()), +('116', 'admin', 'perm_view_article_add', '1', now()), +('117', 'admin', 'perm_view_message_center', '1', now()), +('118', 'admin', 'perm_view_message_detail', '1', now()), + +-- 超级管理员权限中普通管理员也需要的部分 +('119', 'admin', 'perm_admin_user_manage', '1', now()), +('120', 'admin', 'perm_admin_dept_manage', '1', now()), +('121', 'admin', 'perm_admin_role_manage', '1', now()), + +-- 普通管理员权限 (1000-8999) +('122', 'admin', 'perm_admin_resource_manage', '1', now()), +('123', 'admin', 'perm_admin_article_manage', '1', now()), +('124', 'admin', 'perm_admin_banner_manage', '1', now()), +('125', 'admin', 'perm_admin_tag_manage', '1', now()), +('126', 'admin', 'perm_admin_column_manage', '1', now()), +('127', 'admin', 'perm_admin_sensitive_manage', '1', now()), +('128', 'admin', 'perm_admin_task_manage', '1', now()), +('129', 'admin', 'perm_admin_study_records', '1', now()), +('130', 'admin', 'perm_admin_course_manage', '1', now()), +('131', 'admin', 'perm_admin_achievement_manage', '1', now()), +('132', 'admin', 'perm_admin_ai_config', '1', now()), +('133', 'admin', 'perm_admin_knowledge_manage', '1', now()), +('134', 'admin', 'perm_admin_meta_email_default', '1', now()), +('135', 'admin', 'perm_admin_crontab_log', '1', now()), +('136', 'admin', 'perm_admin_news_crawler', '1', now()), +('137', 'admin', 'perm_admin_system_task', '1', now()), +('138', 'admin', 'perm_admin_message_manage', '1', now()), + +-- ============================================ +-- 自由角色：仅拥有前端用户权限 +-- ============================================ +('200', 'freedom', 'perm_default', '1', now()), +('201', 'freedom', 'perm_view_home', '1', now()), +('202', 'freedom', 'perm_view_resource_hot', '1', now()), +('203', 'freedom', 'perm_view_resource_center', '1', now()), +('204', 'freedom', 'perm_view_search', '1', now()), +('205', 'freedom', 'perm_view_article_show', '1', now()), +('206', 'freedom', 'perm_view_study_tasks', '1', now()), +('207', 'freedom', 'perm_view_course_center', '1', now()), +('208', 'freedom', 'perm_view_task_detail', '1', now()), +('209', 'freedom', 'perm_view_course_detail', '1', now()), +('210', 'freedom', 'perm_view_course_study', '1', now()), +('211', 'freedom', 'perm_view_learning_records', '1', now()), +('212', 'freedom', 'perm_view_my_favorites', '1', now()), +('213', 'freedom', 'perm_view_my_achievements', '1', now()), +('214', 'freedom', 'perm_view_personal_info', '1', now()), +('215', 'freedom', 'perm_view_account_settings', '1', now()), +('216', 'freedom', 'perm_view_article_add', '1', now()), +('217', 'freedom', 'perm_view_message_center', '1', now()), +('218', 'freedom', 'perm_view_message_detail', '1', now()); -- 插入前端菜单数据 -- 用户前端菜单 (100-699) @@ -178,72 +349,97 @@ INSERT INTO `tb_sys_menu` VALUES ('651', 'menu_user_message_detail', '消息详情', 'menu_user_message_center', '/user/message/detail/:messageID', 'user/message/MyMessageDetailView', NULL, 1, 3, 'NavigationLayout', '1', NULL, '2025-11-13 10:00:00', '2025-11-13 10:00:00', NULL, 0); -- 插入菜单权限关联数据 --- 前端菜单权限关联 +-- ============================================ +-- 说明：每个有View的菜单对应一个权限 +-- 无View的菜单（如导航菜单）关联默认权限 +-- ============================================ INSERT INTO `tb_sys_menu_permission` (id, permission_id, menu_id, creator, create_time) VALUES -('100', 'perm_default', 'menu_home', '1', now()), -('102', 'perm_default', 'menu_resource_hot', '1', now()), -('101', 'perm_default', 'menu_resource_center', '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()), -('111', 'perm_default', 'menu_user_center', '1', now()), -('112', 'perm_default', 'menu_learning_records', '1', now()), -('113', 'perm_default', 'menu_my_favorites', '1', now()), -('114', 'perm_default', 'menu_my_achievements', '1', now()), -('115', 'perm_default', 'menu_profile', '1', now()), -('116', 'perm_default', 'menu_personal_info', '1', now()), -('117', 'perm_default', 'menu_account_settings', '1', now()), -('119', 'perm_default', 'menu_user_dropdown', '1', now()), -('120', 'perm_news_article_add', 'menu_article_add', '1', now()), -('121', 'perm_default', 'menu_task_detail', '1', now()), -('122', 'perm_default', 'menu_course_detail', '1', now()), -('123', 'perm_default', 'menu_course_study', '1', now()), -('124', 'perm_default', 'menu_article_show', '1', now()), -('125', 'perm_default', 'menu_search', '1', now()), --- 后端管理菜单权限关联 -('200', 'perm_system_manage', 'menu_admin_overview', '1', now()), -('201', 'perm_system_manage', 'menu_sys_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()), -('207', 'perm_system_menu_manage', 'menu_admin_menu', '1', now()), -('208', 'perm_system_module_manage', 'menu_admin_module', '1', now()), -('208.1', 'perm_system_permission_manage', 'menu_admin_module', '1', now()), -('209', 'perm_news_manage', 'menu_admin_resource_manage', '1', now()), -('210', 'perm_news_manage', 'menu_admin_resource', '1', now()), -('211', 'perm_news_manage', 'menu_admin_article', '1', now()), -('212', 'perm_news_manage', 'menu_admin_data_records', '1', now()), -('213', 'perm_news_manage', 'menu_admin_content_manage', '1', now()), -('214', 'perm_news_manage', 'menu_admin_banner', '1', now()), -('215', 'perm_news_manage', 'menu_admin_tag', '1', now()), -('216', 'perm_news_manage', 'menu_admin_column', '1', now()), -('217', 'perm_sensitive_manage', 'menu_admin_sensitive', '1', now()), -('218', 'perm_study_manage', 'menu_admin_study_manage', '1', now()), -('220', 'perm_study_manage', 'menu_admin_task_manage', '1', now()), -('221', 'perm_study_manage', 'menu_admin_study_records', '1', now()), -('222', 'perm_study_manage', 'menu_admin_course_manage', '1', now()), -('222.1', 'perm_achievement_manage', 'menu_admin_achievement_manage', '1', now()), -('223', 'perm_ai_manage', 'menu_admin_ai_manage', '1', now()), -('224', 'perm_ai_manage', 'menu_admin_ai', '1', now()), -('225', 'perm_ai_manage', 'menu_admin_ai_config', '1', now()), -('226', 'perm_ai_manage', 'menu_admin_knowledge', '1', now()), -('227', 'perm_system_manage', 'menu_admin_logs_manage', '1', now()), -('228', 'perm_system_manage', 'menu_admin_system_logs', '1', now()), -('229', 'perm_system_manage', 'menu_admin_login_logs', '1', now()), -('231', 'perm_system_manage', 'menu_admin_system_config', '1', now()), +-- ========== 前端用户菜单权限关联 (9000-9999) ========== +-- 基础视图 +('9001', 'perm_view_home', 'menu_home', '1', now()), +('9002', 'perm_view_resource_hot', 'menu_resource_hot', '1', now()), +('9003', 'perm_view_resource_center', 'menu_resource_center', '1', now()), +('9004', 'perm_view_search', 'menu_search', '1', now()), +('9005', 'perm_view_article_show', 'menu_article_show', '1', now()), --- 定时任务管理菜单权限关联 -('232', 'perm_crontab_manage', 'menu_admin_crontab_manage', '1', now()), -('236', 'perm_crontab_manage', 'menu_admin_meta_email_default', '1', now()), -('233', 'perm_crontab_manage', 'menu_admin_crontab_task', '1', now()), -('234', 'perm_crontab_manage', 'menu_admin_crontab_log', '1', now()), -('235', 'perm_crontab_manage', 'menu_admin_news_crawler', '1', now()), -('252', 'perm_crontab_manage', 'menu_admin_system_task', '1', now()), +-- 学习计划相关 +('9006', 'perm_default', 'menu_study_plan', '1', now()), -- 无View的导航菜单 +('9100', 'perm_view_study_tasks', 'menu_study_tasks', '1', now()), +('9101', 'perm_view_course_center', 'menu_course_center', '1', now()), +('9102', 'perm_view_task_detail', 'menu_task_detail', '1', now()), +('9103', 'perm_view_course_detail', 'menu_course_detail', '1', now()), +('9104', 'perm_view_course_study', 'menu_course_study', '1', now()), --- 消息通知管理菜单权限关联 -('240', 'perm_message_manage', 'menu_admin_message_manage', '1', now()), --- 用户端消息中心权限关联 -('250', 'perm_default', 'menu_user_message_center', '1', now()), -('251', 'perm_default', 'menu_user_message_detail', '1', now()); +-- 用户中心相关 +('9007', 'perm_default', 'menu_user_dropdown', '1', now()), -- 无View的导航菜单 +('9008', 'perm_default', 'menu_user_center', '1', now()), -- Layout菜单 +('9200', 'perm_view_learning_records', 'menu_learning_records', '1', now()), +('9201', 'perm_view_my_favorites', 'menu_my_favorites', '1', now()), +('9202', 'perm_view_my_achievements', 'menu_my_achievements', '1', now()), + +-- 个人信息相关 +('9009', 'perm_default', 'menu_profile', '1', now()), -- Layout菜单 +('9203', 'perm_view_personal_info', 'menu_personal_info', '1', now()), +('9204', 'perm_view_account_settings', 'menu_account_settings', '1', now()), + +-- 文章和消息 +('9300', 'perm_view_article_add', 'menu_article_add', '1', now()), +('9301', 'perm_view_message_center', 'menu_user_message_center', '1', now()), +('9302', 'perm_view_message_detail', 'menu_user_message_detail', '1', now()), + +-- ========== 超级管理员菜单权限关联 (100-999) ========== +-- 系统总览 +('100', 'perm_admin_overview', 'menu_admin_overview', '1', now()), + +-- 系统管理 +('101', 'perm_default', 'menu_sys_manage', '1', now()), -- 无View的导航菜单 +('200', 'perm_admin_user_manage', 'menu_admin_user', '1', now()), +('300', 'perm_admin_dept_manage', 'menu_admin_dept', '1', now()), +('400', 'perm_admin_role_manage', 'menu_admin_role', '1', now()), +('500', 'perm_admin_menu_manage', 'menu_admin_menu', '1', now()), +('600', 'perm_admin_module_permission_manage', 'menu_admin_module', '1', now()), + +-- 系统日志 +('102', 'perm_default', 'menu_admin_logs_manage', '1', now()), -- 无View的导航菜单 +('700', 'perm_admin_system_logs', 'menu_admin_system_logs', '1', now()), +('701', 'perm_admin_login_logs', 'menu_admin_login_logs', '1', now()), + +-- 系统配置 +('800', 'perm_admin_system_config', 'menu_admin_system_config', '1', now()), + +-- ========== 普通管理员菜单权限关联 (1000-8999) ========== +-- 资源管理 +('103', 'perm_default', 'menu_admin_resource_manage', '1', now()), -- 无View的导航菜单 +('1000', 'perm_admin_resource_manage', 'menu_admin_resource', '1', now()), +('1100', 'perm_admin_article_manage', 'menu_admin_article', '1', now()), + +-- 运营管理 +('104', 'perm_default', 'menu_admin_content_manage', '1', now()), -- 无View的导航菜单 +('1200', 'perm_admin_banner_manage', 'menu_admin_banner', '1', now()), +('1300', 'perm_admin_tag_manage', 'menu_admin_tag', '1', now()), +('1400', 'perm_admin_column_manage', 'menu_admin_column', '1', now()), +('1500', 'perm_admin_sensitive_manage', 'menu_admin_sensitive', '1', now()), + +-- 学习管理 +('105', 'perm_default', 'menu_admin_study_manage', '1', now()), -- 无View的导航菜单 +('2000', 'perm_admin_task_manage', 'menu_admin_task_manage', '1', now()), +('2100', 'perm_admin_study_records', 'menu_admin_study_records', '1', now()), +('2200', 'perm_admin_course_manage', 'menu_admin_course_manage', '1', now()), +('2300', 'perm_admin_achievement_manage', 'menu_admin_achievement_manage', '1', now()), + +-- AI管理 +('106', 'perm_default', 'menu_admin_ai_manage', '1', now()), -- 无View的导航菜单 +('3000', 'perm_admin_ai_config', 'menu_admin_ai_config', '1', now()), +('3100', 'perm_admin_knowledge_manage', 'menu_admin_knowledge', '1', now()), + +-- 定时任务管理 +('107', 'perm_default', 'menu_admin_crontab_manage', '1', now()), -- 无View的导航菜单 +('5000', 'perm_admin_meta_email_default', 'menu_admin_meta_email_default', '1', now()), +('5100', 'perm_admin_crontab_log', 'menu_admin_crontab_log', '1', now()), +('5200', 'perm_admin_news_crawler', 'menu_admin_news_crawler', '1', now()), +('5300', 'perm_admin_system_task', 'menu_admin_system_task', '1', now()), + +-- 消息管理 +('6000', 'perm_admin_message_manage', 'menu_admin_message_manage', '1', now()); diff --git a/schoolNewsServ/achievement/src/main/java/org/xyzh/achievement/service/impl/ACHAchievementServiceImpl.java b/schoolNewsServ/achievement/src/main/java/org/xyzh/achievement/service/impl/ACHAchievementServiceImpl.java index c0c5be0..f3203a1 100644 --- a/schoolNewsServ/achievement/src/main/java/org/xyzh/achievement/service/impl/ACHAchievementServiceImpl.java +++ b/schoolNewsServ/achievement/src/main/java/org/xyzh/achievement/service/impl/ACHAchievementServiceImpl.java @@ -90,8 +90,8 @@ public class ACHAchievementServiceImpl implements AchievementService { } // 设置默认值 - if (achievement.getID() == null) { - achievement.setID(IDUtils.generateID()); + if (achievement.getId() == null) { + achievement.setId(IDUtils.generateID()); } if (achievement.getAchievementID() == null) { achievement.setAchievementID(IDUtils.generateID()); @@ -285,7 +285,7 @@ public class ACHAchievementServiceImpl implements AchievementService { return rd; } - String userID = user.getID(); + String userID = user.getId(); // 仅查询等级类成就 List userDeptRoles = LoginUtil.getCurrentDeptRole(); List levels = achievementMapper.selectUserAchievementsWithProgress( @@ -371,7 +371,7 @@ public class ACHAchievementServiceImpl implements AchievementService { for (AchievementVO vo : voList) { if (Boolean.TRUE.equals(vo.getObtained())) { TbUserAchievement ua = new TbUserAchievement(); - ua.setID(vo.getUserAchievementID()); + ua.setId(vo.getUserAchievementID()); ua.setUserID(userID); ua.setAchievementID(vo.getAchievementID()); ua.setObtainTime(vo.getObtainTime()); @@ -396,7 +396,7 @@ public class ACHAchievementServiceImpl implements AchievementService { resultDomain.fail("请先登录"); return resultDomain; } - return getUserAchievements(user.getID(), type); + return getUserAchievements(user.getId(), type); } @Override @@ -410,7 +410,7 @@ public class ACHAchievementServiceImpl implements AchievementService { return resultDomain; } - String userID = user.getID(); + String userID = user.getId(); // 使用联表查询一次性获取所有数据（包含成就、用户成就、进度信息及权限过滤） List userDeptRoles = LoginUtil.getCurrentDeptRole(); @@ -474,7 +474,7 @@ public class ACHAchievementServiceImpl implements AchievementService { // 创建用户成就记录 TbUserAchievement userAchievement = new TbUserAchievement(); - userAchievement.setID(IDUtils.generateID()); + userAchievement.setId(IDUtils.generateID()); userAchievement.setUserID(userID); userAchievement.setAchievementID(achievementID); userAchievement.setObtainTime(new Date()); @@ -559,7 +559,7 @@ public class ACHAchievementServiceImpl implements AchievementService { resultDomain.fail("请先登录"); return resultDomain; } - return getUserAchievementProgress(user.getID(), achievementID); + return getUserAchievementProgress(user.getId(), achievementID); } @Override @@ -812,7 +812,7 @@ public class ACHAchievementServiceImpl implements AchievementService { } progress = new TbUserAchievementProgress(); - progress.setID(IDUtils.generateID()); + progress.setId(IDUtils.generateID()); progress.setUserID(userID); progress.setAchievementID(achievementID); progress.setCurrentValue(0); @@ -845,7 +845,7 @@ public class ACHAchievementServiceImpl implements AchievementService { private TbUserAchievement grantAchievementInternal(String userID, TbAchievement achievement) { try { TbUserAchievement userAchievement = new TbUserAchievement(); - userAchievement.setID(IDUtils.generateID()); + userAchievement.setId(IDUtils.generateID()); userAchievement.setUserID(userID); userAchievement.setAchievementID(achievement.getAchievementID()); userAchievement.setObtainTime(new Date()); diff --git a/schoolNewsServ/achievement/src/main/resources/mapper/AchievementMapper.xml b/schoolNewsServ/achievement/src/main/resources/mapper/AchievementMapper.xml index 104c80b..086e27a 100644 --- a/schoolNewsServ/achievement/src/main/resources/mapper/AchievementMapper.xml +++ b/schoolNewsServ/achievement/src/main/resources/mapper/AchievementMapper.xml @@ -4,7 +4,7 @@ - + @@ -34,8 +34,8 @@ - - AND id = #{filter.ID} + + AND id = #{filter.id} AND achievement_id = #{filter.achievementID} @@ -254,7 +254,7 @@ ) VALUES ( - #{item.ID}, #{item.achievementID}, #{item.name}, #{item.description}, #{item.icon}, + #{item.id}, #{item.achievementID}, #{item.name}, #{item.description}, #{item.icon}, #{item.type}, #{item.level}, #{item.conditionType}, #{item.conditionValue}, #{item.points}, #{item.orderNum}, #{item.creator}, #{item.updater}, #{item.createTime}, #{item.updateTime}, #{item.deleteTime}, #{item.deleted} @@ -327,7 +327,7 @@ - + diff --git a/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementMapper.xml b/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementMapper.xml index a63fcb4..b9b14ff 100644 --- a/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementMapper.xml +++ b/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementMapper.xml @@ -4,7 +4,7 @@ - + @@ -19,8 +19,8 @@ - - AND ua.id = #{filter.ID} + + AND ua.id = #{filter.id} AND ua.user_id = #{filter.userID} @@ -158,7 +158,7 @@ ) VALUES ( - #{item.ID}, #{item.userID}, #{item.achievementID}, #{item.obtainTime} + #{item.id}, #{item.userID}, #{item.achievementID}, #{item.obtainTime} ) diff --git a/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementProgressMapper.xml b/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementProgressMapper.xml index 21dcbae..dea90a3 100644 --- a/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementProgressMapper.xml +++ b/schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementProgressMapper.xml @@ -4,7 +4,7 @@ - + @@ -112,7 +112,7 @@ ) VALUES ( - #{item.ID}, #{item.userID}, #{item.achievementID}, #{item.currentValue}, + #{item.id}, #{item.userID}, #{item.achievementID}, #{item.currentValue}, #{item.targetValue}, #{item.progressPercentage}, #{item.completed}, #{item.lastUpdateTime}, #{item.createTime} ) diff --git a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/controller/AiChatController.java b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/controller/AiChatController.java index 03334b1..33a2e1c 100644 --- a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/controller/AiChatController.java +++ b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/controller/AiChatController.java @@ -189,7 +189,7 @@ public class AiChatController { */ @PutMapping("/conversation") public ResultDomain updateConversation(@RequestBody TbAiConversation conversation) { - log.info("更新会话: id={}", conversation.getID()); + log.info("更新会话: id={}", conversation.getId()); return chatService.updateConversation(conversation); } diff --git a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiAgentConfigServiceImpl.java b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiAgentConfigServiceImpl.java index 4f83721..31d6d93 100644 --- a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiAgentConfigServiceImpl.java +++ b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiAgentConfigServiceImpl.java @@ -65,9 +65,9 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { } // 4. 设置默认值 - agentConfig.setID(UUID.randomUUID().toString()); - agentConfig.setCreator(currentUser.getID()); - agentConfig.setUpdater(currentUser.getID()); + agentConfig.setId(UUID.randomUUID().toString()); + agentConfig.setCreator(currentUser.getId()); + agentConfig.setUpdater(currentUser.getId()); agentConfig.setCreateTime(new Date()); agentConfig.setUpdateTime(new Date()); agentConfig.setDeleted(false); @@ -79,7 +79,7 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { // 5. 插入数据库 int rows = agentConfigMapper.insertAgentConfig(agentConfig); if (rows > 0) { - log.info("创建智能体成功: {} - {}", agentConfig.getID(), agentConfig.getName()); + log.info("创建智能体成功: {} - {}", agentConfig.getId(), agentConfig.getName()); resultDomain.success("创建智能体成功", agentConfig); return resultDomain; } else { @@ -101,13 +101,13 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { try { // 1. 参数验证 - if (!StringUtils.hasText(agentConfig.getID())) { + if (!StringUtils.hasText(agentConfig.getId())) { resultDomain.fail("智能体ID不能为空"); return resultDomain; } // 2. 检查是否存在 - TbAiAgentConfig existing = agentConfigMapper.selectAgentConfigById(agentConfig.getID()); + TbAiAgentConfig existing = agentConfigMapper.selectAgentConfigById(agentConfig.getId()); if (existing == null || existing.getDeleted()) { resultDomain.fail("智能体不存在"); return resultDomain; @@ -116,7 +116,7 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { // 3. 检查名称是否重复 if (StringUtils.hasText(agentConfig.getName()) && !agentConfig.getName().equals(existing.getName())) { - ResultDomain checkResult = checkNameExists(agentConfig.getName(), agentConfig.getID()); + ResultDomain checkResult = checkNameExists(agentConfig.getName(), agentConfig.getId()); if (checkResult.getData()) { resultDomain.fail("智能体名称已存在"); return resultDomain; @@ -131,15 +131,15 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { } // 5. 更新字段 - agentConfig.setUpdater(currentUser.getID()); + agentConfig.setUpdater(currentUser.getId()); agentConfig.setUpdateTime(new Date()); // 6. 执行更新 int rows = agentConfigMapper.updateAgentConfig(agentConfig); if (rows > 0) { // 重新查询最新数据 - TbAiAgentConfig updated = agentConfigMapper.selectAgentConfigById(agentConfig.getID()); - log.info("更新智能体成功: {} - {}", agentConfig.getID(), agentConfig.getName()); + TbAiAgentConfig updated = agentConfigMapper.selectAgentConfigById(agentConfig.getId()); + log.info("更新智能体成功: {} - {}", agentConfig.getId(), agentConfig.getName()); resultDomain.success("更新智能体成功", updated); return resultDomain; } else { @@ -182,8 +182,8 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { // 4. 逻辑删除 TbAiAgentConfig deleteEntity = new TbAiAgentConfig(); - deleteEntity.setID(agentId); - deleteEntity.setUpdater(currentUser.getID()); + deleteEntity.setId(agentId); + deleteEntity.setUpdater(currentUser.getId()); int rows = agentConfigMapper.deleteAgentConfig(deleteEntity); if (rows > 0) { @@ -310,13 +310,13 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { // 3. 更新状态 TbAiAgentConfig update = new TbAiAgentConfig(); - update.setID(agentId); + update.setId(agentId); update.setStatus(status); update.setUpdateTime(new Date()); TbSysUser currentUser = LoginUtil.getCurrentUser(); if (currentUser != null) { - update.setUpdater(currentUser.getID()); + update.setUpdater(currentUser.getId()); } int rows = agentConfigMapper.updateAgentConfig(update); @@ -370,14 +370,14 @@ public class AiAgentConfigServiceImpl implements AiAgentConfigService { // 4. 更新Dify配置 TbAiAgentConfig update = new TbAiAgentConfig(); - update.setID(agentId); + update.setId(agentId); update.setDifyAppId(difyAppId); update.setDifyApiKey(difyApiKey); update.setUpdateTime(new Date()); TbSysUser currentUser = LoginUtil.getCurrentUser(); if (currentUser != null) { - update.setUpdater(currentUser.getID()); + update.setUpdater(currentUser.getId()); } int rows = agentConfigMapper.updateAgentConfig(update); diff --git a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatHistoryServiceImpl.java b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatHistoryServiceImpl.java index 0401cde..c8d3b87 100644 --- a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatHistoryServiceImpl.java +++ b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatHistoryServiceImpl.java @@ -55,7 +55,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { // 查询数据 List conversations = conversationMapper.selectUserConversationsPage( - currentUser.getID(), + currentUser.getId(), agentId, keyword, isFavorite, @@ -66,7 +66,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { // 查询总数 long total = conversationMapper.countUserConversationsWithFilter( - currentUser.getID(), + currentUser.getId(), agentId, keyword, isFavorite, @@ -105,14 +105,14 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { // 搜索会话 List conversations = conversationMapper.searchConversationsByKeyword( - currentUser.getID(), + currentUser.getId(), keyword, pageParam ); // 查询总数 long total = conversationMapper.countSearchConversations( - currentUser.getID(), + currentUser.getId(), keyword ); @@ -147,7 +147,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { // 搜索消息 List messages = messageMapper.searchMessagesByContent( - currentUser.getID(), + currentUser.getId(), keyword, conversationId, pageParam @@ -155,7 +155,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { // 查询总数 long total = messageMapper.countSearchMessages( - currentUser.getID(), + currentUser.getId(), keyword, conversationId ); @@ -197,14 +197,14 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { return resultDomain; } - if (currentUser != null && !conversation.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权操作此会话"); return resultDomain; } // 更新收藏状态 TbAiConversation update = new TbAiConversation(); - update.setID(conversationId); + update.setId(conversationId); update.setIsFavorite(isFavorite); update.setUpdateTime(new Date()); conversationMapper.updateConversation(update); @@ -240,14 +240,14 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { return resultDomain; } - if (currentUser != null && !conversation.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权操作此会话"); return resultDomain; } // 更新置顶状态 TbAiConversation update = new TbAiConversation(); - update.setID(conversationId); + update.setId(conversationId); update.setIsPinned(isPinned); update.setUpdateTime(new Date()); conversationMapper.updateConversation(update); @@ -284,17 +284,17 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { int deleteCount = 0; for (String conversationId : conversationIds) { TbAiConversation conversation = conversationMapper.selectConversationById(conversationId); - if (conversation != null && conversation.getUserID().equals(currentUser.getID())) { + if (conversation != null && conversation.getUserID().equals(currentUser.getId())) { // 逻辑删除会话 TbAiConversation deleteEntity = new TbAiConversation(); - deleteEntity.setID(conversationId); + deleteEntity.setId(conversationId); conversationMapper.deleteConversation(deleteEntity); // 同时删除消息 List messages = messageMapper.selectMessagesByConversationId(conversationId); for (TbAiMessage message : messages) { TbAiMessage deleteMsg = new TbAiMessage(); - deleteMsg.setID(message.getID()); + deleteMsg.setId(message.getId()); messageMapper.deleteMessage(deleteMsg); } @@ -324,7 +324,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { return resultDomain; } - String targetUserId = StringUtils.hasText(userId) ? userId : currentUser.getID(); + String targetUserId = StringUtils.hasText(userId) ? userId : currentUser.getId(); // 统计数据 Map statistics = new HashMap<>(); @@ -388,7 +388,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { } TbSysUser currentUser = LoginUtil.getCurrentUser(); - if (currentUser != null && !conversation.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权访问此会话"); return resultDomain; } @@ -455,7 +455,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { } TbSysUser currentUser = LoginUtil.getCurrentUser(); - if (currentUser != null && !conversation.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权访问此会话"); return resultDomain; } @@ -523,7 +523,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { } TbSysUser currentUser = LoginUtil.getCurrentUser(); - if (currentUser != null && !conversation.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权访问此会话"); return resultDomain; } @@ -631,7 +631,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { // 查询过期会话ID List expiredIds = conversationMapper.selectExpiredConversationIds( - currentUser.getID(), + currentUser.getId(), beforeDate ); @@ -648,7 +648,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { List messages = messageMapper.selectMessagesByConversationId(conversationId); for (TbAiMessage message : messages) { TbAiMessage deleteMsg = new TbAiMessage(); - deleteMsg.setID(message.getID()); + deleteMsg.setId(message.getId()); messageMapper.deleteMessage(deleteMsg); } } @@ -677,7 +677,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { int queryLimit = (limit != null && limit > 0) ? limit : 10; List conversations = conversationMapper.selectRecentConversations( - currentUser.getID(), + currentUser.getId(), queryLimit ); @@ -704,7 +704,7 @@ public class AiChatHistoryServiceImpl implements AiChatHistoryService { int queryLimit = (limit != null && limit > 0) ? limit : 10; List conversations = conversationMapper.selectPopularConversations( - currentUser.getID(), + currentUser.getId(), queryLimit ); diff --git a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatServiceImpl.java b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatServiceImpl.java index edf79e4..63b4283 100644 --- a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatServiceImpl.java +++ b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiChatServiceImpl.java @@ -206,7 +206,7 @@ public class AiChatServiceImpl implements AiChatService { emitter.complete(); return emitter; } - if (!conversation.getUserID().equals(currentUser.getID())) { + if (!conversation.getUserID().equals(currentUser.getId())) { emitter.send(SseEmitter.event().name("error").data("无权访问此会话")); emitter.complete(); return emitter; @@ -222,12 +222,12 @@ public class AiChatServiceImpl implements AiChatService { conversation = createResult.getData(); } - final String finalConversationId = conversation.getID(); + final String finalConversationId = conversation.getId(); // 5. 创建用户消息记录 TbAiMessage userMessage = new TbAiMessage(); String userMessageId = UUID.randomUUID().toString(); - userMessage.setID(userMessageId); + userMessage.setId(userMessageId); userMessage.setConversationID(finalConversationId); userMessage.setAgentID(agentId); userMessage.setRole("user"); @@ -235,7 +235,7 @@ public class AiChatServiceImpl implements AiChatService { userMessage.setCreateTime(new Date()); userMessage.setUpdateTime(new Date()); userMessage.setDeleted(false); - userMessage.setUserID(currentUser.getID()); + userMessage.setUserID(currentUser.getId()); // 处理文件关联（将文件ID列表转换为JSON数组保存） if (filesData != null && !filesData.isEmpty()) { @@ -261,7 +261,7 @@ public class AiChatServiceImpl implements AiChatService { // 6. 保存文件关联记录到tb_ai_upload_file if (filesData != null && !filesData.isEmpty()) { - saveMessageFileRecords(userMessageId, finalConversationId, currentUser.getID(), filesData); + saveMessageFileRecords(userMessageId, finalConversationId, currentUser.getId(), filesData); } // 注意：AI消息记录将在获取到Dify的task_id后创建 @@ -272,7 +272,7 @@ public class AiChatServiceImpl implements AiChatService { // 7. 构建Dify请求 ChatRequest chatRequest = new ChatRequest(); chatRequest.setQuery(query); - chatRequest.setUser(currentUser.getID()); + chatRequest.setUser(currentUser.getId()); if (StringUtils.hasText(conversation.getDifyConversationId())) { chatRequest.setConversationId(conversation.getDifyConversationId()); @@ -331,7 +331,7 @@ public class AiChatServiceImpl implements AiChatService { // 更新AI消息内容（使用task_id作为消息ID） if (taskId.get() != null) { TbAiMessage updateMessage = new TbAiMessage(); - updateMessage.setID(taskId.get()); + updateMessage.setId(taskId.get()); updateMessage.setContent(fullAnswer.toString()); updateMessage.setDifyMessageId(difyMessageId.get()); updateMessage.setUpdateTime(new Date()); @@ -341,7 +341,7 @@ public class AiChatServiceImpl implements AiChatService { // 更新会话的Dify会话ID if (StringUtils.hasText(difyConversationId.get())) { TbAiConversation updateConv = new TbAiConversation(); - updateConv.setID(finalConversationId); + updateConv.setId(finalConversationId); updateConv.setDifyConversationId(difyConversationId.get()); updateConv.setMessageCount((finalConversation.getMessageCount() != null ? finalConversation.getMessageCount() : 0) + 2); @@ -382,7 +382,7 @@ public class AiChatServiceImpl implements AiChatService { // 使用task_id作为消息ID，创建AI消息记录 TbAiMessage aiMessage = new TbAiMessage(); - aiMessage.setID(difyTaskId); // 使用Dify的task_id作为消息ID + aiMessage.setId(difyTaskId); // 使用Dify的task_id作为消息ID aiMessage.setConversationID(finalConversationId); aiMessage.setAgentID(agentId); aiMessage.setRole("assistant"); @@ -515,7 +515,7 @@ public class AiChatServiceImpl implements AiChatService { TbAiConversation conversation; if (StringUtils.hasText(conversationId)) { conversation = conversationMapper.selectConversationById(conversationId); - if (conversation == null || !conversation.getUserID().equals(currentUser.getID())) { + if (conversation == null || !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("会话不存在或无权访问"); return resultDomain; } @@ -526,12 +526,12 @@ public class AiChatServiceImpl implements AiChatService { return resultDomain; } conversation = createResult.getData(); - conversationId = conversation.getID(); + conversationId = conversation.getId(); } // 创建用户消息 TbAiMessage userMessage = new TbAiMessage(); - userMessage.setID(UUID.randomUUID().toString()); + userMessage.setId(UUID.randomUUID().toString()); userMessage.setConversationID(conversationId); userMessage.setAgentID(agentId); userMessage.setRole("user"); @@ -544,7 +544,7 @@ public class AiChatServiceImpl implements AiChatService { // 构建Dify请求 ChatRequest chatRequest = new ChatRequest(); chatRequest.setQuery(query); - chatRequest.setUser(currentUser.getID()); + chatRequest.setUser(currentUser.getId()); if (StringUtils.hasText(conversation.getDifyConversationId())) { chatRequest.setConversationId(conversation.getDifyConversationId()); @@ -561,7 +561,7 @@ public class AiChatServiceImpl implements AiChatService { // 创建AI回复消息 TbAiMessage aiMessage = new TbAiMessage(); - aiMessage.setID(UUID.randomUUID().toString()); + aiMessage.setId(UUID.randomUUID().toString()); aiMessage.setConversationID(conversationId); aiMessage.setAgentID(agentId); aiMessage.setRole("assistant"); @@ -574,14 +574,14 @@ public class AiChatServiceImpl implements AiChatService { // 更新会话 TbAiConversation updateConv = new TbAiConversation(); - updateConv.setID(conversationId); + updateConv.setId(conversationId); updateConv.setDifyConversationId(chatResponse.getConversationId()); updateConv.setMessageCount((conversation.getMessageCount() != null ? conversation.getMessageCount() : 0) + 2); updateConv.setUpdateTime(new Date()); conversationMapper.updateConversation(updateConv); - log.info("阻塞式对话成功: {} - {}", conversationId, aiMessage.getID()); + log.info("阻塞式对话成功: {} - {}", conversationId, aiMessage.getId()); resultDomain.success("对话成功", aiMessage); return resultDomain; @@ -624,7 +624,7 @@ public class AiChatServiceImpl implements AiChatService { try { difyApiClient.stopChatMessage( taskId, - currentUser.getID(), + currentUser.getId(), agent.getDifyApiKey() ); log.info("对话停止成功，task_id: {}", taskId); @@ -673,8 +673,8 @@ public class AiChatServiceImpl implements AiChatService { // 创建会话 TbAiConversation conversation = new TbAiConversation(); - conversation.setID(UUID.randomUUID().toString()); - conversation.setUserID(currentUser.getID()); + conversation.setId(UUID.randomUUID().toString()); + conversation.setUserID(currentUser.getId()); conversation.setAgentID(agentId); conversation.setTitle(StringUtils.hasText(title) ? title : "新对话"); conversation.setMessageCount(0); @@ -684,7 +684,7 @@ public class AiChatServiceImpl implements AiChatService { conversationMapper.insertConversation(conversation); - log.info("创建会话成功: {} - {}", conversation.getID(), currentUser.getID()); + log.info("创建会话成功: {} - {}", conversation.getId(), currentUser.getId()); resultDomain.success("创建会话成功", conversation); return resultDomain; @@ -713,7 +713,7 @@ public class AiChatServiceImpl implements AiChatService { // 验证所属权 TbSysUser currentUser = LoginUtil.getCurrentUser(); - if (currentUser != null && !conversation.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权访问此会话"); return resultDomain; } @@ -734,20 +734,20 @@ public class AiChatServiceImpl implements AiChatService { ResultDomain resultDomain = new ResultDomain<>(); try { - if (!StringUtils.hasText(conversation.getID())) { + if (!StringUtils.hasText(conversation.getId())) { resultDomain.fail("会话ID不能为空"); return resultDomain; } // 验证所属权 - TbAiConversation existing = conversationMapper.selectConversationById(conversation.getID()); + TbAiConversation existing = conversationMapper.selectConversationById(conversation.getId()); if (existing == null || existing.getDeleted()) { resultDomain.fail("会话不存在"); return resultDomain; } TbSysUser currentUser = LoginUtil.getCurrentUser(); - if (currentUser != null && !existing.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !existing.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权修改此会话"); return resultDomain; } @@ -757,7 +757,7 @@ public class AiChatServiceImpl implements AiChatService { conversationMapper.updateConversation(conversation); // 重新查询 - TbAiConversation updated = conversationMapper.selectConversationById(conversation.getID()); + TbAiConversation updated = conversationMapper.selectConversationById(conversation.getId()); resultDomain.success("更新成功", updated); return resultDomain; @@ -787,21 +787,21 @@ public class AiChatServiceImpl implements AiChatService { } TbSysUser currentUser = LoginUtil.getCurrentUser(); - if (currentUser != null && !existing.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !existing.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权删除此会话"); return resultDomain; } // 逻辑删除会话 TbAiConversation deleteEntity = new TbAiConversation(); - deleteEntity.setID(conversationId); + deleteEntity.setId(conversationId); conversationMapper.deleteConversation(deleteEntity); // 同时逻辑删除该会话的所有消息 List messages = messageMapper.selectMessagesByConversationId(conversationId); for (TbAiMessage message : messages) { TbAiMessage deleteMsg = new TbAiMessage(); - deleteMsg.setID(message.getID()); + deleteMsg.setId(message.getId()); messageMapper.deleteMessage(deleteMsg); } @@ -828,7 +828,7 @@ public class AiChatServiceImpl implements AiChatService { } List conversations = conversationMapper.selectConversationsByUserId( - currentUser.getID(), agentId + currentUser.getId(), agentId ); resultDomain.success("查询成功", conversations); @@ -859,7 +859,7 @@ public class AiChatServiceImpl implements AiChatService { } TbSysUser currentUser = LoginUtil.getCurrentUser(); - if (currentUser != null && !conversation.getUserID().equals(currentUser.getID())) { + if (currentUser != null && !conversation.getUserID().equals(currentUser.getId())) { resultDomain.fail("无权访问此会话"); return resultDomain; } @@ -996,7 +996,7 @@ public class AiChatServiceImpl implements AiChatService { // 更新会话摘要 TbAiConversation update = new TbAiConversation(); - update.setID(conversationId); + update.setId(conversationId); update.setSummary(summary); update.setUpdateTime(new Date()); conversationMapper.updateConversation(update); @@ -1066,7 +1066,7 @@ public class AiChatServiceImpl implements AiChatService { difyApiClient.submitMessageFeedback( message.getDifyMessageId(), difyRating, - currentUser.getID(), + currentUser.getId(), feedback, agent.getDifyApiKey() ); @@ -1079,7 +1079,7 @@ public class AiChatServiceImpl implements AiChatService { // 更新本地评价 TbAiMessage update = new TbAiMessage(); - update.setID(messageId); + update.setId(messageId); update.setRating(rating); update.setFeedback(feedback); update.setUpdateTime(new Date()); @@ -1110,7 +1110,7 @@ public class AiChatServiceImpl implements AiChatService { for (DifyFileInfo fileInfo : filesData) { TbAiUploadFile uploadFile = new TbAiUploadFile(); - uploadFile.setID(UUID.randomUUID().toString()); + uploadFile.setId(UUID.randomUUID().toString()); uploadFile.setUserID(userId); uploadFile.setConversationID(conversationId); uploadFile.setMessageID(messageId); // 绑定到消息 @@ -1152,7 +1152,7 @@ public class AiChatServiceImpl implements AiChatService { // 获取当前登录用户的完整信息（包含部门角色列表） LoginDomain loginDomain = LoginUtil.getCurrentLoginDomain(); if (loginDomain == null || loginDomain.getRoles() == null || loginDomain.getRoles().isEmpty()) { - log.warn("用户 {} 没有部门角色信息，返回空知识库列表", user.getID()); + log.warn("用户 {} 没有部门角色信息，返回空知识库列表", user.getId()); return null; } @@ -1161,7 +1161,7 @@ public class AiChatServiceImpl implements AiChatService { String deptPath = userRole.getDeptPath(); if (deptPath == null || deptPath.isEmpty()) { - log.warn("用户 {} 的部门路径为空，返回空知识库列表", user.getID()); + log.warn("用户 {} 的部门路径为空，返回空知识库列表", user.getId()); return null; } @@ -1169,15 +1169,15 @@ public class AiChatServiceImpl implements AiChatService { List knowledgeIds = ((AiKnowledgeRedisServiceImpl) knowledgeRedisService).getKnowledgeIdsByDeptPath(deptPath); if (knowledgeIds == null || knowledgeIds.isEmpty()) { - log.warn("用户 {} 所在部门路径 {} 没有关联的知识库", user.getID(), deptPath); + log.warn("用户 {} 所在部门路径 {} 没有关联的知识库", user.getId(), deptPath); return null; } - log.info("用户 {} 从部门路径 {} 获取到 {} 个知识库", user.getID(), deptPath, knowledgeIds.size()); + log.info("用户 {} 从部门路径 {} 获取到 {} 个知识库", user.getId(), deptPath, knowledgeIds.size()); return knowledgeIds; } catch (Exception e) { - log.error("根据用户获取知识库ID失败: userId={}", user.getID(), e); + log.error("根据用户获取知识库ID失败: userId={}", user.getId(), e); return null; } } diff --git a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeRedisServiceImpl.java b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeRedisServiceImpl.java index 53a81c5..518bd1f 100644 --- a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeRedisServiceImpl.java +++ b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeRedisServiceImpl.java @@ -61,7 +61,7 @@ public class AiKnowledgeRedisServiceImpl implements AiKnowledgeRedisService, Com String deptId = knowledge.getCreatorDept(); if (deptId == null || deptId.isEmpty()) { - log.warn("知识库 {} 没有部门信息，跳过", knowledge.getID()); + log.warn("知识库 {} 没有部门信息，跳过", knowledge.getId()); continue; } diff --git a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeServiceImpl.java b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeServiceImpl.java index 99d48e9..27968f2 100644 --- a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeServiceImpl.java +++ b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiKnowledgeServiceImpl.java @@ -188,7 +188,7 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { } // 4. 保存到本地数据库 - knowledge.setID(UUID.randomUUID().toString()); + knowledge.setId(UUID.randomUUID().toString()); knowledge.setDifyDatasetId(difyDatasetId); knowledge.setDifyIndexingTechnique(indexingTechnique); knowledge.setEmbeddingModel(embeddingModel); @@ -198,9 +198,9 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { } // 保存检索配置（从前端传入，已经在 knowledge 对象中） // retrievalTopK, retrievalScoreThreshold, rerankModel, rerankModelProvider 已设置 - knowledge.setCreator(currentUser.getID()); + knowledge.setCreator(currentUser.getId()); knowledge.setCreatorDept(deptId); - knowledge.setUpdater(currentUser.getID()); + knowledge.setUpdater(currentUser.getId()); knowledge.setCreateTime(new Date()); knowledge.setUpdateTime(new Date()); knowledge.setDeleted(false); @@ -230,7 +230,7 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { // 5. 创建权限记录 try { createKnowledgePermission( - knowledge.getID(), + knowledge.getId(), permissionType, deptIds, roleIds, @@ -250,7 +250,7 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { // 缓存更新失败不影响知识库创建，记录日志即可 } - log.info("知识库创建成功: {} - {}", knowledge.getID(), knowledge.getTitle()); + log.info("知识库创建成功: {} - {}", knowledge.getId(), knowledge.getTitle()); resultDomain.success("知识库创建成功", knowledge); return resultDomain; @@ -268,20 +268,20 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { try { // 1. 参数验证 - if (!StringUtils.hasText(knowledge.getID())) { + if (!StringUtils.hasText(knowledge.getId())) { resultDomain.fail("知识库ID不能为空"); return resultDomain; } // 2. 检查是否存在 - TbAiKnowledge existing = knowledgeMapper.selectKnowledgeById(knowledge.getID()); + TbAiKnowledge existing = knowledgeMapper.selectKnowledgeById(knowledge.getId()); if (existing == null || existing.getDeleted()) { resultDomain.fail("知识库不存在"); return resultDomain; } // 3. 权限检查：只有创建者或有write权限的用户可以修改 - ResultDomain permissionCheck = checkKnowledgePermission(knowledge.getID(), "write"); + ResultDomain permissionCheck = checkKnowledgePermission(knowledge.getId(), "write"); if (!permissionCheck.getData()) { resultDomain.fail("无权限修改此知识库"); return resultDomain; @@ -319,7 +319,7 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { updateRequest.setIndexingTechnique(knowledge.getDifyIndexingTechnique()); needUpdateDify = true; } else { - log.warn("不允许从high_quality降级为economy: knowledgeId={}", knowledge.getID()); + log.warn("不允许从high_quality降级为economy: knowledgeId={}", knowledge.getId()); } } @@ -425,14 +425,14 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { } // 6. 更新本地数据 - knowledge.setUpdater(currentUser.getID()); + knowledge.setUpdater(currentUser.getId()); knowledge.setUpdateTime(new Date()); int rows = knowledgeMapper.updateKnowledge(knowledge); if (rows > 0) { // 重新查询最新数据 - TbAiKnowledge updated = knowledgeMapper.selectKnowledgeById(knowledge.getID()); - log.info("知识库更新成功: {} - {}", knowledge.getID(), knowledge.getTitle()); + TbAiKnowledge updated = knowledgeMapper.selectKnowledgeById(knowledge.getId()); + log.info("知识库更新成功: {} - {}", knowledge.getId(), knowledge.getTitle()); resultDomain.success("知识库更新成功", updated); return resultDomain; } else { @@ -473,7 +473,7 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { return resultDomain; } - if (!existing.getCreator().equals(currentUser.getID())) { + if (!existing.getCreator().equals(currentUser.getId())) { resultDomain.fail("只有创建者可以删除知识库"); return resultDomain; } @@ -491,8 +491,8 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { // 5. 逻辑删除本地记录 TbAiKnowledge deleteEntity = new TbAiKnowledge(); - deleteEntity.setID(knowledgeId); - deleteEntity.setUpdater(currentUser.getID()); + deleteEntity.setId(knowledgeId); + deleteEntity.setUpdater(currentUser.getId()); int rows = knowledgeMapper.deleteKnowledge(deleteEntity); if (rows > 0) { @@ -623,14 +623,14 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { // 3. 更新本地信息 TbAiKnowledge update = new TbAiKnowledge(); - update.setID(knowledgeId); + update.setId(knowledgeId); update.setDocumentCount(difyDetail.getDocumentCount()); update.setTotalChunks(difyDetail.getWordCount()); // Dify的word_count对应我们的chunks update.setUpdateTime(new Date()); TbSysUser currentUser = LoginUtil.getCurrentUser(); if (currentUser != null) { - update.setUpdater(currentUser.getID()); + update.setUpdater(currentUser.getId()); } knowledgeMapper.updateKnowledge(update); @@ -679,7 +679,7 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { return resultDomain; } - if (!knowledge.getCreator().equals(currentUser.getID())) { + if (!knowledge.getCreator().equals(currentUser.getId())) { resultDomain.fail("只有创建者可以修改权限"); return resultDomain; } diff --git a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiUploadFileServiceImpl.java b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiUploadFileServiceImpl.java index 09d4caa..05c0305 100644 --- a/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiUploadFileServiceImpl.java +++ b/schoolNewsServ/ai/src/main/java/org/xyzh/ai/service/impl/AiUploadFileServiceImpl.java @@ -114,7 +114,7 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { file, "ai-agent", // 模块名 agentId, // 业务ID（智能体ID） - currentUser.getID() // 上传者 + currentUser.getId() // 上传者 ); if (!uploadResult.isSuccess() || uploadResult.getData() == null) { @@ -123,7 +123,7 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { } TbSysFile sysFile = (TbSysFile) uploadResult.getData(); - log.info("文件已保存到系统文件表: sysFileId={}, fileName={}", sysFile.getID(), sysFile.getOriginalName()); + log.info("文件已保存到系统文件表: sysFileId={}, fileName={}", sysFile.getId(), sysFile.getOriginalName()); // 6. 获取已保存文件的File对象，直接用于上传到Dify（不需要再保存临时文件） File fileToUpload = fileService.getFileByRelativePath(sysFile.getFilePath()); @@ -133,13 +133,13 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { DifyFileInfo difyResponse = difyApiClient.uploadFileForChat( fileToUpload, originalFilename, - currentUser.getID(), + currentUser.getId(), agent.getDifyApiKey()); // 9. 转换为前端需要的格式，包含系统文件ID和文件路径 Map fileInfo = new HashMap<>(); fileInfo.put("id", difyResponse.getId()); // Dify文件ID - fileInfo.put("sys_file_id", sysFile.getID()); // 系统文件ID（重要：用于关联消息） + fileInfo.put("sys_file_id", sysFile.getId()); // 系统文件ID（重要：用于关联消息） fileInfo.put("file_path", sysFile.getFilePath()); // 文件路径（重要：用于保存记录） fileInfo.put("name", difyResponse.getName()); fileInfo.put("size", difyResponse.getSize()); @@ -150,7 +150,7 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { fileInfo.put("upload_file_id", difyResponse.getId()); // Dify上传文件ID fileInfo.put("file_url", sysFile.getFileUrl()); // 文件访问URL - log.info("对话文件上传成功: sysFileId={}, difyFileId={}", sysFile.getID(), difyResponse.getId()); + log.info("对话文件上传成功: sysFileId={}, difyFileId={}", sysFile.getId(), difyResponse.getId()); resultDomain.success("文件上传成功", fileInfo); return resultDomain; @@ -228,7 +228,7 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { file, "ai-knowledge", // 模块名 knowledgeId, // 业务ID（知识库ID） - currentUser.getID() // 上传者 + currentUser.getId() // 上传者 ); if (!uploadResult.isSuccess() || uploadResult.getData() == null) { @@ -237,7 +237,7 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { } TbSysFile sysFile = (TbSysFile) uploadResult.getData(); - log.info("文件已保存到系统文件表: sysFileId={}, fileName={}", sysFile.getID(), sysFile.getOriginalName()); + log.info("文件已保存到系统文件表: sysFileId={}, fileName={}", sysFile.getId(), sysFile.getOriginalName()); // 6. 获取已保存文件的File对象，直接用于上传到Dify File fileToUpload = fileService.getFileByRelativePath(sysFile.getFilePath()); @@ -259,10 +259,10 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { // 8. 保存到本地数据库 TbAiUploadFile uploadFile = new TbAiUploadFile(); - uploadFile.setID(UUID.randomUUID().toString()); - uploadFile.setUserID(currentUser.getID()); + uploadFile.setId(UUID.randomUUID().toString()); + uploadFile.setUserID(currentUser.getId()); uploadFile.setKnowledgeId(knowledgeId); - uploadFile.setSysFileId(sysFile.getID()); // 关联系统文件ID + uploadFile.setSysFileId(sysFile.getId()); // 关联系统文件ID uploadFile.setFileName(originalFilename); uploadFile.setFilePath(sysFile.getFilePath()); // 保存系统文件的相对路径 uploadFile.setFileSize(file.getSize()); @@ -282,10 +282,10 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { int knowledgeRows = knowledgeMapper.updateKnowledge(knowledge); if (rows > 0) { log.info("知识库文件上传成功: uploadFileId={}, sysFileId={}, fileName={}", - uploadFile.getID(), sysFile.getID(), originalFilename); + uploadFile.getId(), sysFile.getId(), originalFilename); // 9. 异步更新向量化状态 - asyncUpdateVectorStatus(uploadFile.getID()); + asyncUpdateVectorStatus(uploadFile.getId()); resultDomain.success("文件上传成功", uploadFile); if (knowledgeRows <=0) { @@ -392,7 +392,7 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { // 4. 逻辑删除本地记录 TbAiUploadFile deleteEntity = new TbAiUploadFile(); - deleteEntity.setID(fileId); + deleteEntity.setId(fileId); int rows = uploadFileMapper.deleteUploadFile(deleteEntity); knowledge.setDocumentCount(knowledge.getDocumentCount() - 1); @@ -522,7 +522,7 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { // 4. 更新本地状态 TbAiUploadFile update = new TbAiUploadFile(); - update.setID(fileId); + update.setId(fileId); // 映射Dify状态到本地状态：completed=2, processing=1, error=3 // DocumentStatusResponse返回的是文档列表，取第一个 @@ -583,9 +583,9 @@ public class AiUploadFileServiceImpl implements AiUploadFileService { List> futures = files.stream() .map(file -> CompletableFuture.runAsync(() -> { try { - syncFileStatus(file.getID()); + syncFileStatus(file.getId()); } catch (Exception e) { - log.error("同步文件状态失败: {}", file.getID(), e); + log.error("同步文件状态失败: {}", file.getId(), e); } }, executorService)) .collect(Collectors.toList()); diff --git a/schoolNewsServ/ai/src/main/resources/mapper/AiUploadFileMapper.xml b/schoolNewsServ/ai/src/main/resources/mapper/AiUploadFileMapper.xml index 2b2d225..d69b397 100644 --- a/schoolNewsServ/ai/src/main/resources/mapper/AiUploadFileMapper.xml +++ b/schoolNewsServ/ai/src/main/resources/mapper/AiUploadFileMapper.xml @@ -216,7 +216,7 @@ ) VALUES ( - #{file.ID}, #{file.userID}, #{file.knowledgeId}, #{file.conversationID}, #{file.messageID}, + #{file.id}, #{file.userID}, #{file.knowledgeId}, #{file.conversationID}, #{file.messageID}, #{file.sysFileId}, #{file.fileName}, #{file.filePath}, #{file.fileSize}, #{file.fileType}, #{file.mimeType}, #{file.difyDocumentId}, #{file.difyBatchId}, #{file.difyUploadFileId}, #{file.chunkCount}, #{file.status}, #{file.enabled}, #{file.displayStatus}, #{file.createTime}, #{file.updateTime}, #{file.deleted} diff --git a/schoolNewsServ/ai/前端API接口文档.md b/schoolNewsServ/ai/前端API接口文档.md index 37f38d0..96e3059 100644 --- a/schoolNewsServ/ai/前端API接口文档.md +++ b/schoolNewsServ/ai/前端API接口文档.md @@ -255,7 +255,7 @@ const agentResult = await aiAgentConfigApi.createAgent({ status: 1 }); -const agentId = agentResult.data?.ID; +const agentId = agentResult.data?.id; // 2. 流式对话 await chatApi.streamChat( @@ -294,7 +294,7 @@ const knowledgeResult = await knowledgeApi.createKnowledge({ embeddingModel: 'text-embedding-ada-002' }); -const knowledgeId = knowledgeResult.data?.ID; +const knowledgeId = knowledgeResult.data?.id; // 2. 上传文件 const files = document.querySelector('input[type="file"]').files; diff --git a/schoolNewsServ/ai/知识库隔离方案.md b/schoolNewsServ/ai/知识库隔离方案.md index ff55292..7de4cb0 100644 --- a/schoolNewsServ/ai/知识库隔离方案.md +++ b/schoolNewsServ/ai/知识库隔离方案.md @@ -50,7 +50,7 @@ public class AiKnowledgeServiceImpl { String deptId = userDeptRoles.isEmpty() ? null : userDeptRoles.get(0).getDeptID(); // 2. 保存知识库 - knowledge.setCreator(currentUser.getID()); + knowledge.setCreator(currentUser.getId()); knowledge.setCreatorDept(deptId); knowledgeMapper.insert(knowledge); @@ -58,27 +58,27 @@ public class AiKnowledgeServiceImpl { switch (permissionType) { case PUBLIC: // 公开知识库：所有人可读 - createPublicPermission(knowledge.getID()); + createPublicPermission(knowledge.getId()); break; case DEPARTMENT: // 部门知识库：本部门所有人可读写 - createDepartmentPermission(knowledge.getID(), deptId); + createDepartmentPermission(knowledge.getId(), deptId); break; case DEPARTMENT_INHERIT: // 部门继承：本部门及子部门可读 - createDepartmentInheritPermission(knowledge.getID(), deptId); + createDepartmentInheritPermission(knowledge.getId(), deptId); break; case ROLE: // 角色知识库：特定角色可读（跨部门） - createRolePermission(knowledge.getID(), roleIds); + createRolePermission(knowledge.getId(), roleIds); break; case PRIVATE: // 私有知识库：仅创建者所在部门的特定角色 - createPrivatePermission(knowledge.getID(), deptId, roleIds); + createPrivatePermission(knowledge.getId(), deptId, roleIds); break; } @@ -88,7 +88,7 @@ public class AiKnowledgeServiceImpl { // 创建公开权限 private void createPublicPermission(String knowledgeId) { TbResourcePermission permission = new TbResourcePermission(); - permission.setID(UUID.randomUUID().toString()); + permission.setId(UUID.randomUUID().toString()); permission.setResourceType(10); // AI_KNOWLEDGE permission.setResourceId(knowledgeId); permission.setDeptId(null); // NULL表示不限部门 @@ -102,7 +102,7 @@ public class AiKnowledgeServiceImpl { // 创建部门权限 private void createDepartmentPermission(String knowledgeId, String deptId) { TbResourcePermission permission = new TbResourcePermission(); - permission.setID(UUID.randomUUID().toString()); + permission.setId(UUID.randomUUID().toString()); permission.setResourceType(10); permission.setResourceId(knowledgeId); permission.setDeptId(deptId); // 指定部门 @@ -120,7 +120,7 @@ public class AiKnowledgeServiceImpl { // 为本部门创建权限（已通过dept_path自动继承给子部门） TbResourcePermission permission = new TbResourcePermission(); - permission.setID(UUID.randomUUID().toString()); + permission.setId(UUID.randomUUID().toString()); permission.setResourceType(10); permission.setResourceId(knowledgeId); permission.setDeptId(deptId); @@ -392,7 +392,7 @@ private String getCurrentUserCacheKey() { String roleIds = roles.stream() .map(r -> r.getDeptID() + ":" + r.getRoleID()) .collect(Collectors.joining(",")); - return user.getID() + ":" + roleIds; + return user.getId() + ":" + roleIds; } ``` diff --git a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/domain/UserPrincipal.java b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/domain/UserPrincipal.java index 9bb3a3b..fc71a00 100644 --- a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/domain/UserPrincipal.java +++ b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/domain/UserPrincipal.java @@ -65,7 +65,7 @@ public class UserPrincipal implements UserDetails { public Collection getAuthorities() { // 角色权限 List roleAuthorities = roles.stream() - .map(role -> new SimpleGrantedAuthority("ROLE_" + role.getID())) + .map(role -> new SimpleGrantedAuthority("ROLE_" + role.getId())) .collect(Collectors.toList()); // 功能权限 diff --git a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java index cd85f8c..1bf2ccb 100644 --- a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java +++ b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java @@ -242,7 +242,7 @@ public class LoginServiceImpl implements LoginService { loginDomain.setIpAddress(ipAddress); // 用户信息 try { - ResultDomain resultDomain = userService.getUserInfoById(user.getID()); + ResultDomain resultDomain = userService.getUserInfoById(user.getId()); if (resultDomain.isSuccess()) { loginDomain.setUserInfo(resultDomain.getData()); } @@ -251,7 +251,7 @@ public class LoginServiceImpl implements LoginService { } // 获取用户角色和权限（如果服务可用） try { - ResultDomain resultDomain = roleService.getDeptRolesByUserId(user.getID()); + ResultDomain resultDomain = roleService.getDeptRolesByUserId(user.getId()); if (resultDomain.isSuccess()) { List roles = resultDomain.getDataList(); loginDomain.setRoles(roles); @@ -263,7 +263,7 @@ public class LoginServiceImpl implements LoginService { } try { - ResultDomain resultDomain = permissionService.getPermissionsByUserId(user.getID()); + ResultDomain resultDomain = permissionService.getPermissionsByUserId(user.getId()); if (resultDomain.isSuccess()) { List permissions = resultDomain.getDataList(); loginDomain.setPermissions(permissions); @@ -275,7 +275,7 @@ public class LoginServiceImpl implements LoginService { } try { - ResultDomain resultDomain = menuService.getMenusByUserId(user.getID()); + ResultDomain resultDomain = menuService.getMenusByUserId(user.getId()); if (resultDomain.isSuccess()) { List menus = resultDomain.getDataList(); loginDomain.setMenus(menus); @@ -302,10 +302,10 @@ public class LoginServiceImpl implements LoginService { TbSysLoginLog loginLog = new TbSysLoginLog(); // 使用IDUtils生成登录日志ID - loginLog.setID(IDUtils.generateID()); + loginLog.setId(IDUtils.generateID()); if (user != null) { - loginLog.setUserID(user.getID()); + loginLog.setUserID(user.getId()); loginLog.setUsername(user.getUsername()); }else{ if (loginParam.getLoginType().equals("password")) { diff --git a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/util/JwtTokenUtil.java b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/util/JwtTokenUtil.java index 2eabe8a..987449f 100644 --- a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/util/JwtTokenUtil.java +++ b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/util/JwtTokenUtil.java @@ -44,7 +44,7 @@ public class JwtTokenUtil { Map claims = new HashMap<>(); TbSysUser user = loginDomain.getUser(); - claims.put("userId", user.getID()); + claims.put("userId", user.getId()); claims.put("username", user.getUsername()); claims.put("email", user.getEmail()); claims.put("loginType", loginDomain.getLoginType()); @@ -52,7 +52,7 @@ public class JwtTokenUtil { return Jwts.builder() .setClaims(claims) - .setSubject(user.getID()) + .setSubject(user.getId()) .setId(IDUtils.generateID()) // 使用IDUtils生成JWT ID .setIssuedAt(new Date()) .setExpiration(generateExpirationDate()) diff --git a/schoolNewsServ/common/common-core/pom.xml b/schoolNewsServ/common/common-core/pom.xml index d03d935..da813cf 100644 --- a/schoolNewsServ/common/common-core/pom.xml +++ b/schoolNewsServ/common/common-core/pom.xml @@ -30,5 +30,17 @@ jjwt-api provided + + + + com.alibaba.fastjson2 + fastjson2 + + + + + com.alibaba.fastjson2 + fastjson2-extension-spring6 + \ No newline at end of file diff --git a/schoolNewsServ/common/common-core/src/main/java/org/xyzh/common/config/properties/FastJsonConfiguration.java b/schoolNewsServ/common/common-core/src/main/java/org/xyzh/common/config/properties/FastJsonConfiguration.java new file mode 100644 index 0000000..1559fa2 --- /dev/null +++ b/schoolNewsServ/common/common-core/src/main/java/org/xyzh/common/config/properties/FastJsonConfiguration.java @@ -0,0 +1,50 @@ +package org.xyzh.common.config.properties; + +import com.alibaba.fastjson2.support.config.FastJsonConfig; +import com.alibaba.fastjson2.support.spring6.http.converter.FastJsonHttpMessageConverter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.List; + +/** + * @description FastJson配置类 - 统一处理日期时间格式序列化 + * @filename FastJsonConfig.java + * @author yslg + * @copyright xyzh + * @since 2025-11-28 + */ +@Configuration +public class FastJsonConfiguration implements WebMvcConfigurer { + + /** + * 配置FastJson消息转换器 + */ + @Override + public void configureMessageConverters(List> converters) { + FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter(); + + // FastJson配置 + FastJsonConfig config = new FastJsonConfig(); + + // 设置日期格式 + config.setDateFormat("yyyy-MM-dd HH:mm:ss"); + + // 设置字符集 + converter.setDefaultCharset(StandardCharsets.UTF_8); + + // 设置支持的MediaType + converter.setSupportedMediaTypes(Collections.singletonList(MediaType.APPLICATION_JSON)); + + // 应用配置 + converter.setFastJsonConfig(config); + + // 添加到转换器列表（添加到最前面，优先使用） + converters.add(0, converter); + } +} diff --git a/schoolNewsServ/common/common-dto/pom.xml b/schoolNewsServ/common/common-dto/pom.xml index 376d922..59a5ee1 100644 --- a/schoolNewsServ/common/common-dto/pom.xml +++ b/schoolNewsServ/common/common-dto/pom.xml @@ -22,6 +22,10 @@ org.projectlombok lombok + + com.alibaba.fastjson2 + fastjson2 + \ No newline at end of file diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java index 15adbe6..7751326 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +import com.alibaba.fastjson2.annotation.JSONField; /** * @description BaseDTO.java文件描述 @@ -20,6 +21,7 @@ public class BaseDTO implements Serializable{ * @author yslg * @since 2025-09-10 */ + @JSONField(name="id") private String id; /** @@ -100,7 +102,7 @@ public class BaseDTO implements Serializable{ * @author yslg * @since 2025-09-10 */ - public String getID() { + public String getId() { return this.id; } @@ -110,7 +112,7 @@ public class BaseDTO implements Serializable{ * @author yslg * @since 2025-09-10 */ - public void setID(String id) { + public void setId(String id) { this.id = id; } diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiAgentConfig.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiAgentConfig.java index 18fade1..d1053c6 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiAgentConfig.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiAgentConfig.java @@ -136,7 +136,7 @@ public class TbAiAgentConfig extends BaseDTO { @Override public String toString() { return "TbAiAgentConfig{" + - "id=" + getID() + + "id=" + getId() + ", name='" + name + '\'' + ", connectInternet=" + connectInternet + ", difyAppId='" + difyAppId + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiConversation.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiConversation.java index 4cde997..4e42c25 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiConversation.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiConversation.java @@ -160,7 +160,7 @@ public class TbAiConversation extends BaseDTO { @Override public String toString() { return "TbAiConversation{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", title='" + title + '\'' + ", status=" + status + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiKnowledge.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiKnowledge.java index 6cb8686..ecc471e 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiKnowledge.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiKnowledge.java @@ -408,7 +408,7 @@ public class TbAiKnowledge extends BaseDTO { @Override public String toString() { return "TbAiKnowledge{" + - "id=" + getID() + + "id=" + getId() + ", title='" + title + '\'' + ", sourceType=" + sourceType + ", category='" + category + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiMessage.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiMessage.java index 94c1a35..4a06f6d 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiMessage.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiMessage.java @@ -169,7 +169,7 @@ public class TbAiMessage extends BaseDTO { @Override public String toString() { return "TbAiMessage{" + - "id=" + getID() + + "id=" + getId() + ", conversationID='" + conversationID + '\'' + ", userID='" + userID + '\'' + ", role='" + role + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUploadFile.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUploadFile.java index a10bee4..b3c586c 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUploadFile.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUploadFile.java @@ -262,7 +262,7 @@ public class TbAiUploadFile extends BaseDTO { @Override public String toString() { return "TbAiUploadFile{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", conversationID='" + conversationID + '\'' + ", fileName='" + fileName + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUsageStatistics.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUsageStatistics.java index 73cef5d..8d8264e 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUsageStatistics.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUsageStatistics.java @@ -121,7 +121,7 @@ public class TbAiUsageStatistics extends BaseDTO { @Override public String toString() { return "TbAiUsageStatistics{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", statDate=" + statDate + ", conversationCount=" + conversationCount + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailDefault.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailDefault.java index a481d9e..06b291d 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailDefault.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailDefault.java @@ -106,7 +106,7 @@ public class TbCrontabEmailDefault extends BaseDTO { @Override public String toString() { return "TbCrontabEmailDefault{" + - "id=" + getID() + + "id=" + getId() + ", defaultId='" + defaultId + '\'' + ", metaId='" + metaId + '\'' + ", userId='" + userId + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailRecipient.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailRecipient.java index fcc6fa0..0d33558 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailRecipient.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailRecipient.java @@ -107,7 +107,7 @@ public class TbCrontabEmailRecipient extends BaseDTO { @Override public String toString() { return "TbCrontabEmailRecipient{" + - "id=" + getID() + + "id=" + getId() + ", recipientId='" + recipientId + '\'' + ", taskId='" + taskId + '\'' + ", userId='" + userId + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabLog.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabLog.java index 52ffc8b..1a08e8a 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabLog.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabLog.java @@ -174,7 +174,7 @@ public class TbCrontabLog extends BaseDTO { @Override public String toString() { return "TbCrontabLog{" + - "id=" + getID() + + "id=" + getId() + ", taskId='" + taskId + '\'' + ", taskName='" + taskName + '\'' + ", taskGroup='" + taskGroup + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java index a884bf7..7d6e432 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java @@ -237,7 +237,7 @@ public class TbCrontabTask extends BaseDTO { @Override public String toString() { return "TbCrontabTask{" + - "id=" + getID() + + "id=" + getId() + ", taskId='" + taskId + '\'' + ", taskName='" + taskName + '\'' + ", taskGroup='" + taskGroup + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTaskMeta.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTaskMeta.java index 37784a3..8ea949c 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTaskMeta.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTaskMeta.java @@ -172,7 +172,7 @@ public class TbCrontabTaskMeta extends BaseDTO { @Override public String toString() { return "TbCrontabTaskMeta{" + - "id=" + getID() + + "id=" + getId() + ", metaId='" + metaId + '\'' + ", name='" + name + '\'' + ", category='" + category + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDept.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDept.java index 7e25175..e6daf77 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDept.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDept.java @@ -121,7 +121,7 @@ public class TbSysDept extends BaseDTO{ @Override public String toString() { return "TbSysDept{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", deptID='" + deptID + '\'' + ", parentID='" + parentID + '\'' + ", deptPath='" + deptPath + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDeptRole.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDeptRole.java index 1a084f9..8417409 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDeptRole.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDeptRole.java @@ -95,7 +95,7 @@ public class TbSysDeptRole extends BaseDTO { @Override public String toString() { return "TbSysDeptRole{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", deptID='" + deptID + '\'' + ", roleID='" + roleID + '\'' + ", creator='" + creator + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenu.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenu.java index e2482f0..833b306 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenu.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenu.java @@ -193,7 +193,7 @@ public class TbSysMenu extends BaseDTO { @Override public String toString() { return "TbSysMenu{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", menuID='" + menuID + '\'' + ", parentID='" + parentID + '\'' + ", name='" + name + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenuPermission.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenuPermission.java index 9d94d46..3804161 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenuPermission.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenuPermission.java @@ -75,7 +75,7 @@ public class TbSysMenuPermission extends BaseDTO{ @Override public String toString() { return "TbSysMenuPermission{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", menuID='" + menuID + '\'' + ", permissionID='" + permissionID + '\'' + ", creator='" + creator + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbResourcePermission.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbResourcePermission.java index 5feec46..56d869e 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbResourcePermission.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbResourcePermission.java @@ -133,7 +133,7 @@ public class TbResourcePermission extends BaseDTO { @Override public String toString() { return "TbResourcePermission{" + - "id=" + getID() + + "id=" + getId() + ", resourceType=" + resourceType + ", resourceID='" + resourceID + '\'' + ", deptID='" + deptID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbSysPermission.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbSysPermission.java index 9b2e988..59952d2 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbSysPermission.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbSysPermission.java @@ -120,7 +120,7 @@ public class TbSysPermission extends BaseDTO{ @Override public String toString() { return "TbSysPermission{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", permissionID='" + permissionID + '\'' + ", name='" + name + '\'' + ", description='" + description + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbBanner.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbBanner.java index a921ba1..fb96c31 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbBanner.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbBanner.java @@ -143,7 +143,7 @@ public class TbBanner extends BaseDTO { @Override public String toString() { return "TbBanner{" + - "id=" + getID() + + "id=" + getId() + ", bannerID='" + bannerID + '\'' + ", title='" + title + '\'' + ", imageUrl='" + imageUrl + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResource.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResource.java index fbfcae2..ee46330 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResource.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResource.java @@ -266,7 +266,7 @@ public class TbResource extends BaseDTO { @Override public String toString() { return "TbResource{" + - "id=" + getID() + + "id=" + getId() + ", resourceID='" + resourceID + '\'' + ", title='" + title + '\'' + ", tagID='" + tagID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceRecommend.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceRecommend.java index dbd9ae4..2f6bb44 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceRecommend.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceRecommend.java @@ -94,7 +94,7 @@ public class TbResourceRecommend extends BaseDTO { @Override public String toString() { return "TbResourceRecommend{" + - "id=" + getID() + + "id=" + getId() + ", resourceID='" + resourceID + '\'' + ", recommendType=" + recommendType + ", orderNum=" + orderNum + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceTag.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceTag.java index 96cbd91..fce9022 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceTag.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceTag.java @@ -55,7 +55,7 @@ public class TbResourceTag extends BaseDTO { @Override public String toString() { return "TbResourceTag{" + - "id=" + getID() + + "id=" + getId() + ", resourceID='" + resourceID + '\'' + ", tagID='" + tagID + '\'' + ", createTime=" + getCreateTime() + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbTag.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbTag.java index c803145..781fb12 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbTag.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbTag.java @@ -107,7 +107,7 @@ public class TbTag extends BaseDTO { @Override public String toString() { return "TbTag{" + - "id=" + getID() + + "id=" + getId() + ", tagID='" + tagID + '\'' + ", name='" + name + '\'' + ", color='" + color + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRole.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRole.java index 96f7a46..106da7f 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRole.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRole.java @@ -90,7 +90,7 @@ public class TbSysRole extends BaseDTO { @Override public String toString() { return "TbSysRole{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ",roleID='" + roleID + '\'' + ", name='" + name + '\'' + ", description='" + description + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRolePermission.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRolePermission.java index b1e8d0d..9a70a11 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRolePermission.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRolePermission.java @@ -74,7 +74,7 @@ public class TbSysRolePermission extends BaseDTO{ @Override public String toString() { return "TbSysRolePermission{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", roleID='" + roleID + '\'' + ", permissionID='" + permissionID + '\'' + ", creator='" + creator + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourse.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourse.java index 1db3734..4349fdd 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourse.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourse.java @@ -217,7 +217,7 @@ public class TbCourse extends BaseDTO { @Override public String toString() { return "TbCourse{" + - "id=" + getID() + + "id=" + getId() + ", courseID='" + courseID + '\'' + ", name='" + name + '\'' + ", coverImage='" + coverImage + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseChapter.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseChapter.java index dbb3f6f..724f8f7 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseChapter.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseChapter.java @@ -201,7 +201,7 @@ public class TbCourseChapter extends BaseDTO { @Override public String toString() { return "TbCourseChapter{" + - "id=" + getID() + + "id=" + getId() + ", chapterID='" + chapterID + '\'' + ", courseID='" + courseID + '\'' + ", parentID='" + parentID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseNode.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseNode.java index 2f87b01..80ed822 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseNode.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseNode.java @@ -212,7 +212,7 @@ public class TbCourseNode extends BaseDTO { @Override public String toString() { return "TbCourseNode{" + - "id=" + getID() + + "id=" + getId() + ", nodeID='" + nodeID + '\'' + ", chapterID='" + chapterID + '\'' + ", name='" + name + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseTag.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseTag.java index 9f09081..cb55c89 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseTag.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseTag.java @@ -99,7 +99,7 @@ public class TbCourseTag extends BaseDTO { @Override public String toString() { return "TbCourseTag{" + - "id=" + getID() + + "id=" + getId() + ", courseID='" + courseID + '\'' + ", tagID='" + tagID + '\'' + ", createTime=" + getCreateTime() + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningHistory.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningHistory.java index 3e20a83..406593c 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningHistory.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningHistory.java @@ -226,7 +226,7 @@ public class TbLearningHistory extends BaseDTO { @Override public String toString() { return "TbLearningHistory{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", historyID='" + historyID + '\'' + ", resourceType=" + resourceType + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningRecord.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningRecord.java index c88909f..85bcd0b 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningRecord.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningRecord.java @@ -228,7 +228,7 @@ public class TbLearningRecord extends BaseDTO { @Override public String toString() { return "TbLearningRecord{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", taskID='" + taskID + '\'' + ", resourceType=" + resourceType + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatistics.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatistics.java index c6533d5..706c93a 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatistics.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatistics.java @@ -166,7 +166,7 @@ public class TbLearningStatistics extends BaseDTO { @Override public String toString() { return "TbLearningStatistics{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", statDate=" + statDate + ", totalDuration=" + totalDuration + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatisticsDetail.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatisticsDetail.java index a2725f8..47ddc28 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatisticsDetail.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatisticsDetail.java @@ -173,7 +173,7 @@ public class TbLearningStatisticsDetail extends BaseDTO { @Override public String toString() { return "TbLearningStatisticsDetail{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", statDate=" + statDate + ", resourceType=" + resourceType + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTask.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTask.java index cfe6d61..1017fcd 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTask.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTask.java @@ -154,7 +154,7 @@ public class TbLearningTask extends BaseDTO { @Override public String toString() { return "TbLearningTask{" + - "id=" + getID() + + "id=" + getId() + ", taskID='" + taskID + '\'' + ", name='" + name + '\'' + ", startTime=" + startTime + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTaskTag.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTaskTag.java index fcc5735..7c9049c 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTaskTag.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTaskTag.java @@ -54,7 +54,7 @@ public class TbLearningTaskTag extends BaseDTO { @Override public String toString() { return "TbLearningTaskTag{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", taskID='" + taskID + '\'' + ", tagID='" + tagID + '\'' + ", creator='" + creator + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskItem.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskItem.java index ae38ee7..d09c42a 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskItem.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskItem.java @@ -111,7 +111,7 @@ public class TbTaskItem extends BaseDTO { @Override public String toString() { return "TbTaskItem{" + - "id=" + getID() + + "id=" + getId() + ", taskID='" + taskID + '\'' + ", itemType=" + itemType + ", itemID='" + itemID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskUser.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskUser.java index 8e286ce..157dfe0 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskUser.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskUser.java @@ -154,7 +154,7 @@ public class TbTaskUser extends BaseDTO { @Override public String toString() { return "TbTaskUser{" + - "id=" + getID() + + "id=" + getId() + ", taskID='" + taskID + '\'' + ", userID='" + userID + '\'' + ", deptID='" + deptID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysConfig.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysConfig.java index 46519e4..81b1694 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysConfig.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysConfig.java @@ -250,7 +250,7 @@ public class TbSysConfig extends BaseDTO { @Override public String toString() { return "TbSysConfig{" + - "id=" + getID() + + "id=" + getId() + ", configKey='" + configKey + '\'' + ", configName='" + configName + '\'' + ", configValue='" + configValue + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictData.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictData.java index afdb985..a96c269 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictData.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictData.java @@ -159,7 +159,7 @@ public class TbSysDictData extends BaseDTO { @Override public String toString() { return "TbSysDictData{" + - "id=" + getID() + + "id=" + getId() + ", dictType='" + dictType + '\'' + ", dictLabel='" + dictLabel + '\'' + ", dictValue='" + dictValue + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictType.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictType.java index 9e36190..dba21d1 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictType.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictType.java @@ -94,7 +94,7 @@ public class TbSysDictType extends BaseDTO { @Override public String toString() { return "TbSysDictType{" + - "id=" + getID() + + "id=" + getId() + ", dictType='" + dictType + '\'' + ", dictName='" + dictName + '\'' + ", status=" + status + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysLoginLog.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysLoginLog.java index c28e081..8f05eec 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysLoginLog.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysLoginLog.java @@ -181,7 +181,7 @@ public class TbSysLoginLog extends BaseDTO { @Override public String toString() { return "TbSysLoginLog{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", userID='" + userID + '\'' + ", username='" + username + '\'' + ", ipAddress='" + ipAddress + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysModule.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysModule.java index bfa441b..53d76ed 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysModule.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysModule.java @@ -133,7 +133,7 @@ public class TbSysModule extends BaseDTO { @Override public String toString() { return "TbSysModule{" + - "id=" + getID() + + "id=" + getId() + ", moduleID='" + moduleID + '\'' + ", name='" + name + '\'' + ", code='" + code + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysNotification.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysNotification.java index 1cedac9..fb38d37 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysNotification.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysNotification.java @@ -121,7 +121,7 @@ public class TbSysNotification extends BaseDTO { @Override public String toString() { return "TbSysNotification{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", type=" + type + ", title='" + title + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysOperationLog.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysOperationLog.java index 1357fa8..832675e 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysOperationLog.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysOperationLog.java @@ -224,7 +224,7 @@ public class TbSysOperationLog extends BaseDTO { @Override public String toString() { return "TbSysOperationLog{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", username='" + username + '\'' + ", module='" + module + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysVisitStatistics.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysVisitStatistics.java index 66fcda4..73a51b2 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysVisitStatistics.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysVisitStatistics.java @@ -108,7 +108,7 @@ public class TbSysVisitStatistics extends BaseDTO { @Override public String toString() { return "TbSysVisitStatistics{" + - "id=" + getID() + + "id=" + getId() + ", statDate=" + statDate + ", totalVisits=" + totalVisits + ", uniqueVisitors=" + uniqueVisitors + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUser.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUser.java index 36d895b..9447886 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUser.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUser.java @@ -107,7 +107,7 @@ public class TbSysUser extends BaseDTO { @Override public String toString() { return "TbSysUser{" + - "id=" + getID() + + "id=" + getId() + ", username='" + username + '\'' + ", password='" + password + '\'' + ", email='" + email + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserDeptRole.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserDeptRole.java index 7041037..4d8cbdd 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserDeptRole.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserDeptRole.java @@ -91,7 +91,7 @@ public class TbSysUserDeptRole extends BaseDTO{ @Override public String toString() { return "TbSysUserDeptRole{" + - "id='" + getID() + '\'' + + "id='" + getId() + '\'' + ", userID='" + userID + '\'' + ", deptID='" + deptID + '\'' + ", roleID='" + roleID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserInfo.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserInfo.java index dfb5539..23c39a7 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserInfo.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserInfo.java @@ -167,7 +167,7 @@ public class TbSysUserInfo extends BaseDTO { @Override public String toString() { return "TbSysUserInfo{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", avatar='" + avatar + '\'' + ", gender=" + gender + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbAchievement.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbAchievement.java index 38cd7d9..129193b 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbAchievement.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbAchievement.java @@ -172,7 +172,7 @@ public class TbAchievement extends BaseDTO { @Override public String toString() { return "TbAchievement{" + - "id=" + getID() + + "id=" + getId() + ", achievementID='" + achievementID + '\'' + ", name='" + name + '\'' + ", type=" + type + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbPointsRecord.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbPointsRecord.java index 80126ec..f1f9dc7 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbPointsRecord.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbPointsRecord.java @@ -94,7 +94,7 @@ public class TbPointsRecord extends BaseDTO { @Override public String toString() { return "TbPointsRecord{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", points=" + points + ", type=" + type + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievement.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievement.java index fa474e8..eda3fab 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievement.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievement.java @@ -56,7 +56,7 @@ public class TbUserAchievement extends BaseDTO { @Override public String toString() { return "TbUserAchievement{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", achievementID='" + achievementID + '\'' + ", obtainTime=" + obtainTime + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievementProgress.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievementProgress.java index a93b1f1..775e3bf 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievementProgress.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievementProgress.java @@ -120,7 +120,7 @@ public class TbUserAchievementProgress extends BaseDTO { @Override public String toString() { return "TbUserAchievementProgress{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", achievementID='" + achievementID + '\'' + ", currentValue=" + currentValue + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserBrowseRecord.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserBrowseRecord.java index b12117e..8b3b8d0 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserBrowseRecord.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserBrowseRecord.java @@ -82,7 +82,7 @@ public class TbUserBrowseRecord extends BaseDTO { @Override public String toString() { return "TbUserBrowseRecord{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", browseType=" + browseType + ", browseID='" + browseID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserCollection.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserCollection.java index 2330c2b..4c88e71 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserCollection.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserCollection.java @@ -68,7 +68,7 @@ public class TbUserCollection extends BaseDTO { @Override public String toString() { return "TbUserCollection{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", collectionType=" + collectionType + ", collectionID='" + collectionID + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserPoints.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserPoints.java index 520ffaf..db5eb37 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserPoints.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserPoints.java @@ -68,7 +68,7 @@ public class TbUserPoints extends BaseDTO { @Override public String toString() { return "TbUserPoints{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", totalPoints=" + totalPoints + ", currentPoints=" + currentPoints + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/AchievementVO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/AchievementVO.java index 4f851e6..3adfdac 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/AchievementVO.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/AchievementVO.java @@ -19,7 +19,7 @@ public class AchievementVO extends TbAchievement { // ==================== TbUserAchievement表的字段 ==================== /** - * @description 用户成就记录ID（tb_user_achievement.ID） + * @description 用户成就记录ID（tb_user_achievement.id） */ private String userAchievementID; @@ -36,7 +36,7 @@ public class AchievementVO extends TbAchievement { // ==================== TbUserAchievementProgress表的字段 ==================== /** - * @description 进度记录ID（tb_user_achievement_progress.ID） + * @description 进度记录ID（tb_user_achievement_progress.id） */ private String progressID; diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/CourseItemVO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/CourseItemVO.java index ea5e22d..f0c12bd 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/CourseItemVO.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/CourseItemVO.java @@ -387,7 +387,7 @@ public class CourseItemVO extends BaseDTO { */ public TbCourse toCourse() { TbCourse course = new TbCourse(); - course.setID(this.getID()); + course.setId(this.getId()); course.setCourseID(this.courseID); course.setName(this.name); course.setCoverImage(this.coverImage); @@ -412,7 +412,7 @@ public class CourseItemVO extends BaseDTO { } CourseItemVO vo = new CourseItemVO(); - vo.setID(course.getID()); + vo.setId(course.getId()); vo.setCourseID(course.getCourseID()); vo.setName(course.getName()); vo.setCoverImage(course.getCoverImage()); @@ -434,7 +434,7 @@ public class CourseItemVO extends BaseDTO { TbLearningRecord record = new TbLearningRecord(); if (this.recordID != null) { // 如果有recordID，说明是从已有记录转换的，需要设置ID - record.setID(this.recordID); + record.setId(this.recordID); } record.setCourseID(this.courseID); record.setDuration(this.learningDuration); @@ -454,7 +454,7 @@ public class CourseItemVO extends BaseDTO { return; } - this.recordID = record.getID(); + this.recordID = record.getId(); this.progress = record.getProgress(); this.isComplete = record.getIsComplete(); this.learningDuration = record.getDuration(); @@ -487,7 +487,7 @@ public class CourseItemVO extends BaseDTO { } CourseItemVO vo = new CourseItemVO(); - vo.setID(chapter.getID()); + vo.setId(chapter.getId()); vo.setChapterID(chapter.getChapterID()); vo.setCourseID(chapter.getCourseID()); vo.setParentID(chapter.getParentID()); @@ -513,7 +513,7 @@ public class CourseItemVO extends BaseDTO { } CourseItemVO vo = new CourseItemVO(); - vo.setID(node.getID()); + vo.setId(node.getId()); vo.setNodeID(node.getNodeID()); vo.setChapterID(node.getChapterID()); vo.setName(node.getName()); @@ -535,7 +535,7 @@ public class CourseItemVO extends BaseDTO { */ public TbCourseChapter toChapter() { TbCourseChapter chapter = new TbCourseChapter(); - chapter.setID(this.getID()); + chapter.setId(this.getId()); chapter.setChapterID(this.chapterID); chapter.setCourseID(this.courseID); chapter.setParentID(this.parentID); @@ -555,7 +555,7 @@ public class CourseItemVO extends BaseDTO { */ public TbCourseNode toNode() { TbCourseNode node = new TbCourseNode(); - node.setID(this.getID()); + node.setId(this.getId()); node.setNodeID(this.nodeID); node.setChapterID(this.chapterID); node.setName(this.name); diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/ResourcePermissionVO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/ResourcePermissionVO.java index db1b6b6..d8c4d82 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/ResourcePermissionVO.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/ResourcePermissionVO.java @@ -98,7 +98,7 @@ public class ResourcePermissionVO extends TbResourcePermission { @Override public String toString() { return "ResourcePermissionVO{" + - "id=" + getID() + + "id=" + getId() + ", resourceType=" + getResourceType() + ", resourceID='" + getResourceID() + '\'' + ", resourceTitle='" + resourceTitle + '\'' + diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TagVO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TagVO.java index 67bbb45..0e16de8 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TagVO.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TagVO.java @@ -81,7 +81,7 @@ public class TagVO extends BaseDTO { } public TbTag getTag() { TbTag tag = new TbTag(); - tag.setID(tagID); + tag.setId(tagID); tag.setName(tagName); tag.setColor(tagColor); return tag; diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java index 4ea20de..bc73c32 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java @@ -67,7 +67,7 @@ public class TaskItemVO extends TbLearningTask { this.setTaskID(taskItem.getTaskID()); this.orderNum = taskItem.getOrderNum(); this.required = taskItem.getRequired(); - this.setID(taskItem.getID()); + this.setId(taskItem.getId()); this.setCreateTime(taskItem.getCreateTime()); this.setCreator(taskItem.getCreator()); @@ -140,7 +140,7 @@ public class TaskItemVO extends TbLearningTask { public TbTaskItem toTaskItem() { TbTaskItem taskItem = new TbTaskItem(); - taskItem.setID(getID()); + taskItem.setId(getId()); taskItem.setTaskID(getTaskID()); taskItem.setItemType(itemType); taskItem.setRequired(required); diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/UserCollectionVO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/UserCollectionVO.java index 1b8d48a..c7903b9 100644 --- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/UserCollectionVO.java +++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/UserCollectionVO.java @@ -344,7 +344,7 @@ public class UserCollectionVO extends BaseDTO { @Override public String toString() { return "UserCollectionVO{" + - "id=" + getID() + + "id=" + getId() + ", userID='" + userID + '\'' + ", collectionType=" + collectionType + ", collectionID='" + collectionID + '\'' + diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/controller/CrontabController.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/controller/CrontabController.java index 2991149..b03f1ee 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/controller/CrontabController.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/controller/CrontabController.java @@ -115,8 +115,8 @@ public class CrontabController { String metaId = request.getMetaId(); // 确保id字段正确传递（用于数据库更新） - if (crontabItem.getTaskId() != null && crontabItem.getID() == null) { - crontabItem.setID(crontabItem.getTaskId()); + if (crontabItem.getTaskId() != null && crontabItem.getId() == null) { + crontabItem.setId(crontabItem.getTaskId()); } // 验证元数据ID @@ -141,7 +141,7 @@ public class CrontabController { crontabItem.setMetaId(metaId); // 保存metaId，执行时从数据库读取scriptPath logger.info("更新任务 - id: {}, metaId: {}, name: {}, category: {}, defaultRecipient: {}", - crontabItem.getID(), metaId, taskMeta.getName(), taskMeta.getCategory(), + crontabItem.getId(), metaId, taskMeta.getName(), taskMeta.getCategory(), crontabItem.getDefaultRecipient()); // 调用带接收人更新的方法 diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/SchedulerManager.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/SchedulerManager.java index 724d066..229af78 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/SchedulerManager.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/SchedulerManager.java @@ -46,7 +46,7 @@ public class SchedulerManager { */ public void scheduleTask(TbCrontabTask task) { try { - String taskId = task.getID(); + String taskId = task.getId(); // 如果任务已经在调度中，先取消 if (scheduledTasks.containsKey(taskId)) { @@ -79,7 +79,7 @@ public class SchedulerManager { */ public void unscheduleTask(TbCrontabTask task) { try { - String taskId = task.getID(); + String taskId = task.getId(); ScheduledFuture future = scheduledTasks.get(taskId); if (future != null) { diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/TaskExecutor.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/TaskExecutor.java index 15888a6..cadb212 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/TaskExecutor.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/scheduler/TaskExecutor.java @@ -46,7 +46,7 @@ public class TaskExecutor { public void executeTask(TbCrontabTask task) { Date startTime = new Date(); TbCrontabLog log = new TbCrontabLog(); - log.setID(IDUtils.generateID()); + log.setId(IDUtils.generateID()); log.setTaskId(task.getTaskId()); log.setTaskName(task.getTaskName()); log.setTaskGroup(task.getTaskGroup()); @@ -159,7 +159,7 @@ public class TaskExecutor { // 注入taskId、logId和metaId params.put("taskId", task.getTaskId()); - params.put("logId", log.getID()); + params.put("logId", log.getId()); if (task.getMetaId() != null) { params.put("metaId", task.getMetaId()); } diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java index 6932ba3..5f2c763 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/CrontabServiceImpl.java @@ -76,7 +76,7 @@ public class CrontabServiceImpl implements CrontabService { } // 生成ID - task.setID(IDUtils.generateID()); + task.setId(IDUtils.generateID()); task.setTaskId(IDUtils.generateID()); task.setCreateTime(new Date()); task.setDeleted(false); @@ -134,7 +134,7 @@ public class CrontabServiceImpl implements CrontabService { try { TbCrontabTask task = request.getTask(); TbSysUser user = LoginUtil.getCurrentUser(); - task.setCreator(user.getID()); + task.setCreator(user.getId()); // 1. 创建任务 ResultDomain createResult = createTask(task); if (!createResult.isSuccess()) { diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/DataCollectionItemServiceImpl.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/DataCollectionItemServiceImpl.java index f445887..a26248d 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/DataCollectionItemServiceImpl.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/DataCollectionItemServiceImpl.java @@ -68,7 +68,7 @@ public class DataCollectionItemServiceImpl implements DataCollectionItemService } // 生成ID - item.setID(IDUtils.generateID()); + item.setId(IDUtils.generateID()); item.setCreateTime(new Date()); item.setDeleted(false); @@ -118,7 +118,7 @@ public class DataCollectionItemServiceImpl implements DataCollectionItemService } String logId = itemList.get(0).getLogId(); TbCrontabLog log = new TbCrontabLog(); - log.setID(logId); + log.setId(logId); log.setExecuteStatus(1); log.setExecuteMessage("爬取成功，共" + itemList.size() + "条，新增" + successCount + "条"); int i = logMapper.updateLog(log); @@ -137,7 +137,7 @@ public class DataCollectionItemServiceImpl implements DataCollectionItemService public ResultDomain updateItem(TbDataCollectionItem item) { ResultDomain resultDomain = new ResultDomain<>(); try { - if (item.getID() == null) { + if (item.getId() == null) { resultDomain.fail("采集项ID不能为空"); return resultDomain; } @@ -146,7 +146,7 @@ public class DataCollectionItemServiceImpl implements DataCollectionItemService int result = itemMapper.updateById(item); if (result > 0) { - logger.info("更新采集项成功: {}", item.getID()); + logger.info("更新采集项成功: {}", item.getId()); resultDomain.success("更新采集项成功", item); } else { resultDomain.fail("更新采集项失败"); diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailDefaultServiceImpl.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailDefaultServiceImpl.java index 4267581..18faf4d 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailDefaultServiceImpl.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailDefaultServiceImpl.java @@ -36,7 +36,7 @@ public class EmailDefaultServiceImpl implements EmailDefaultService { try { // 生成ID - emailDefault.setID(IDUtils.generateID()); + emailDefault.setId(IDUtils.generateID()); if (emailDefault.getDefaultId() == null || emailDefault.getDefaultId().isEmpty()) { emailDefault.setDefaultId(IDUtils.generateID()); } diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailRecipientServiceImpl.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailRecipientServiceImpl.java index b45eadf..d08e542 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailRecipientServiceImpl.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/EmailRecipientServiceImpl.java @@ -38,7 +38,7 @@ public class EmailRecipientServiceImpl implements EmailRecipientService { ResultDomain resultDomain = new ResultDomain<>(); try { // 生成ID - recipient.setID(IDUtils.generateID()); + recipient.setId(IDUtils.generateID()); if (recipient.getRecipientId() == null || recipient.getRecipientId().isEmpty()) { recipient.setRecipientId(IDUtils.generateID()); } @@ -64,7 +64,7 @@ public class EmailRecipientServiceImpl implements EmailRecipientService { ResultDomain resultDomain = new ResultDomain<>(); try { for (TbCrontabEmailRecipient recipient : recipients) { - recipient.setID(IDUtils.generateID()); + recipient.setId(IDUtils.generateID()); if (recipient.getRecipientId() == null || recipient.getRecipientId().isEmpty()) { recipient.setRecipientId(IDUtils.generateID()); } diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/TaskMetaServiceImpl.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/TaskMetaServiceImpl.java index 6fd5c30..ebd71e1 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/TaskMetaServiceImpl.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/service/impl/TaskMetaServiceImpl.java @@ -45,7 +45,7 @@ public class TaskMetaServiceImpl implements TaskMetaService { } // 生成ID - taskMeta.setID(IDUtils.generateID()); + taskMeta.setId(IDUtils.generateID()); taskMeta.setCreateTime(new Date()); taskMeta.setDeleted(false); diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java index 5522805..3b8d5f0 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/newsTask/NewsCrawlerTask.java @@ -224,7 +224,7 @@ public class NewsCrawlerTask extends PythonCommandTask { TbDataCollectionItem item = new TbDataCollectionItem(); // 基本信息 - item.setID(IDUtils.generateID()); + item.setId(IDUtils.generateID()); item.setTaskId(taskId); item.setLogId(logId); item.setTitle(news.getTitle()); @@ -314,7 +314,7 @@ public class NewsCrawlerTask extends PythonCommandTask { } if(passList.isEmpty() && notPassList.isEmpty()){ TbCrontabLog log = new TbCrontabLog(); - log.setID(logId); + log.setId(logId); log.setExecuteStatus(1); log.setExecuteMessage("未爬取到数据"); int i = logMapper.updateLog(log); @@ -535,7 +535,7 @@ public class NewsCrawlerTask extends PythonCommandTask { if(item.getContent().isEmpty()) continue; try { TbResource resource = new TbResource(); - resource.setID(IDUtils.generateID()); + resource.setId(IDUtils.generateID()); resource.setResourceID(IDUtils.generateID()); resource.setTitle(item.getTitle()); // 创建者使用任务创建者 @@ -614,7 +614,7 @@ public class NewsCrawlerTask extends PythonCommandTask { } TbDataCollectionItem update = new TbDataCollectionItem(); - update.setID(itemVO.getId()); + update.setId(itemVO.getId()); update.setStatus(1); // 已转换为资源 update.setResourceId(resourceId); update.setProcessTime(now); diff --git a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/recommendTask/TopRecommendTask.java b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/recommendTask/TopRecommendTask.java index 4d632dc..a47fa2c 100644 --- a/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/recommendTask/TopRecommendTask.java +++ b/schoolNewsServ/crontab/src/main/java/org/xyzh/crontab/task/recommendTask/TopRecommendTask.java @@ -213,7 +213,7 @@ public class TopRecommendTask extends BaseTask { */ private TbResourceRecommend createRecommend(String resourceId, int orderNum) { TbResourceRecommend recommend = new TbResourceRecommend(); - recommend.setID(IDUtils.generateID()); + recommend.setId(IDUtils.generateID()); recommend.setResourceID(resourceId); recommend.setRecommendType(1); // 1-热门资源推荐 recommend.setOrderNum(orderNum); diff --git a/schoolNewsServ/crontab/src/main/resources/mapper/CrontabLogMapper.xml b/schoolNewsServ/crontab/src/main/resources/mapper/CrontabLogMapper.xml index 0185403..a61ac51 100644 --- a/schoolNewsServ/crontab/src/main/resources/mapper/CrontabLogMapper.xml +++ b/schoolNewsServ/crontab/src/main/resources/mapper/CrontabLogMapper.xml @@ -4,7 +4,7 @@ - + @@ -34,8 +34,8 @@ - - AND id = #{filter.ID} + + AND id = #{filter.id} AND task_id = #{filter.taskId} @@ -63,7 +63,7 @@ INSERT INTO tb_crontab_log - id, + id, task_id, task_name, task_group, @@ -81,7 +81,7 @@ VALUES - #{log.ID}, + #{log.id}, #{log.taskId}, #{log.taskName}, #{log.taskGroup}, @@ -110,7 +110,7 @@ end_time = #{log.endTime}, execute_duration = #{log.executeDuration}, update_time = NOW() - WHERE id = #{log.ID} AND deleted = 0 + WHERE id = #{log.id} AND deleted = 0 diff --git a/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml b/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml index 1a00ab8..e3142b8 100644 --- a/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml +++ b/schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml @@ -4,7 +4,7 @@ - + @@ -66,8 +66,8 @@ - - AND id = #{filter.ID} + + AND id = #{filter.id} AND task_id = #{filter.taskId} @@ -129,7 +129,7 @@ INSERT INTO tb_crontab_task - id, + id, task_id, task_name, task_group, @@ -149,7 +149,7 @@ VALUES - #{task.ID}, + #{task.id}, #{task.taskId}, #{task.taskName}, #{task.taskGroup}, @@ -188,7 +188,7 @@ updater = #{task.updater}, update_time = NOW() - WHERE id = #{task.ID} AND deleted = 0 + WHERE id = #{task.id} AND deleted = 0 @@ -214,8 +214,8 @@ WHERE ct.deleted = 0 - - AND ct.id = #{filter.ID} + + AND ct.id = #{filter.id} AND ct.task_id = #{filter.taskId} @@ -264,8 +264,8 @@ ON ct.meta_id = m.meta_id AND m.deleted = 0 WHERE ct.deleted = 0 - - AND ct.id = #{filter.ID} + + AND ct.id = #{filter.id} AND ct.task_id = #{filter.taskId} @@ -327,8 +327,8 @@ WHERE ct.deleted = 0 - - AND ct.id = #{filter.ID} + + AND ct.id = #{filter.id} AND ct.task_id = #{filter.taskId} diff --git a/schoolNewsServ/crontab/src/main/resources/mapper/EmailDefaultMapper.xml b/schoolNewsServ/crontab/src/main/resources/mapper/EmailDefaultMapper.xml index 9b75d58..6f60fac 100644 --- a/schoolNewsServ/crontab/src/main/resources/mapper/EmailDefaultMapper.xml +++ b/schoolNewsServ/crontab/src/main/resources/mapper/EmailDefaultMapper.xml @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ INSERT INTO tb_crontab_email_default ( id, default_id, meta_id, user_id, creator, create_time ) VALUES ( - #{emailDefault.ID}, #{emailDefault.defaultId}, #{emailDefault.metaId}, + #{emailDefault.id}, #{emailDefault.defaultId}, #{emailDefault.metaId}, #{emailDefault.userId}, #{emailDefault.creator}, NOW() ) diff --git a/schoolNewsServ/crontab/src/main/resources/mapper/EmailRecipientMapper.xml b/schoolNewsServ/crontab/src/main/resources/mapper/EmailRecipientMapper.xml index 909947e..5ac624c 100644 --- a/schoolNewsServ/crontab/src/main/resources/mapper/EmailRecipientMapper.xml +++ b/schoolNewsServ/crontab/src/main/resources/mapper/EmailRecipientMapper.xml @@ -4,7 +4,7 @@ - + @@ -48,7 +48,7 @@ INSERT INTO tb_crontab_email_recipient ( id, recipient_id, task_id, user_id, email, name, creator, create_time ) VALUES ( - #{recipient.ID}, #{recipient.recipientId}, #{recipient.taskId}, + #{recipient.id}, #{recipient.recipientId}, #{recipient.taskId}, #{recipient.userId}, #{recipient.email}, #{recipient.name}, #{recipient.creator}, NOW() ) @@ -60,7 +60,7 @@ id, recipient_id, task_id, user_id, email, name, creator, create_time ) VALUES - (#{item.ID}, #{item.recipientId}, #{item.taskId}, + (#{item.id}, #{item.recipientId}, #{item.taskId}, #{item.userId}, #{item.email}, #{item.name}, #{item.creator}, NOW()) diff --git a/schoolNewsServ/crontab/src/main/resources/mapper/TaskMetaMapper.xml b/schoolNewsServ/crontab/src/main/resources/mapper/TaskMetaMapper.xml index 11367dc..7482229 100644 --- a/schoolNewsServ/crontab/src/main/resources/mapper/TaskMetaMapper.xml +++ b/schoolNewsServ/crontab/src/main/resources/mapper/TaskMetaMapper.xml @@ -4,7 +4,7 @@ - + @@ -52,7 +52,7 @@ id, meta_id, name, description, category, bean_name, method_name, script_path, param_schema, auto_publish, sort_order, creator, create_time ) VALUES ( - #{taskMeta.ID}, #{taskMeta.metaId}, #{taskMeta.name}, #{taskMeta.description}, + #{taskMeta.id}, #{taskMeta.metaId}, #{taskMeta.name}, #{taskMeta.description}, #{taskMeta.category}, #{taskMeta.beanName}, #{taskMeta.methodName}, #{taskMeta.scriptPath}, #{taskMeta.paramSchema}, #{taskMeta.autoPublish}, #{taskMeta.sortOrder}, #{taskMeta.creator}, NOW() diff --git a/schoolNewsServ/file/src/main/java/org/xyzh/file/service/FileServiceImpl.java b/schoolNewsServ/file/src/main/java/org/xyzh/file/service/FileServiceImpl.java index d5ca829..7d033ab 100644 --- a/schoolNewsServ/file/src/main/java/org/xyzh/file/service/FileServiceImpl.java +++ b/schoolNewsServ/file/src/main/java/org/xyzh/file/service/FileServiceImpl.java @@ -71,7 +71,7 @@ public class FileServiceImpl implements FileService { // 保存文件记录 TbSysFile sysFile = new TbSysFile(); String fileId = IDUtils.generateID(); - sysFile.setID(fileId); + sysFile.setId(fileId); sysFile.setFileID(fileId); sysFile.setFileName(fileName); sysFile.setOriginalName(originalFileName); @@ -110,7 +110,7 @@ public class FileServiceImpl implements FileService { fileMapper.insertFile(sysFile); log.info("文件上传成功: fileId={}, fileName={}, storageType={}", - sysFile.getID(), fileName, strategy.getStorageType()); + sysFile.getId(), fileName, strategy.getStorageType()); resultDomain.success("文件上传成功", sysFile); return resultDomain; diff --git a/schoolNewsServ/file/src/main/resources/mapper/FileMapper.xml b/schoolNewsServ/file/src/main/resources/mapper/FileMapper.xml index d015e9b..62c9a30 100644 --- a/schoolNewsServ/file/src/main/resources/mapper/FileMapper.xml +++ b/schoolNewsServ/file/src/main/resources/mapper/FileMapper.xml @@ -4,7 +4,7 @@ - + @@ -37,7 +37,7 @@ file_type, mime_type, storage_type, module, business_id, uploader, create_time, update_time, deleted ) VALUES ( - #{file.ID}, #{file.fileID}, #{file.fileName}, #{file.originalName}, #{file.filePath}, #{file.fileUrl}, #{file.fileSize}, + #{file.id}, #{file.fileID}, #{file.fileName}, #{file.originalName}, #{file.filePath}, #{file.fileUrl}, #{file.fileSize}, #{file.fileType}, #{file.mimeType}, #{file.storageType}, #{file.module}, #{file.businessID}, #{file.uploader}, #{file.createTime}, #{file.updateTime}, #{file.deleted} ) diff --git a/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageSendService.java b/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageSendService.java index d5a0742..59d6bde 100644 --- a/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageSendService.java +++ b/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageSendService.java @@ -103,7 +103,7 @@ public class MessageSendService { TbSysUser user = userMapper.selectUserById(userMessage.getUserID()); if (user == null || user.getDeleted()) { logger.warn("用户不存在：{}", userMessage.getUserID()); - updateUserMessageStatus(userMessage.getID(), "failed", "用户不存在"); + updateUserMessageStatus(userMessage.getId(), "failed", "用户不存在"); failedCount++; continue; } @@ -144,16 +144,16 @@ public class MessageSendService { // 更新用户消息发送状态 if (sent) { - updateUserMessageStatus(userMessage.getID(), "success", null); + updateUserMessageStatus(userMessage.getId(), "success", null); successCount++; } else { - updateUserMessageStatus(userMessage.getID(), "failed", "所有发送方式均失败"); + updateUserMessageStatus(userMessage.getId(), "failed", "所有发送方式均失败"); failedCount++; } } catch (Exception e) { - logger.error("处理用户消息失败：{}", userMessage.getID(), e); - updateUserMessageStatus(userMessage.getID(), "failed", e.getMessage()); + logger.error("处理用户消息失败：{}", userMessage.getId(), e); + updateUserMessageStatus(userMessage.getId(), "failed", e.getMessage()); failedCount++; } } diff --git a/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageServiceImpl.java b/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageServiceImpl.java index b2f3e1d..5f387d9 100644 --- a/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageServiceImpl.java +++ b/schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageServiceImpl.java @@ -68,12 +68,12 @@ public class MessageServiceImpl implements MessageService { try { // 1. 获取当前用户信息（从Session或SecurityContext获取） LoginDomain currentUser = LoginUtil.getCurrentLoginDomain(); - String currentUserID = currentUser.getUser().getID(); + String currentUserID = currentUser.getUser().getId(); String currentDeptID = currentUser.getRoles().get(0).getDeptID(); // 2. 设置消息主体基本信息 - if (message.getID() == null) { - message.setID(IDUtils.generateID()); + if (message.getId() == null) { + message.setId(IDUtils.generateID()); } if (message.getMessageID() == null) { message.setMessageID(IDUtils.generateID()); @@ -119,8 +119,8 @@ public class MessageServiceImpl implements MessageService { // return rt; // } - if (target.getID() == null) { - target.setID(IDUtils.generateID()); + if (target.getId() == null) { + target.setId(IDUtils.generateID()); } target.setMessageID(message.getMessageID()); target.setCreator(currentUserID); @@ -180,7 +180,7 @@ public class MessageServiceImpl implements MessageService { message.setUpdateTime(new Date()); LoginDomain currentUser = LoginUtil.getCurrentLoginDomain(); - message.setUpdater(currentUser.getUser().getID()); + message.setUpdater(currentUser.getUser().getId()); messageMapper.updateMessage(message); rt.success("更新成功", message); return rt; @@ -489,7 +489,7 @@ public class MessageServiceImpl implements MessageService { } LoginDomain currentUser = LoginUtil.getCurrentLoginDomain(); - String currentUserID = currentUser.getUser().getID(); + String currentUserID = currentUser.getUser().getId(); // 使用新的动态查询方法 List list = messageUserMapper.selectMyMessagesWithDynamicTargets(currentUserID, filter); @@ -515,7 +515,7 @@ public class MessageServiceImpl implements MessageService { ResultDomain rt = new ResultDomain<>(); try { LoginDomain currentUser = LoginUtil.getCurrentLoginDomain(); - String currentUserID = currentUser.getUser().getID(); + String currentUserID = currentUser.getUser().getId(); MessageUserVO messageUserVO = messageUserMapper.selectOrCreateUserMessage(currentUserID, messageID); if (messageUserVO == null) { @@ -528,7 +528,7 @@ public class MessageServiceImpl implements MessageService { logger.info("用户首次查看消息，创建用户消息记录：userID={}, messageID={}", currentUserID, messageID); TbSysMessageUser userMessage = new TbSysMessageUser(); - userMessage.setID(IDUtils.generateID()); + userMessage.setId(IDUtils.generateID()); userMessage.setMessageID(messageID); userMessage.setUserID(currentUserID); userMessage.setSendMethod("system"); // 默认发送方式 @@ -562,7 +562,7 @@ public class MessageServiceImpl implements MessageService { ResultDomain rt = new ResultDomain<>(); try { LoginDomain currentUser = LoginUtil.getCurrentLoginDomain(); - String currentUserID = currentUser.getUser().getID(); + String currentUserID = currentUser.getUser().getId(); // 先尝试更新已有记录 int result = messageUserMapper.markAsRead(currentUserID, messageID); @@ -572,7 +572,7 @@ public class MessageServiceImpl implements MessageService { logger.info("用户消息记录不存在，创建新记录：userID={}, messageID={}", currentUserID, messageID); TbSysMessageUser userMessage = new TbSysMessageUser(); - userMessage.setID(IDUtils.generateID()); + userMessage.setId(IDUtils.generateID()); userMessage.setMessageID(messageID); userMessage.setUserID(currentUserID); userMessage.setSendMethod("system"); // 默认发送方式 @@ -616,7 +616,7 @@ public class MessageServiceImpl implements MessageService { ResultDomain rt = new ResultDomain<>(); try { LoginDomain currentUser = LoginUtil.getCurrentLoginDomain(); - String currentUserID = currentUser.getUser().getID(); + String currentUserID = currentUser.getUser().getId(); int count = messageUserMapper.batchMarkAsRead(currentUserID, messageIDs); // 更新每条消息的已读数量 @@ -639,7 +639,7 @@ public class MessageServiceImpl implements MessageService { ResultDomain rt = new ResultDomain<>(); try { LoginDomain currentUser = LoginUtil.getCurrentLoginDomain(); - String currentUserID = currentUser.getUser().getID(); + String currentUserID = currentUser.getUser().getId(); // 使用动态计算方法，统计用户应该看到的所有未读消息 Integer count = messageUserMapper.countUnreadWithDynamicTargets(currentUserID); rt.success("查询成功", count != null ? count : 0); @@ -671,21 +671,21 @@ public class MessageServiceImpl implements MessageService { switch (target.getTargetType()) { case "dept": // 查询该部门及所有子部门的用户 - userIDs = userMapper.selectUserIdsByDeptId(target.getTargetID()); - logger.info("部门 {} 解析到 {} 个用户", target.getTargetID(), userIDs.size()); + userIDs = userMapper.selectUserIdsByDeptId(target.getTargetId()); + logger.info("部门 {} 解析到 {} 个用户", target.getTargetId(), userIDs.size()); break; case "role": // 查询scopeDeptID及子部门中该角色的用户 String scopeDeptID = target.getScopeDeptID(); if (scopeDeptID == null || scopeDeptID.isEmpty()) { - logger.warn("角色目标缺少 scopeDeptID，跳过：{}", target.getTargetID()); + logger.warn("角色目标缺少 scopeDeptID，跳过：{}", target.getTargetId()); break; } - userIDs = userMapper.selectUserIdsByDeptRole(scopeDeptID, target.getTargetID()); - logger.info("部门 {} 中角色 {} 解析到 {} 个用户", scopeDeptID, target.getTargetID(), userIDs.size()); + userIDs = userMapper.selectUserIdsByDeptRole(scopeDeptID, target.getTargetId()); + logger.info("部门 {} 中角色 {} 解析到 {} 个用户", scopeDeptID, target.getTargetId(), userIDs.size()); break; case "user": - userIDs.add(target.getTargetID()); + userIDs.add(target.getTargetId()); break; } @@ -699,7 +699,7 @@ public class MessageServiceImpl implements MessageService { List userMessages = new ArrayList<>(); for (String userID : userIDSet) { TbSysMessageUser userMessage = new TbSysMessageUser(); - userMessage.setID(IDUtils.generateID()); + userMessage.setId(IDUtils.generateID()); userMessage.setMessageID(messageID); userMessage.setUserID(userID); userMessage.setSendMethod(userMethodMap.get(userID)); diff --git a/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceController.java b/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceController.java index 683665a..ba24fe1 100644 --- a/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceController.java +++ b/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceController.java @@ -81,7 +81,7 @@ public class ResourceController { result.fail("请先登录"); return result; } - resourceVO.getResource().setCreator(user.getID()); + resourceVO.getResource().setCreator(user.getId()); resourceVO.getResource().setAuthor(user.getUsername()); Date now = new Date(); resourceVO.getResource().setCreateTime(now); diff --git a/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceRecommendController.java b/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceRecommendController.java index 3903635..ced0d48 100644 --- a/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceRecommendController.java +++ b/schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceRecommendController.java @@ -47,7 +47,7 @@ public class ResourceRecommendController { @GetMapping("/recommend/{recommendID}") public ResultDomain getRecommendById(@PathVariable("recommendID") String recommendID) { TbResourceRecommend filter = new TbResourceRecommend(); - filter.setID(recommendID); + filter.setId(recommendID); PageParam pageParam = new PageParam(); pageParam.setPageNumber(1); pageParam.setPageSize(1); @@ -72,7 +72,7 @@ public class ResourceRecommendController { TbSysUser user = LoginUtil.getCurrentUser(); if (user != null) { if (recommend.getCreator() == null) { - recommend.setCreator(user.getID()); + recommend.setCreator(user.getId()); } } return resourceRecommendService.addRecommend(recommend); diff --git a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCBannerServiceImpl.java b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCBannerServiceImpl.java index e1ab509..07501c5 100644 --- a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCBannerServiceImpl.java +++ b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCBannerServiceImpl.java @@ -92,8 +92,8 @@ public class NCBannerServiceImpl implements BannerService { } // 设置默认值 - if (banner.getID() == null) { - banner.setID(IDUtils.generateID()); + if (banner.getId() == null) { + banner.setId(IDUtils.generateID()); } banner.setBannerID(IDUtils.generateID()); banner.setCreateTime(new Date()); diff --git a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java index 93865f8..39cff9b 100644 --- a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java +++ b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java @@ -81,8 +81,8 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService } // 设置默认值 - if (recommend.getID() == null) { - recommend.setID(IDUtils.generateID()); + if (recommend.getId() == null) { + recommend.setId(IDUtils.generateID()); } recommend.setCreateTime(new Date()); @@ -117,13 +117,13 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService ResultDomain resultDomain = new ResultDomain<>(); try { // 参数验证 - if (recommend == null || !StringUtils.hasText(recommend.getID())) { + if (recommend == null || !StringUtils.hasText(recommend.getId())) { resultDomain.fail("推荐ID不能为空"); return resultDomain; } // 检查推荐是否存在 - TbResourceRecommend existing = resourceRecommendMapper.selectById(recommend.getID()); + TbResourceRecommend existing = resourceRecommendMapper.selectById(recommend.getId()); if (existing == null || existing.getDeleted()) { resultDomain.fail("推荐不存在"); return resultDomain; @@ -135,9 +135,9 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService // 更新数据库 int result = resourceRecommendMapper.updateResourceRecommend(recommend); if (result > 0) { - logger.info("更新推荐成功: {}", recommend.getID()); + logger.info("更新推荐成功: {}", recommend.getId()); // 重新查询返回完整数据 - TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getID()); + TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getId()); resultDomain.success("更新推荐成功", updated); return resultDomain; } else { @@ -227,7 +227,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService } TbResourceRecommend recommend = new TbResourceRecommend(); - recommend.setID(IDUtils.generateID()); + recommend.setId(IDUtils.generateID()); recommend.setResourceID(resourceID); recommend.setRecommendType(recommendType); recommend.setReason(reason); @@ -281,7 +281,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService List recommendList = resourceRecommendMapper.selectByResourceId(resourceID); if (recommendList != null && !recommendList.isEmpty()) { for (TbResourceRecommend recommend : recommendList) { - recommendIDs.add(recommend.getID()); + recommendIDs.add(recommend.getId()); } } } @@ -388,7 +388,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService if (result > 0) { logger.info("更新推荐排序成功: {}", resourceID); // 重新查询返回完整数据 - TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getID()); + TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getId()); resultDomain.success("更新推荐排序成功", updated); return resultDomain; } else { @@ -429,7 +429,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService if (result > 0) { logger.info("更新推荐理由成功: {}", resourceID); // 重新查询返回完整数据 - TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getID()); + TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getId()); resultDomain.success("更新推荐理由成功", updated); return resultDomain; } else { 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 d2d3683..e33bfaa 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 @@ -16,6 +16,7 @@ import org.xyzh.common.dto.resource.TbTag; import org.xyzh.common.dto.user.TbSysUser; import org.xyzh.common.dto.usercenter.TbUserCollection; import org.xyzh.common.utils.IDUtils; +import org.xyzh.common.utils.NonUtils; import org.xyzh.common.vo.ResourceVO; import org.xyzh.common.vo.TagVO; import org.xyzh.common.vo.TaskItemVO; @@ -90,8 +91,8 @@ public class NCResourceServiceImpl implements ResourceService { Date now = new Date(); // 填充必要的默认值 for (TbResource res : resources) { - if (res.getID() == null) { - res.setID(IDUtils.generateID()); + if (res.getId() == null) { + res.setId(IDUtils.generateID()); } if (res.getResourceID() == null) { res.setResourceID(IDUtils.generateID()); @@ -247,8 +248,8 @@ public class NCResourceServiceImpl implements ResourceService { } // 设置默认值 - if (resourceVO.getResource().getID() == null) { - resourceVO.getResource().setID(IDUtils.generateID()); + if (resourceVO.getResource().getId() == null) { + resourceVO.getResource().setId(IDUtils.generateID()); } if (resourceVO.getResource().getResourceID() == null) { resourceVO.getResource().setResourceID(IDUtils.generateID()); @@ -284,7 +285,7 @@ public class NCResourceServiceImpl implements ResourceService { // 进行审核 ResultDomain pass =auditService.auditText(resource.getTitle() + " "+resource.getContent()); if(pass.isSuccess()){ - resource.setPublishTime(new Date()); + resource.setPublishTime(NonUtils.isNotNull(resourceVO.getResource().getPublishTime())? resourceVO.getResource().getPublishTime() : new Date()); resource.setIsAudited(true); }else { auditService.sendAuditResultMessage(resource.getCreator(), "文章"+resource.getTitle(), pass.getDataList()); @@ -299,8 +300,8 @@ public class NCResourceServiceImpl implements ResourceService { List resourceTagList = new ArrayList<>(); for (TbTag tag : resourceVO.getTags()) { TbResourceTag resourceTag = new TbResourceTag(); - resourceTag.setResourceID(resourceVO.getResource().getID()); - resourceTag.setTagID(tag.getID()); + resourceTag.setResourceID(resourceVO.getResource().getId()); + resourceTag.setTagID(tag.getId()); resourceTagList.add(resourceTag); } int resourceTagResult = resourceTagMapper.batchInsertResourceTags(resourceTagList); @@ -350,7 +351,7 @@ public class NCResourceServiceImpl implements ResourceService { resultDomain.fail("请先登录"); return resultDomain; } - resource.setUpdater(user.getID()); + resource.setUpdater(user.getId()); try { // 参数验证 if (resource == null || !StringUtils.hasText(resource.getResourceID())) { @@ -399,9 +400,9 @@ public class NCResourceServiceImpl implements ResourceService { Date now = new Date(); // tag先删后增 TbResourceTag resourceTag = new TbResourceTag(); - resourceTag.setID(IDUtils.generateID()); + resourceTag.setId(IDUtils.generateID()); resourceTag.setResourceID(resource.getResourceID()); - resourceTag.setCreator(user.getID()); + resourceTag.setCreator(user.getId()); resourceTag.setCreateTime(now); resourceTag.setDeleted(false); resourceTag.setTagID(resourceVO.getResource().getTagID()); @@ -528,7 +529,7 @@ public class NCResourceServiceImpl implements ResourceService { if (result > 0) { logger.info("更新资源状态成功: {}", resourceID); // 重新查询返回完整数据 - TbResource updated = resourceMapper.selectByResourceId(resource.getID()); + TbResource updated = resourceMapper.selectByResourceId(resource.getId()); resultDomain.success("更新资源状态成功", updated); return resultDomain; } else { @@ -585,7 +586,7 @@ public class NCResourceServiceImpl implements ResourceService { if (result > 0) { logger.info("发布资源成功: {}", resourceID); // 重新查询返回完整数据 - TbResource updated = resourceMapper.selectByResourceId(resource.getID()); + TbResource updated = resourceMapper.selectByResourceId(resource.getId()); resultDomain.success("发布资源成功", updated); return resultDomain; } else { @@ -625,7 +626,7 @@ public class NCResourceServiceImpl implements ResourceService { if (result > 0) { logger.info("下架资源成功: {}", resourceID); // 重新查询返回完整数据 - TbResource updated = resourceMapper.selectByResourceId(resource.getID()); + TbResource updated = resourceMapper.selectByResourceId(resource.getId()); resultDomain.success("下架资源成功", updated); return resultDomain; } else { @@ -694,7 +695,7 @@ public class NCResourceServiceImpl implements ResourceService { if (result > 0) { logger.info("增加资源点赞次数成功: {}", resourceID); // 重新查询返回完整数据 - TbResource updated = resourceMapper.selectByResourceId(resource.getID()); + TbResource updated = resourceMapper.selectByResourceId(resource.getId()); resultDomain.success("增加点赞次数成功", updated); return resultDomain; } else { @@ -719,7 +720,7 @@ public class NCResourceServiceImpl implements ResourceService { resultDomain.fail("请先登录"); return resultDomain; } - collection.setUserID(user.getID()); + collection.setUserID(user.getId()); // 参数验证 if (!StringUtils.hasText(resourceID)) { resultDomain.fail("资源ID不能为空"); @@ -766,7 +767,7 @@ public class NCResourceServiceImpl implements ResourceService { if (result > 0) { logger.info("设置资源推荐状态成功: {} -> {}", resourceID, isRecommend); // 重新查询返回完整数据 - TbResource updated = resourceMapper.selectByResourceId(resource.getID()); + TbResource updated = resourceMapper.selectByResourceId(resource.getId()); resultDomain.success("设置推荐状态成功", updated); return resultDomain; } else { @@ -810,7 +811,7 @@ public class NCResourceServiceImpl implements ResourceService { if (result > 0) { logger.info("设置资源轮播状态成功: {} -> {}", resourceID, isBanner); // 重新查询返回完整数据 - TbResource updated = resourceMapper.selectByResourceId(resource.getID()); + TbResource updated = resourceMapper.selectByResourceId(resource.getId()); resultDomain.success("设置轮播状态成功", updated); return resultDomain; } else { diff --git a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCTagServiceImpl.java b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCTagServiceImpl.java index c185f65..0c2f30a 100644 --- a/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCTagServiceImpl.java +++ b/schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCTagServiceImpl.java @@ -66,8 +66,8 @@ public class NCTagServiceImpl implements TagService { } // 设置默认值 - if (tag.getID() == null) { - tag.setID(IDUtils.generateID()); + if (tag.getId() == null) { + tag.setId(IDUtils.generateID()); } if (tag.getTagID() == null) { tag.setTagID(IDUtils.generateID()); @@ -126,7 +126,7 @@ public class NCTagServiceImpl implements TagService { return resultDomain; } // 更新时间 - tag.setUpdater(user.getID()); + tag.setUpdater(user.getId()); tag.setUpdateTime(new Date()); // 更新数据库 @@ -313,7 +313,7 @@ public class NCTagServiceImpl implements TagService { // 创建关联 TbResourceTag resourceTag = new TbResourceTag(); - resourceTag.setID(IDUtils.generateID()); + resourceTag.setId(IDUtils.generateID()); resourceTag.setResourceID(resourceID); resourceTag.setTagID(tagID); resourceTag.setCreateTime(new Date()); @@ -363,7 +363,7 @@ public class NCTagServiceImpl implements TagService { // 创建关联 TbResourceTag resourceTag = new TbResourceTag(); - resourceTag.setID(IDUtils.generateID()); + resourceTag.setId(IDUtils.generateID()); resourceTag.setResourceID(resourceID); resourceTag.setTagID(tagID); resourceTag.setCreateTime(new Date()); diff --git a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml index 3f997ca..7605a84 100644 --- a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml +++ b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml @@ -206,10 +206,10 @@ INSERT INTO tb_resource ( - id, resource_id, title, content, summary, cover_image, tag_id, author, source, is_audited, + id, resource_id, title, content, summary, cover_image, tag_id, author, source, is_audited, publish_time, status,source_url, creator,create_time ) VALUES ( - #{id}, #{resourceID}, #{title}, #{content}, #{summary}, #{coverImage}, #{tagID}, #{author}, #{source}, #{isAudited}, + #{id}, #{resourceID}, #{title}, #{content}, #{summary}, #{coverImage}, #{tagID}, #{author}, #{source}, #{isAudited}, #{publistTime} #{status}, #{sourceUrl}, #{creator}, #{createTime} ) diff --git a/schoolNewsServ/pom.xml b/schoolNewsServ/pom.xml index 4a30025..61ed1b1 100644 --- a/schoolNewsServ/pom.xml +++ b/schoolNewsServ/pom.xml @@ -206,6 +206,12 @@ ${fastjson.version} + + com.alibaba.fastjson2 + fastjson2-extension-spring6 + ${fastjson.version} + + jakarta.servlet jakarta.servlet-api diff --git a/schoolNewsServ/study/src/main/java/org/xyzh/study/controller/LearningRecordController.java b/schoolNewsServ/study/src/main/java/org/xyzh/study/controller/LearningRecordController.java index 692bade..01d491c 100644 --- a/schoolNewsServ/study/src/main/java/org/xyzh/study/controller/LearningRecordController.java +++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/controller/LearningRecordController.java @@ -57,7 +57,7 @@ public class LearningRecordController { */ @DeleteMapping("/record") public ResultDomain deleteLearningRecord(@RequestBody TbLearningRecord learningRecord) { - return learningRecordService.deleteLearningRecord(learningRecord.getID()); + return learningRecordService.deleteLearningRecord(learningRecord.getId()); } @PutMapping("/complete") diff --git a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCCourseServiceImpl.java b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCCourseServiceImpl.java index 70d9b12..d3a90b9 100644 --- a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCCourseServiceImpl.java +++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCCourseServiceImpl.java @@ -152,8 +152,8 @@ public class SCCourseServiceImpl implements SCCourseService { // 转换为课程实体并保存 TbCourse course = courseItemVO.toCourse(); String courseID = IDUtils.generateID(); - course.setID(IDUtils.generateID()); - course.setCreator(user.getID()); + course.setId(IDUtils.generateID()); + course.setCreator(user.getId()); course.setCourseID(courseID); Date now = new Date(); course.setCreateTime(now); @@ -174,10 +174,10 @@ public class SCCourseServiceImpl implements SCCourseService { TbCourseChapter chapter = chapterVO.toChapter(); String chapterID = IDUtils.generateID(); - chapter.setID(IDUtils.generateID()); + chapter.setId(IDUtils.generateID()); chapter.setChapterID(chapterID); chapter.setCourseID(courseID); - chapter.setCreator(user.getID()); + chapter.setCreator(user.getId()); chapter.setCreateTime(now); chapter.setOrderNum(i); chapters.add(chapter); @@ -193,10 +193,10 @@ public class SCCourseServiceImpl implements SCCourseService { TbCourseNode node = nodeVO.toNode(); String nodeID = IDUtils.generateID(); - node.setID(IDUtils.generateID()); + node.setId(IDUtils.generateID()); node.setNodeID(nodeID); node.setChapterID(chapterID); - node.setCreator(user.getID()); + node.setCreator(user.getId()); node.setCreateTime(now); node.setOrderNum(j); allNodes.add(node); @@ -254,7 +254,7 @@ public class SCCourseServiceImpl implements SCCourseService { // 1. 更新课程基本信息 TbCourse course = courseItemVO.toCourse(); - course.setUpdater(user.getID()); + course.setUpdater(user.getId()); Date now = new Date(); course.setUpdateTime(now); courseMapper.updateCourse(course); @@ -305,15 +305,15 @@ public class SCCourseServiceImpl implements SCCourseService { if (chapterID == null || chapterID.isEmpty() || !existingChapterMap.containsKey(chapterID)) { // 新增章节 chapterID = IDUtils.generateID(); - chapter.setID(IDUtils.generateID()); + chapter.setId(IDUtils.generateID()); chapter.setChapterID(chapterID); - chapter.setCreator(user.getID()); + chapter.setCreator(user.getId()); chapter.setCreateTime(now); chaptersToInsert.add(chapter); } else { // 更新章节 - chapter.setID(existingChapterMap.get(chapterID).getID()); - chapter.setUpdater(user.getID()); + chapter.setId(existingChapterMap.get(chapterID).getId()); + chapter.setUpdater(user.getId()); chapter.setUpdateTime(now); chaptersToUpdate.add(chapter); } @@ -345,15 +345,15 @@ public class SCCourseServiceImpl implements SCCourseService { if (nodeID == null || nodeID.isEmpty() || !existingNodeMap.containsKey(nodeID)) { // 新增节点 nodeID = IDUtils.generateID(); - node.setID(IDUtils.generateID()); + node.setId(IDUtils.generateID()); node.setNodeID(nodeID); - node.setCreator(user.getID()); + node.setCreator(user.getId()); node.setCreateTime(now); nodesToInsert.add(node); } else { // 更新节点 - node.setID(existingNodeMap.get(nodeID).getID()); - node.setUpdater(user.getID()); + node.setId(existingNodeMap.get(nodeID).getId()); + node.setUpdater(user.getId()); node.setUpdateTime(now); nodesToUpdate.add(node); } @@ -680,7 +680,7 @@ public class SCCourseServiceImpl implements SCCourseService { .collect(Collectors.toList()); // 查询带进度的节点（传入用户ID） - List nodesWithProgress = courseNodeMapper.selectNodesProgress(chapterIDs, user.getID()); + List nodesWithProgress = courseNodeMapper.selectNodesProgress(chapterIDs, user.getId()); // 转换章节为CourseItemVO列表 List chapterVOs = chapters.stream() diff --git a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningHistoryServiceImpl.java b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningHistoryServiceImpl.java index ab4ec12..1da0872 100644 --- a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningHistoryServiceImpl.java +++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningHistoryServiceImpl.java @@ -58,7 +58,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService { resultDomain.fail("用户未登录"); return resultDomain; } - learningHistory.setUserID(currentUser.getID()); + learningHistory.setUserID(currentUser.getId()); } if (learningHistory.getResourceType() == null) { @@ -103,7 +103,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService { } } else { // 插入新记录 - learningHistory.setID(IDUtils.generateID()); + learningHistory.setId(IDUtils.generateID()); learningHistory.setHistoryID(IDUtils.generateID()); learningHistory.setCreateTime(new Date()); @@ -111,7 +111,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService { if (result > 0) { resultDomain.success("记录学习历史成功", learningHistory); logger.info("记录学习历史成功，ID: {}, 用户ID: {}, 资源类型: {}, 时长: {}秒", - learningHistory.getID(), learningHistory.getUserID(), + learningHistory.getId(), learningHistory.getUserID(), learningHistory.getResourceType(), learningHistory.getDuration()); } else { resultDomain.fail("记录学习历史失败"); @@ -146,13 +146,13 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService { resultDomain.fail("用户未登录"); return resultDomain; } - learningHistory.setUserID(currentUser.getID()); + learningHistory.setUserID(currentUser.getId()); } if (learningHistory.getStartTime() == null) { learningHistory.setStartTime(now); } - if (learningHistory.getID() == null || learningHistory.getID().isEmpty()) { - learningHistory.setID(IDUtils.generateID()); + if (learningHistory.getId() == null || learningHistory.getId().isEmpty()) { + learningHistory.setId(IDUtils.generateID()); } if (learningHistory.getCreateTime() == null) { learningHistory.setCreateTime(now); @@ -364,7 +364,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService { if (filter == null) { filter = new TbLearningHistory(); } - filter.setUserID(currentUser.getID()); + filter.setUserID(currentUser.getId()); return getLearningHistories(filter); } catch (Exception e) { @@ -386,7 +386,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService { return resultDomain; } - return getUserLearningStatisticsByPeriod(currentUser.getID(), periodType); + return getUserLearningStatisticsByPeriod(currentUser.getId(), periodType); } catch (Exception e) { logger.error("查询当前用户学习统计异常", e); diff --git a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningRecordServiceImpl.java b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningRecordServiceImpl.java index 49b4d44..7d363d1 100644 --- a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningRecordServiceImpl.java +++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningRecordServiceImpl.java @@ -59,7 +59,7 @@ public class SCLearningRecordServiceImpl implements LearningRecordService { resultDomain.fail("请先登录"); return resultDomain; } - learningRecord.setUserID(user.getID()); + learningRecord.setUserID(user.getId()); learningRecord.setCreateTime(new Date()); if (learningRecord.getResourceType() == null) { resultDomain.fail("资源类型不能为空"); @@ -78,13 +78,13 @@ public class SCLearningRecordServiceImpl implements LearningRecordService { resultDomain.fail("学习记录已存在"); return resultDomain; } - List allTaskItems = taskItemMapper.selectTaskItemVOByTaskIdAndUserId(learningRecord.getTaskID(), user.getID()); + List allTaskItems = taskItemMapper.selectTaskItemVOByTaskIdAndUserId(learningRecord.getTaskID(), user.getId()); if (allTaskItems == null || allTaskItems.isEmpty()) { TbTaskUser taskUser = new TbTaskUser(); taskUser.setTaskID(learningRecord.getTaskID()); - taskUser.setUserID(user.getID()); + taskUser.setUserID(user.getId()); taskUser.setProgress(new BigDecimal(0)); - taskUser.setUpdater(user.getID()); + taskUser.setUpdater(user.getId()); // 全部完成 taskUser.setStatus(1); @@ -110,7 +110,7 @@ public class SCLearningRecordServiceImpl implements LearningRecordService { resultDomain.fail("请先登录"); return resultDomain; } - learningRecord.setUpdater(user.getID()); + learningRecord.setUpdater(user.getId()); int result = learningRecordMapper.updateLearningRecord(learningRecord); if (result > 0) { @@ -167,7 +167,7 @@ public class SCLearningRecordServiceImpl implements LearningRecordService { resultDomain.fail("请先登录"); return resultDomain; } - learningRecord.setUserID(user.getID()); + learningRecord.setUserID(user.getId()); if (learningRecord.getResourceID() == null) { resultDomain.fail("资源ID不能为空"); return resultDomain; @@ -206,14 +206,14 @@ public class SCLearningRecordServiceImpl implements LearningRecordService { resultDomain.fail("请先登录"); return resultDomain; } - learningRecord.setUpdater(user.getID()); + learningRecord.setUpdater(user.getId()); learningRecord.setCompleteTime(new Date()); learningRecord.setIsComplete(true); int result = learningRecordMapper.updateLearningRecord(learningRecord); if (result > 0) { // 检查是否完成了该任务的所有任务项 String taskId = learningRecord.getTaskID(); - String userId = user.getID(); + String userId = user.getId(); if (taskId != null && !taskId.isEmpty()) { checkAndUpdateTaskCompletion(taskId, userId); } diff --git a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java index eb1c572..8619130 100644 --- a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java +++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java @@ -93,10 +93,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { List taskUsers = new ArrayList<>(); for (String userID : userIDs) { TbTaskUser taskUser = new TbTaskUser(); - taskUser.setID(IDUtils.generateID()); + taskUser.setId(IDUtils.generateID()); taskUser.setTaskID(taskID); taskUser.setUserID(userID); - taskUser.setCreator(user.getID()); + taskUser.setCreator(user.getId()); taskUser.setCreateTime(new Date()); taskUsers.add(taskUser); } @@ -177,7 +177,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { resultDomain.fail("请先登录"); return resultDomain; } - filter.setUserID(user.getID()); + filter.setUserID(user.getId()); // 获取当前用户的部门角色 List userDeptRoles = LoginUtil.getCurrentDeptRole(); List taskList = learningTaskMapper.selectUserLearningTasksPage(filter, pageParam, userDeptRoles); @@ -199,8 +199,8 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { Date now = new Date(); // 创建任务 TbLearningTask learningTask = taskVO.getLearningTask(); - learningTask.setCreator(currentUser.getID()); - learningTask.setID(IDUtils.generateID()); + learningTask.setCreator(currentUser.getId()); + learningTask.setId(IDUtils.generateID()); learningTask.setTaskID(taskID); learningTask.setCreateTime(now); learningTaskMapper.insertLearningTask(learningTask); @@ -213,7 +213,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { taskCourses.forEach(item -> { item.setTaskID(taskID); item.setItemType(TaskItemType.COURSE.getValue()); - item.setCreator(currentUser.getID()); + item.setCreator(currentUser.getId()); item.setCreateTime(now); }); taskItems.addAll(taskCourses); @@ -223,7 +223,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { taskResources.forEach(item -> { item.setTaskID(taskID); item.setItemType(TaskItemType.RESOURCE.getValue()); - item.setCreator(currentUser.getID()); + item.setCreator(currentUser.getId()); item.setCreateTime(now); }); taskItems.addAll(taskResources); @@ -237,7 +237,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { List taskUsers = taskVO.toTaskUsers(); taskUsers.forEach(item -> { item.setTaskID(taskID); - item.setCreator(currentUser.getID()); + item.setCreator(currentUser.getId()); item.setCreateTime(now); }); taskUserMapper.batchInsertTaskUsers(taskUsers); @@ -251,10 +251,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { List taskTagList = new ArrayList<>(); for (TagVO tag : taskTags) { TbLearningTaskTag taskTag = new TbLearningTaskTag(); - taskTag.setID(IDUtils.generateID()); + taskTag.setId(IDUtils.generateID()); taskTag.setTaskID(taskID); taskTag.setTagID(tag.getTagID()); - taskTag.setCreator(currentUser.getID()); + taskTag.setCreator(currentUser.getId()); taskTag.setCreateTime(now); taskTagList.add(taskTag); } @@ -302,7 +302,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { Date now = new Date(); // 1. 更新任务基本信息 - task.setUpdater(user.getID()); + task.setUpdater(user.getId()); task.setUpdateTime(now); learningTaskMapper.updateLearningTask(task); @@ -346,13 +346,13 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { if (!existingCourseMap.containsKey(courseID)) { TbTaskItem taskItem = new TbTaskItem(); - taskItem.setID(IDUtils.generateID()); + taskItem.setId(IDUtils.generateID()); taskItem.setTaskID(taskID); taskItem.setItemType(TaskItemType.COURSE.getValue()); taskItem.setItemID(courseID); taskItem.setRequired(item.getRequired()); taskItem.setOrderNum(item.getOrderNum()); - taskItem.setCreator(user.getID()); + taskItem.setCreator(user.getId()); taskItem.setCreateTime(now); itemsToInsert.add(taskItem); } @@ -368,13 +368,13 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { if (!existingResourceMap.containsKey(resourceID)) { TbTaskItem taskItem = new TbTaskItem(); - taskItem.setID(IDUtils.generateID()); + taskItem.setId(IDUtils.generateID()); taskItem.setTaskID(taskID); taskItem.setItemType(TaskItemType.RESOURCE.getValue()); taskItem.setItemID(resourceID); taskItem.setRequired(item.getRequired()); taskItem.setOrderNum(item.getOrderNum()); - taskItem.setCreator(user.getID()); + taskItem.setCreator(user.getId()); taskItem.setCreateTime(now); itemsToInsert.add(taskItem); } @@ -384,10 +384,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { List itemIDsToDelete = new ArrayList<>(); existingCourseMap.values().stream() .filter(item -> !newCourseIDs.contains(item.getItemID())) - .forEach(item -> itemIDsToDelete.add(item.getID())); + .forEach(item -> itemIDsToDelete.add(item.getId())); existingResourceMap.values().stream() .filter(item -> !newResourceIDs.contains(item.getItemID())) - .forEach(item -> itemIDsToDelete.add(item.getID())); + .forEach(item -> itemIDsToDelete.add(item.getId())); if (!itemIDsToDelete.isEmpty()) { taskItemMapper.batchDeleteTaskItems(itemIDsToDelete); @@ -423,10 +423,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { // 如果不存在，则新增 if (!existingUserMap.containsKey(userID)) { TbTaskUser taskUser = new TbTaskUser(); - taskUser.setID(IDUtils.generateID()); + taskUser.setId(IDUtils.generateID()); taskUser.setTaskID(taskID); taskUser.setUserID(userID); - taskUser.setCreator(user.getID()); + taskUser.setCreator(user.getId()); taskUser.setCreateTime(now); usersToInsert.add(taskUser); } @@ -473,10 +473,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { // 如果不存在，则新增 if (!existingTagMap.containsKey(tagID)) { TbLearningTaskTag taskTag = new TbLearningTaskTag(); - taskTag.setID(IDUtils.generateID()); + taskTag.setId(IDUtils.generateID()); taskTag.setTaskID(taskID); taskTag.setTagID(tagID); - taskTag.setCreator(user.getID()); + taskTag.setCreator(user.getId()); taskTag.setCreateTime(now); tagsToInsert.add(taskTag); } @@ -628,7 +628,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { taskVO.setLearningTaskNum(learningTaskNum); taskVO.setNotStartTaskNum(notStartTaskNum); - List taskUsers = taskUserMapper.selectUserTaskItem(taskID, LoginUtil.getCurrentUser().getID()); + List taskUsers = taskUserMapper.selectUserTaskItem(taskID, LoginUtil.getCurrentUser().getId()); taskVO.setLearningTask(task); taskVO.setTaskCourses(taskCourses); taskVO.setTaskResources(taskResources); @@ -733,7 +733,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { return resultDomain; } TbLearningTask task = new TbLearningTask(); - task.setUpdater(user.getID()); + task.setUpdater(user.getId()); task.setUpdateTime(new Date()); task.setTaskID(taskID); task.setStatus(status); @@ -853,7 +853,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService { // 按标签统计当前用户在时间范围内任务的平均完成进度 List> tagProgressList = learningTaskMapper.getTaskStaticByTag(filter, userDeptRoles, - currentUser.getID()); + currentUser.getId()); statisticsData.put("tagProgressList", tagProgressList); diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/controller/UserController.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/controller/UserController.java index 4b7db32..9d194dd 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/controller/UserController.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/controller/UserController.java @@ -83,7 +83,7 @@ public class UserController { */ @DeleteMapping("/user") public ResultDomain deleteUser(@RequestBody TbSysUser user) { - return userService.deleteUser(user.getID()); + return userService.deleteUser(user.getId()); } /** diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/log/LogEventHandler.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/log/LogEventHandler.java index e87c0c2..efab16e 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/log/LogEventHandler.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/log/LogEventHandler.java @@ -48,7 +48,7 @@ public class LogEventHandler { LogEvent event = context.getLogEvent(); TbSysOperationLog log = new TbSysOperationLog(); - log.setID(IDUtils.generateID()); + log.setId(IDUtils.generateID()); // 使用从主线程提取的用户信息 log.setUserID(context.getUserId()); diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java index f5a6ad0..ad797ce 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java @@ -278,8 +278,8 @@ public class SysConfigServiceImpl implements SysConfigService { return resultDomain; } - if (config.getID() == null || config.getID().isEmpty()) { - config.setID(UUID.randomUUID().toString()); + if (config.getId() == null || config.getId().isEmpty()) { + config.setId(UUID.randomUUID().toString()); } int result = sysConfigMapper.insertSysConfig(config); diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/department/service/impl/SysDepartmentServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/department/service/impl/SysDepartmentServiceImpl.java index 557ea7e..eee73bd 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/department/service/impl/SysDepartmentServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/department/service/impl/SysDepartmentServiceImpl.java @@ -194,10 +194,10 @@ public class SysDepartmentServiceImpl implements SysDepartmentService { } // 设置基础信息 - department.setID(IDUtils.generateID()); + department.setId(IDUtils.generateID()); String deptId = IDUtils.generateID(); department.setDeptID(deptId); - department.setCreator(currentUser.getID()); + department.setCreator(currentUser.getId()); department.setCreateTime(new Date()); department.setDeleted(false); @@ -268,7 +268,7 @@ public class SysDepartmentServiceImpl implements SysDepartmentService { } // 检查部门名称是否已存在（排除自身） - ResultDomain checkResult = checkDepartmentNameExists(department.getName(), department.getID()); + ResultDomain checkResult = checkDepartmentNameExists(department.getName(), department.getId()); if (!checkResult.isSuccess()) { resultDomain.fail(checkResult.getMessage()); return resultDomain; @@ -406,12 +406,12 @@ public class SysDepartmentServiceImpl implements SysDepartmentService { for (String deptID : deptIDs) { for (String roleID : roleIDs) { TbSysDeptRole deptRole = new TbSysDeptRole(); - deptRole.setID(IDUtils.generateID()); + deptRole.setId(IDUtils.generateID()); deptRole.setDeptID(deptID); deptRole.setRoleID(roleID); deptRole.setCreateTime(now); deptRole.setDeleted(false); - deptRole.setCreator(user.getID()); + deptRole.setCreator(user.getId()); deptRoles.add(deptRole); } } diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/menu/service/impl/SysMenuServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/menu/service/impl/SysMenuServiceImpl.java index 90babb8..acab62e 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/menu/service/impl/SysMenuServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/menu/service/impl/SysMenuServiceImpl.java @@ -215,7 +215,7 @@ public class SysMenuServiceImpl implements SysMenuService { } // 设置基础信息 - menu.setID(IDUtils.generateID()); + menu.setId(IDUtils.generateID()); menu.setMenuID(IDUtils.generateID()); menu.setCreateTime(new Date()); menu.setDeleted(false); @@ -265,7 +265,7 @@ public class SysMenuServiceImpl implements SysMenuService { } // 检查菜单名称是否已存在（排除自身） - // ResultDomain checkResult = checkMenuNameExists(menu.getName(), menu.getID()); + // ResultDomain checkResult = checkMenuNameExists(menu.getName(), menu.getId()); // if (!checkResult.isSuccess()) { // resultDomain.fail(checkResult.getMessage()); // return resultDomain; diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/module/impl/ModuleServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/module/impl/ModuleServiceImpl.java index c647183..c61f85f 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/module/impl/ModuleServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/module/impl/ModuleServiceImpl.java @@ -110,7 +110,7 @@ public class ModuleServiceImpl implements ModuleService { } // 设置ID和创建时间 - module.setID(IDUtils.generateID()); + module.setId(IDUtils.generateID()); module.setModuleID(IDUtils.generateID()); module.setCreateTime(new Date()); module.setUpdateTime(new Date()); @@ -146,7 +146,7 @@ public class ModuleServiceImpl implements ModuleService { } // 检查模块代码是否已存在（排除自身） - int count = moduleMapper.countByCode(module.getCode(), existingModule.getID()); + int count = moduleMapper.countByCode(module.getCode(), existingModule.getId()); if (count > 0) { ResultDomain result = new ResultDomain<>(); result.fail("模块代码已存在"); @@ -154,7 +154,7 @@ public class ModuleServiceImpl implements ModuleService { } // 设置更新时间和ID - module.setID(existingModule.getID()); + module.setId(existingModule.getId()); module.setUpdateTime(new Date()); int result = moduleMapper.updateModule(module); @@ -326,7 +326,7 @@ public class ModuleServiceImpl implements ModuleService { } // 设置基础信息 - permission.setID(IDUtils.generateID()); + permission.setId(IDUtils.generateID()); permission.setPermissionID(IDUtils.generateID()); permission.setCreateTime(new Date()); permission.setUpdateTime(new Date()); @@ -368,7 +368,7 @@ public class ModuleServiceImpl implements ModuleService { return result; } - permission.setID(existingPermission.getID()); + permission.setId(existingPermission.getId()); permission.setUpdateTime(new Date()); int result = permissionMapper.updatePermission(permission); diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/permission/service/impl/SysPermissionServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/permission/service/impl/SysPermissionServiceImpl.java index a6681bc..e981955 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/permission/service/impl/SysPermissionServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/permission/service/impl/SysPermissionServiceImpl.java @@ -121,7 +121,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { } // 设置基础信息 - permission.setID(IDUtils.generateID()); + permission.setId(IDUtils.generateID()); permission.setPermissionID(IDUtils.generateID()); permission.setCreateTime(new Date()); @@ -187,7 +187,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { } // 检查权限名称是否已存在（排除自身） - ResultDomain nameCheckResult = checkPermissionNameExists(permission.getName(), permission.getID()); + ResultDomain nameCheckResult = checkPermissionNameExists(permission.getName(), permission.getId()); if (!nameCheckResult.isSuccess()) { resultDomain.fail(nameCheckResult.getMessage()); return resultDomain; @@ -198,7 +198,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { } // 检查权限编码是否已存在（排除自身） - ResultDomain codeCheckResult = checkPermissionCodeExists(permission.getCode(), permission.getID()); + ResultDomain codeCheckResult = checkPermissionCodeExists(permission.getCode(), permission.getId()); if (!codeCheckResult.isSuccess()) { resultDomain.fail(codeCheckResult.getMessage()); return resultDomain; @@ -262,7 +262,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { Date now = new Date(); permission.setDeleted(true); permission.setDeleteTime(now); - permission.setUpdater(user.getID()); + permission.setUpdater(user.getId()); permission.setUpdateTime(now); int result = permissionMapper.deletePermission(permission); @@ -344,10 +344,10 @@ public class SysPermissionServiceImpl implements SysPermissionService { // 绑定角色权限 TbSysRolePermission rolePermission = new TbSysRolePermission(); - rolePermission.setID(IDUtils.generateID()); + rolePermission.setId(IDUtils.generateID()); rolePermission.setRoleID(roleId); rolePermission.setPermissionID(permissionId); - rolePermission.setCreator(user.getID()); + rolePermission.setCreator(user.getId()); rolePermission.setCreateTime(new Date()); int result = rolePermissionMapper.batchBindRolePermission(Arrays.asList(rolePermission)); @@ -394,10 +394,10 @@ public class SysPermissionServiceImpl implements SysPermissionService { for (String roleId : roleIds) { for (String permissionId : permissionIds) { TbSysRolePermission rolePermission = new TbSysRolePermission(); - rolePermission.setID(IDUtils.generateID()); + rolePermission.setId(IDUtils.generateID()); rolePermission.setRoleID(roleId); rolePermission.setPermissionID(permissionId); - rolePermission.setCreator(user.getID()); + rolePermission.setCreator(user.getId()); rolePermission.setCreateTime(new Date()); rolePermissions.add(rolePermission); } @@ -442,7 +442,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { TbSysRolePermission rolePermission = new TbSysRolePermission(); rolePermission.setRoleID(roleId); rolePermission.setPermissionID(permissionId); - rolePermission.setUpdater(user.getID()); + rolePermission.setUpdater(user.getId()); rolePermission.setUpdateTime(new Date()); int result = rolePermissionMapper.batchUnbindRolePermission(Arrays.asList(rolePermission)); if (result > 0) { @@ -487,7 +487,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { TbSysRolePermission rolePermission = new TbSysRolePermission(); rolePermission.setRoleID(roleId); rolePermission.setPermissionID(permissionId); - rolePermission.setUpdater(user.getID()); + rolePermission.setUpdater(user.getId()); rolePermission.setUpdateTime(new Date()); rolePermissions.add(rolePermission); } @@ -531,10 +531,10 @@ public class SysPermissionServiceImpl implements SysPermissionService { } // 绑定菜单权限 TbSysMenuPermission menuPermission = new TbSysMenuPermission(); - menuPermission.setID(IDUtils.generateID()); + menuPermission.setId(IDUtils.generateID()); menuPermission.setMenuID(menuId); menuPermission.setPermissionID(permissionId); - menuPermission.setCreator(user.getID()); + menuPermission.setCreator(user.getId()); menuPermission.setCreateTime(new Date()); int result = menuPermissionMapper.batchBindMenuPermission(Arrays.asList(menuPermission)); if (result > 0) { @@ -577,10 +577,10 @@ public class SysPermissionServiceImpl implements SysPermissionService { for (String menuId : menuIds) { for (String permissionId : permissionIds) { TbSysMenuPermission menuPermission = new TbSysMenuPermission(); - menuPermission.setID(IDUtils.generateID()); + menuPermission.setId(IDUtils.generateID()); menuPermission.setMenuID(menuId); menuPermission.setPermissionID(permissionId); - menuPermission.setCreator(user.getID()); + menuPermission.setCreator(user.getId()); menuPermission.setCreateTime(new Date()); menuPermissions.add(menuPermission); } @@ -625,7 +625,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { TbSysMenuPermission menuPermission = new TbSysMenuPermission(); menuPermission.setMenuID(menuId); menuPermission.setPermissionID(permissionId); - menuPermission.setUpdater(user.getID()); + menuPermission.setUpdater(user.getId()); menuPermission.setUpdateTime(new Date()); int result = menuPermissionMapper.batchUnbindMenuPermission(Arrays.asList(menuPermission)); if (result > 0) { @@ -670,7 +670,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { TbSysMenuPermission menuPermission = new TbSysMenuPermission(); menuPermission.setMenuID(menuId); menuPermission.setPermissionID(permissionId); - menuPermission.setUpdater(user.getID()); + menuPermission.setUpdater(user.getId()); menuPermission.setUpdateTime(new Date()); menuPermissions.add(menuPermission); } diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java index 16014ac..a6e9d8d 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java @@ -51,7 +51,7 @@ public class SysRoleServiceImpl implements SysRoleService { // 获取当前用户的部门角色信息 TbSysUser currentUser = LoginUtil.getCurrentUser(); - List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID()); + List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId()); logger.info("当前用户拥有 {} 个部门角色", userDeptRoles.size()); // 查询有权限的角色列表 @@ -76,7 +76,7 @@ public class SysRoleServiceImpl implements SysRoleService { // 获取当前用户的部门角色信息 TbSysUser currentUser = LoginUtil.getCurrentUser(); - List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID()); + List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId()); logger.info("当前用户拥有 {} 个部门角色", userDeptRoles.size()); // 查询有权限的角色列表 @@ -118,7 +118,7 @@ public class SysRoleServiceImpl implements SysRoleService { } // 设置基础信息 - role.setID(IDUtils.generateID()); + role.setId(IDUtils.generateID()); role.setRoleID(IDUtils.generateID()); role.setCreateTime(new Date()); role.setDeleted(false); @@ -167,7 +167,7 @@ public class SysRoleServiceImpl implements SysRoleService { } // 检查角色名称是否已存在（排除自身） - ResultDomain nameCheckResult = checkRoleNameExists(role.getName(), role.getID()); + ResultDomain nameCheckResult = checkRoleNameExists(role.getName(), role.getId()); if (!nameCheckResult.isSuccess()) { resultDomain.fail(nameCheckResult.getMessage()); return resultDomain; @@ -254,7 +254,7 @@ public class SysRoleServiceImpl implements SysRoleService { filter.setDeleted(false); // 获取当前用户的部门角色信息 TbSysUser currentUser = LoginUtil.getCurrentUser(); - List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID()); + List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId()); List roleVOs = roleMapper.selectRole(filter, userDeptRoles); if (roleVOs.isEmpty()) { @@ -318,7 +318,7 @@ public class SysRoleServiceImpl implements SysRoleService { // 获取当前用户的部门角色信息（用于权限过滤） TbSysUser currentUser = LoginUtil.getCurrentUser(); - List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID()); + List userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId()); int count = roleMapper.countByRoleName(roleName, excludeId, userDeptRoles); boolean exists = count > 0; diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/user/service/impl/SysUserServiceImpl.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/user/service/impl/SysUserServiceImpl.java index c9eed3e..dd681b8 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/service/user/service/impl/SysUserServiceImpl.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/service/user/service/impl/SysUserServiceImpl.java @@ -64,18 +64,18 @@ public class SysUserServiceImpl implements SysUserService { return resultDomain; } Date now = new Date(); - user.setID(IDUtils.generateID()); + user.setId(IDUtils.generateID()); user.setCreateTime(now); user.setDeleted(false); // 创建用户信息 TbSysUserInfo userInfo = new TbSysUserInfo(); - userInfo.setUserID(user.getID()); + userInfo.setUserID(user.getId()); userInfo.setCreateTime(now); userInfo.setAvatar("default"); TbSysUserDeptRole userDeptRole = new TbSysUserDeptRole(); - userDeptRole.setID(IDUtils.generateID()); // 设置ID - userDeptRole.setUserID(user.getID()); + userDeptRole.setId(IDUtils.generateID()); // 设置ID + userDeptRole.setUserID(user.getId()); userDeptRole.setDeptID("default_department"); userDeptRole.setRoleID("freedom"); userDeptRole.setCreateTime(now); @@ -142,7 +142,7 @@ public class SysUserServiceImpl implements SysUserService { List userDeptRoles = LoginUtil.getCurrentDeptRole(); TbSysUser filter = new TbSysUser(); - filter.setID(userId); + filter.setId(userId); filter.setDeleted(false); List users = userMapper.selectByFilter(filter, userDeptRoles); @@ -206,7 +206,7 @@ public class SysUserServiceImpl implements SysUserService { } // 检查至少有一个查询条件 - // boolean hasFilter = StringUtils.hasText(filter.getID()) || + // boolean hasFilter = StringUtils.hasText(filter.getId()) || // StringUtils.hasText(filter.getUsername()) || // StringUtils.hasText(filter.getEmail()) || // StringUtils.hasText(filter.getPhone()); @@ -347,7 +347,7 @@ public class SysUserServiceImpl implements SysUserService { } // 设置基础信息 - user.setID(IDUtils.generateID()); + user.setId(IDUtils.generateID()); user.setCreateTime(new Date()); user.setDeleted(false); if (user.getStatus() == null) { @@ -377,16 +377,16 @@ public class SysUserServiceImpl implements SysUserService { public ResultDomain updateUser(TbSysUser user) { ResultDomain resultDomain = new ResultDomain<>(); - logger.info("开始更新用户：{}", user.getID()); + logger.info("开始更新用户：{}", user.getId()); // 参数校验 - if (!StringUtils.hasText(user.getID())) { + if (!StringUtils.hasText(user.getId())) { resultDomain.fail("用户ID不能为空"); return resultDomain; } // 检查用户是否存在 - ResultDomain existResult = getUserById(user.getID()); + ResultDomain existResult = getUserById(user.getId()); if (!existResult.isSuccess()) { resultDomain.fail(existResult.getMessage()); return resultDomain; @@ -394,7 +394,7 @@ public class SysUserServiceImpl implements SysUserService { // 检查邮箱是否已存在（排除自身） if (StringUtils.hasText(user.getEmail())) { - ResultDomain emailCheckResult = checkEmailExists(user.getEmail(), user.getID()); + ResultDomain emailCheckResult = checkEmailExists(user.getEmail(), user.getId()); if (!emailCheckResult.isSuccess()) { resultDomain.fail(emailCheckResult.getMessage()); return resultDomain; @@ -412,11 +412,11 @@ public class SysUserServiceImpl implements SysUserService { int result = userMapper.updateUser(user); if (result > 0) { - logger.info("更新用户成功：{}", user.getID()); + logger.info("更新用户成功：{}", user.getId()); resultDomain.success("更新用户成功", user); return resultDomain; } else { - logger.warn("更新用户失败：{}", user.getID()); + logger.warn("更新用户失败：{}", user.getId()); resultDomain.fail("更新用户失败"); return resultDomain; } @@ -494,7 +494,7 @@ public class SysUserServiceImpl implements SysUserService { // 收集所有用户ID List userIds = new ArrayList<>(); for (TbSysUser user : userDeptRoleVO.getUsers()) { - userIds.add(user.getID()); + userIds.add(user.getId()); } logger.info("准备为 {} 个用户绑定部门角色（每个用户一个部门-角色）", userIds.size()); @@ -510,12 +510,12 @@ public class SysUserServiceImpl implements SysUserService { for (TbSysUser user : userDeptRoleVO.getUsers()) { TbSysUserDeptRole newUserDeptRole = new TbSysUserDeptRole(); - newUserDeptRole.setID(IDUtils.generateID()); - newUserDeptRole.setUserID(user.getID()); + newUserDeptRole.setId(IDUtils.generateID()); + newUserDeptRole.setUserID(user.getId()); newUserDeptRole.setDeptID(templateDeptRole.getDeptID()); newUserDeptRole.setRoleID(templateDeptRole.getRoleID()); newUserDeptRole.setCreateTime(now); - newUserDeptRole.setCreator(currentUser.getID()); + newUserDeptRole.setCreator(currentUser.getId()); userDeptRoles.add(newUserDeptRole); } @@ -546,7 +546,7 @@ public class SysUserServiceImpl implements SysUserService { Date now = new Date(); for (TbSysUser user : userDeptRoleVO.getUsers()) { for (TbSysUserDeptRole userDeptRole : userDeptRoleVO.getUserDeptRoles()) { - userDeptRole.setUserID(user.getID()); + userDeptRole.setUserID(user.getId()); userDeptRoles.add(userDeptRole); } } @@ -576,7 +576,7 @@ public class SysUserServiceImpl implements SysUserService { List userDeptRoles = LoginUtil.getCurrentDeptRole(); TbSysUser filter = new TbSysUser(); if (StringUtils.hasText(excludeId)) { - filter.setID(excludeId); + filter.setId(excludeId); } filter.setUsername(username); filter.setDeleted(false); @@ -612,11 +612,11 @@ public class SysUserServiceImpl implements SysUserService { filter.setDeleted(false); // if (StringUtils.hasText(excludeId)) { - // filter.setID(excludeId); + // filter.setId(excludeId); // } List userList = userMapper.selectByFilter(filter, userDeptRoles); - boolean exists = userList.size() >1 && (userList.size() == 1 && !userList.get(0).getID().equals(excludeId)); + boolean exists = userList.size() >1 && (userList.size() == 1 && !userList.get(0).getId().equals(excludeId)); logger.info("邮箱存在性检查完成：{}，存在：{}", email, exists); resultDomain.success("检查完成", exists); diff --git a/schoolNewsServ/system/src/main/java/org/xyzh/system/utils/LoginUtil.java b/schoolNewsServ/system/src/main/java/org/xyzh/system/utils/LoginUtil.java index 5a45306..5c3b9aa 100644 --- a/schoolNewsServ/system/src/main/java/org/xyzh/system/utils/LoginUtil.java +++ b/schoolNewsServ/system/src/main/java/org/xyzh/system/utils/LoginUtil.java @@ -87,7 +87,7 @@ public class LoginUtil { // UserDeptRoleVO应该在登录时就已经扁平化填充好了 // 这里只需要确保userID被设置（如果还没设置的话） - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); return roles.stream().map(item -> { if (item.getUserID() == null) { item.setUserID(userId); @@ -126,7 +126,7 @@ public class LoginUtil { */ public static String getCurrentUserId() { TbSysUser user = getCurrentUser(); - return user != null ? user.getID() : null; + return user != null ? user.getId() : null; } /** diff --git a/schoolNewsServ/system/src/main/resources/mapper/SysConfigMapper.xml b/schoolNewsServ/system/src/main/resources/mapper/SysConfigMapper.xml index 5b50131..cca41ba 100644 --- a/schoolNewsServ/system/src/main/resources/mapper/SysConfigMapper.xml +++ b/schoolNewsServ/system/src/main/resources/mapper/SysConfigMapper.xml @@ -4,7 +4,7 @@ - + @@ -62,7 +62,7 @@ description, placeholder, remark, `rows`, min_value, max_value, unit, `options`, order_num, is_system, creator, create_time ) VALUES ( - #{config.ID}, #{config.configKey}, #{config.configName}, #{config.configValue}, + #{config.id}, #{config.configKey}, #{config.configName}, #{config.configValue}, #{config.configType}, #{config.renderType}, #{config.configGroup}, #{config.description}, #{config.placeholder}, #{config.remark}, #{config.rows}, #{config.minValue}, #{config.maxValue}, #{config.unit}, #{config.options}, #{config.orderNum}, @@ -90,7 +90,7 @@ is_system = #{config.isSystem}, updater = #{config.updater}, update_time = NOW() - WHERE id = #{config.ID} + WHERE id = #{config.id} AND deleted = 0 diff --git a/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserCollectionController.java b/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserCollectionController.java index cce48d3..58a4971 100644 --- a/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserCollectionController.java +++ b/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserCollectionController.java @@ -64,7 +64,7 @@ public class UserCollectionController { resultDomain.fail("请先登录"); return resultDomain; } - return userCollectionService.isCollected(user.getID(), collectionType, collectionID); + return userCollectionService.isCollected(user.getId(), collectionType, collectionID); } /** diff --git a/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserProfileController.java b/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserProfileController.java index b66cc4c..a025819 100644 --- a/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserProfileController.java +++ b/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserProfileController.java @@ -42,7 +42,7 @@ public class UserProfileController { @GetMapping("/info") public ResultDomain getUserProfile(@HttpLogin LoginDomain loginDomain) { // TODO: 实现获取个人信息 - ResultDomain result = userService.getUserInfoTotal(loginDomain.getUser().getID()); + ResultDomain result = userService.getUserInfoTotal(loginDomain.getUser().getId()); if (result.isSuccess()) { return result; } else { @@ -60,7 +60,7 @@ public class UserProfileController { ResultDomain result = new ResultDomain<>(); // 更新tb_sys_user TbSysUser user = new TbSysUser(); - user.setID(userVO.getUserID()); + user.setId(userVO.getUserID()); user.setUsername(userVO.getUsername()); user.setEmail(userVO.getEmail()); user.setPhone(userVO.getPhone()); @@ -97,7 +97,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("用户上传头像: userId={}, fileName={}", userId, file.getOriginalFilename()); // 上传文件到文件服务 @@ -149,7 +149,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("用户更新头像URL: userId={}, avatarUrl={}", userId, avatarUrl); // 更新用户信息中的头像 @@ -187,7 +187,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); String oldPassword = (String) params.get("oldPassword"); String newPassword = (String) params.get("newPassword"); @@ -238,7 +238,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); String phone = (String) params.get("phone"); String verifyCode = (String) params.get("verifyCode"); @@ -250,7 +250,7 @@ public class UserProfileController { logger.info("用户绑定手机号: userId={}, phone={}", userId, phone); TbSysUser user = new TbSysUser(); - user.setID(userId); + user.setId(userId); user.setPhone(phone); ResultDomain bindResult = userService.updateUser(user); @@ -278,7 +278,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); String email = (String) params.get("email"); String verifyCode = (String) params.get("verifyCode"); @@ -290,7 +290,7 @@ public class UserProfileController { logger.info("用户绑定邮箱: userId={}, email={}", userId, email); TbSysUser user = new TbSysUser(); - user.setID(userId); + user.setId(userId); user.setEmail(email); ResultDomain bindResult = userService.updateUser(user); @@ -316,7 +316,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("用户解绑手机号: userId={}", userId); // TODO: 验证用户身份 @@ -340,7 +340,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("用户解绑邮箱: userId={}", userId); // TODO: 验证用户身份 @@ -366,7 +366,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); String reason = (String) params.get("reason"); logger.info("用户申请账号注销: userId={}, reason={}", userId, reason); @@ -392,7 +392,7 @@ public class UserProfileController { ResultDomain> resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("获取账号安全信息: userId={}", userId); // TODO: 获取用户的手机号、邮箱绑定状态 @@ -419,7 +419,7 @@ public class UserProfileController { ResultDomain resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); String verifyType = (String) params.get("verifyType"); // password, phone, email String verifyCode = (String) params.get("verifyCode"); @@ -448,7 +448,7 @@ public class UserProfileController { ResultDomain> resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("获取学习记录统计: userId={}", userId); // TODO: 获取用户学习记录统计数据 @@ -475,7 +475,7 @@ public class UserProfileController { ResultDomain> resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("按时间筛选学习记录: userId={}, timeRange={}", userId, timeRange); // TODO: 根据时间范围筛选学习记录（周/月/年） @@ -499,7 +499,7 @@ public class UserProfileController { ResultDomain> resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("获取学习时长图表数据: userId={}", userId); // TODO: 获取每日学习时长数据 @@ -523,7 +523,7 @@ public class UserProfileController { ResultDomain> resultDomain = new ResultDomain<>(); try { - String userId = loginDomain.getUser().getID(); + String userId = loginDomain.getUser().getId(); logger.info("获取资源学习次数图表数据: userId={}", userId); // TODO: 获取各资源的学习次数 diff --git a/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/service/impl/UCUserCollectionServiceImpl.java b/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/service/impl/UCUserCollectionServiceImpl.java index f97818c..5b39ad3 100644 --- a/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/service/impl/UCUserCollectionServiceImpl.java +++ b/schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/service/impl/UCUserCollectionServiceImpl.java @@ -45,7 +45,7 @@ public class UCUserCollectionServiceImpl implements UCUserCollectionService { if (user == null) { throw new RuntimeException("请先登录"); } - userCollection.setUserID(user.getID()); + userCollection.setUserID(user.getId()); userCollection.setCreateTime(new Date()); int result = userCollectionMapper.insertUserCollection(userCollection); if (result > 0) { @@ -113,7 +113,7 @@ public class UCUserCollectionServiceImpl implements UCUserCollectionService { if (user == null) { throw new RuntimeException("请先登录"); } - userCollection.setUserID(user.getID()); + userCollection.setUserID(user.getId()); userCollection.setCollectionValue(-1); int result = userCollectionMapper.deleteUserCollection(userCollection); diff --git a/schoolNewsWeb/src/components/base/ChangeHome.vue b/schoolNewsWeb/src/components/base/ChangeHome.vue index 139b89a..082bd8a 100644 --- a/schoolNewsWeb/src/components/base/ChangeHome.vue +++ b/schoolNewsWeb/src/components/base/ChangeHome.vue @@ -1,5 +1,5 @@