diff --git a/README.md b/README.md index 83d23cb..27327ad 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ - 考试管理 - 题库管理 - 成绩统计 +- AI题目生成 ## 微信扫码登录配置 @@ -39,6 +40,42 @@ wechat: 4. 在微信中确认登录 5. 系统将自动跳转到主页 +## AI题目生成功能 + +系统集成了AI题目生成功能，可以通过调用AI大模型API来自动生成各种类型的题目。 + +### 配置步骤 + +1. 在`exam-online-api/ruoyi-admin/src/main/resources/application.yml`中配置AI API参数： + +```yaml +ai: + # DeepSeek API配置 + api-url: https://api.deepseek.com/v1/chat/completions + model-name: deepseek-chat + api-key: your_deepseek_api_key + connect-timeout: 30 + read-timeout: 60 + write-timeout: 30 + + # OpenRouter API配置 + openrouter: + api-url: https://openrouter.ai/api/v1/chat/completions + model-name: deepseek/deepseek-v3-0324-free + api-key: your_openrouter_api_key + enabled: false +``` + +2. 执行数据库脚本`doc/ai_question_permissions.sql`添加相关权限 + +### 使用说明 + +1. 进入"题库管理"模块 +2. 选择一个题库或创建新题库 +3. 点击"AI生成题目"按钮 +4. 配置生成参数并生成题目 +5. 点击"保存到题库"将题目保存到当前题库中 + ## 技术栈 - 后端：Spring Boot + MyBatis + Spring Security diff --git a/doc/ai_question_generation_guide.md b/doc/ai_question_generation_guide.md new file mode 100644 index 0000000..cc593b4 --- /dev/null +++ b/doc/ai_question_generation_guide.md @@ -0,0 +1,219 @@ +# AI题目生成功能使用指南 + +## 功能概述 + +AI题目生成功能是yzexam在线考试系统的一个扩展功能，通过调用AI大模型API（如DeepSeek、OpenRouter等）来自动生成各种类型的题目，包括选择题、简答题和论述题等，以提高教师出题效率，丰富题库内容。 + +## 功能特性 + +- 支持生成多种题型：单选题、多选题、简答题、论述题 +- 支持"全部题型"选项，一次性生成多种类型的题目 +- 支持设置题目数量（1-20题） +- 支持设置题目难度等级：简单、中等、困难 +- 支持指定知识点范围生成题目 +- 支持指定关键词生成题目（多个关键词用逗号分隔） +- 支持指定题目方向生成题目（理解、应用、分析、综合、评价） +- 支持指定适合学段生成题目（初中、高中、大学、研究生） +- 生成的题目可直接保存到题库中 + +## 技术架构 + +### 后端技术栈 +- Java + Spring Boot +- OkHttp（用于调用AI API） +- FastJSON（用于JSON处理） +- MyBatis（用于数据库操作） + +### 前端技术栈 +- Vue.js 2.x +- Element UI +- Axios + +## 部署配置 + +### 1. 配置AI API密钥 + +在[application.yml](file:///Volumes/macData/code/yzexam/examapi/ruoyi-admin/src/main/resources/application.yml)中配置AI API相关信息： + +```yaml +# AI题目生成配置 +ai: + # DeepSeek API配置 + api-url: https://api.deepseek.com/v1/chat/completions + model-name: deepseek-chat + api-key: ${AI_API_KEY:} + connect-timeout: 30 + read-timeout: 60 + write-timeout: 30 + + # OpenRouter API配置 + openrouter: + api-url: https://openrouter.ai/api/v1/chat/completions + model-name: deepseek/deepseek-v3-0324-free + api-key: ${OPENROUTER_API_KEY:} + enabled: false +``` + +### 2. 设置环境变量 + +可以选择使用DeepSeek API或OpenRouter API： + +使用DeepSeek API： +```bash +export AI_API_KEY="your_deepseek_api_key_here" +``` + +使用OpenRouter API： +```bash +export OPENROUTER_API_KEY="your_openrouter_api_key_here" +``` + +### 3. 数据库权限配置 + +运行[ai_question_permissions.sql](file:///Volumes/macData/code/yzexam/doc/ai_question_permissions.sql)脚本，为系统添加AI题目生成功能所需的菜单和权限。 + +## 使用说明 + +### 1. 访问AI题目生成功能 + +1. 登录系统后，进入"题库管理"模块 +2. 选择一个题库或创建新题库 +3. 点击"AI生成题目"按钮 +4. 系统将跳转到AI题目生成页面 + +### 2. 配置生成参数 + +在AI题目生成页面中，配置以下参数： + +- **题目类型**：选择要生成的题目类型（单选题、多选题、简答题、论述题或全部题型） +- **题目数量**：输入要生成的题目数量（1-20题） +- **知识点范围**：输入题目涉及的知识点范围 +- **关键词**：输入与题目相关的关键词（多个关键词用逗号分隔） +- **难易程度**：选择题目的难度等级（简单、中等、困难） +- **题目方向**：选择题目的考查方向（理解、应用、分析、综合、评价） +- **适合学段**：选择题目适合的学段（初中、高中、大学、研究生） + +### 3. 生成题目 + +点击"生成题目"按钮，系统将调用AI API生成指定类型的题目，并在页面中显示生成结果。 + +### 4. 保存题目 + +生成题目后，可以点击"保存到题库"按钮将题目保存到当前题库中。 + +## API接口说明 + +### 1. 生成选择题 +``` +POST /ai/questions/choice +Content-Type: application/json + +{ + "knowledgePoint": "马克思主义基本原理", + "keywords": "唯物主义,辩证法,实践", + "difficulty": "medium", + "direction": "comprehension", + "gradeLevel": "college", + "multiple": false +} +``` + +### 2. 生成简答题 +``` +POST /ai/questions/short-answer +Content-Type: application/json + +{ + "knowledgePoint": "社会主义核心价值观", + "keywords": "爱国,敬业,诚信,友善", + "difficulty": "medium", + "direction": "application", + "gradeLevel": "college" +} +``` + +### 3. 生成论述题 +``` +POST /ai/questions/essay +Content-Type: application/json + +{ + "knowledgePoint": "新时代党的建设", + "keywords": "全面从严治党,反腐倡康,制度建设", + "difficulty": "hard", + "direction": "evaluation", + "gradeLevel": "postgraduate" +} +``` + +### 4. 批量生成题目 +``` +POST /ai/questions/batch +Content-Type: application/json + +{ + "questionType": "choice", + "count": 5, + "knowledgePoint": "马克思主义基本原理", + "keywords": "唯物主义,辩证法,实践", + "difficulty": "medium", + "direction": "comprehension", + "gradeLevel": "college", + "multiple": false +} +``` + +### 5. 保存AI生成的题目 +``` +POST /ai/questions/save +Content-Type: application/json + +{ + "questions": [...], // AI生成的题目列表 + "bankCode": "题库代码" +} +``` + +## 安全注意事项 + +1. API密钥应妥善保管，不要硬编码在代码中 +2. 建议通过环境变量或配置中心管理API密钥 +3. 实际部署时应添加身份验证和权限控制 +4. 添加API调用频率限制，防止滥用 + +## 常见问题 + +### 1. 生成题目失败 + +可能原因： +- API密钥配置错误 +- 网络连接问题 +- AI API服务不可用 + +解决方案： +- 检查API密钥是否正确配置 +- 检查网络连接是否正常 +- 确认AI API服务是否可用 + +### 2. 保存题目失败 + +可能原因： +- 题库代码不正确 +- 数据库连接问题 +- 权限不足 + +解决方案： +- 检查题库代码是否正确 +- 检查数据库连接是否正常 +- 确认用户是否有保存题目的权限 + +## 扩展建议 + +1. 添加题目质量评估功能 +2. 实现题目去重机制 +3. 添加题目版本管理 +4. 支持批量生成题目 +5. 添加题目审核流程 +6. 实现题目分类管理 +7. 添加题目搜索功能 +8. 支持题目导出为不同格式 \ No newline at end of file diff --git a/doc/ai_question_permissions.sql b/doc/ai_question_permissions.sql new file mode 100644 index 0000000..d26af6b --- /dev/null +++ b/doc/ai_question_permissions.sql @@ -0,0 +1,19 @@ +-- 添加AI题目生成功能的权限 +-- 菜单权限 +INSERT INTO `sys_menu` (`menu_name`, `parent_id`, `order_num`, `path`, `component`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) +VALUES ('AI题目生成', 2000, 1, 'ai/generator', 'questions/ai/AIQuestionGenerator', 1, 0, 'C', '0', '0', 'ai:questions:generate', 'magic', 'admin', sysdate(), '', null, 'AI题目生成菜单'); + +-- 按钮权限 +INSERT INTO `sys_menu` (`menu_name`, `parent_id`, `order_num`, `path`, `component`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) +VALUES ('生成题目', 2001, 1, '#', '', 1, 0, 'F', '0', '0', 'ai:questions:generate', '#', 'admin', sysdate(), '', null, ''); + +INSERT INTO `sys_menu` (`menu_name`, `parent_id`, `order_num`, `path`, `component`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) +VALUES ('保存题目', 2001, 2, '#', '', 1, 0, 'F', '0', '0', 'ai:questions:save', '#', 'admin', sysdate(), '', null, ''); + +-- 获取新插入菜单的ID +SET @menu_id = LAST_INSERT_ID(); + +-- 角色权限关联（给管理员角色分配权限） +INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (1, 2001); +INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (1, 2002); +INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (1, 2003); \ No newline at end of file diff --git a/exam-online-api-DEL/.gitignore b/exam-online-api-DEL/.gitignore deleted file mode 100644 index 2c0e049..0000000 --- a/exam-online-api-DEL/.gitignore +++ /dev/null @@ -1,44 +0,0 @@ -###################################################################### -# Build Tools - -.gradle -/build/ -!gradle/wrapper/gradle-wrapper.jar - -target/ -!.mvn/wrapper/maven-wrapper.jar - -###################################################################### -# IDE - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/* -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ - -###################################################################### -# Others -*.log -*.xml.versionsBackup -*.swp - -!*/build/*.java -!*/build/*.html -!*/build/*.xml diff --git a/exam-online-api-DEL/LICENSE b/exam-online-api-DEL/LICENSE deleted file mode 100644 index 8564f29..0000000 --- a/exam-online-api-DEL/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 RuoYi - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/exam-online-api-DEL/README.md b/exam-online-api-DEL/README.md deleted file mode 100644 index 96c1e9e..0000000 --- a/exam-online-api-DEL/README.md +++ /dev/null @@ -1,85 +0,0 @@ -## 平台简介 - -若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 - -* 前端采用Vue、Element UI。 -* 后端采用Spring Boot、Spring Security、Redis & Jwt。 -* 权限认证使用Jwt，支持多终端认证系统。 -* 支持加载动态权限菜单，多方式轻松权限控制。 -* 高效率开发，使用代码生成器可以一键生成前后端代码。 -* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。 -* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) -* 特别鸣谢：[element](https://github.com/ElemeFE/element)，[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://github.com/elunez/eladmin-web)。 -* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   -* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   - -## 内置功能 - -1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 -2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 -3. 岗位管理：配置系统用户所属担任职务。 -4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 -5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 -6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 -7. 参数管理：对系统动态配置常用参数。 -8. 通知公告：系统通知公告信息发布维护。 -9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 -10. 登录日志：系统登录日志记录查询包含登录异常。 -11. 在线用户：当前系统中活跃用户状态监控。 -12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 -13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 -14. 系统接口：根据业务代码自动生成相关的api接口文档。 -15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。 -16. 缓存监控：对系统的缓存信息查询，命令统计等。 -17. 在线构建器：拖动表单元素生成相应的HTML代码。 -18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 - -## 在线体验 - -- admin/admin123 -- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 - -演示地址：http://vue.ruoyi.vip -文档地址：http://doc.ruoyi.vip - -## 演示图 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -## 若依前后端分离交流群 - -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) 点击按钮入群。 \ No newline at end of file diff --git a/exam-online-api-DEL/bin/clean b/exam-online-api-DEL/bin/clean deleted file mode 100755 index 2f3d3e5..0000000 --- a/exam-online-api-DEL/bin/clean +++ /dev/null @@ -1 +0,0 @@ -mvn clean \ No newline at end of file diff --git a/exam-online-api-DEL/bin/clean.bat b/exam-online-api-DEL/bin/clean.bat deleted file mode 100644 index 5c2a3b2..0000000 --- a/exam-online-api-DEL/bin/clean.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [Ϣ] · -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean - -pause \ No newline at end of file diff --git a/exam-online-api-DEL/bin/package b/exam-online-api-DEL/bin/package deleted file mode 100755 index 502174c..0000000 --- a/exam-online-api-DEL/bin/package +++ /dev/null @@ -1 +0,0 @@ -mvn clean package -Dmaven.test.skip=true \ No newline at end of file diff --git a/exam-online-api-DEL/bin/package.bat b/exam-online-api-DEL/bin/package.bat deleted file mode 100644 index c693ec0..0000000 --- a/exam-online-api-DEL/bin/package.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [Ϣ] Weḅwar/jarļ -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean package -Dmaven.test.skip=true - -pause \ No newline at end of file diff --git a/exam-online-api-DEL/bin/run b/exam-online-api-DEL/bin/run deleted file mode 100755 index c1cbfc6..0000000 --- a/exam-online-api-DEL/bin/run +++ /dev/null @@ -1 +0,0 @@ -java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar ruoyi-admin/target/examapi.jar \ No newline at end of file diff --git a/exam-online-api-DEL/bin/run.bat b/exam-online-api-DEL/bin/run.bat deleted file mode 100644 index 90073a8..0000000 --- a/exam-online-api-DEL/bin/run.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [Ϣ] Web̡ -echo. - -cd %~dp0 -cd ../ruoyi-admin/target - -set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -jar %JAVA_OPTS% ruoyi-admin.jar - -cd bin -pause \ No newline at end of file diff --git a/exam-online-api-DEL/doc/若依环境使用手册.docx b/exam-online-api-DEL/doc/若依环境使用手册.docx deleted file mode 100644 index 9e4daef..0000000 Binary files a/exam-online-api-DEL/doc/若依环境使用手册.docx and /dev/null differ diff --git a/exam-online-api-DEL/hig-application/pom.xml b/exam-online-api-DEL/hig-application/pom.xml deleted file mode 100644 index 304c777..0000000 --- a/exam-online-api-DEL/hig-application/pom.xml +++ /dev/null @@ -1,198 +0,0 @@ - - 4.0.0 - - com.ruoyi - ruoyi - 3.8.6 - - - hig-application - hig-application - 应用扩展包 - - 1.8 - 1.2.83 - 1.18.30 - 12.2.0.1.0 - 1.2.20 - 2.3.2 - 2.10.1 - 3.0.5 - 2.3.2 - 4.5.14 - 4.5.14 - 4.4.16 - 1.15 - 1.2 - 2.11.0 - 3.12.0 - 3.12.0 - 4.5.0 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - com.alibaba - fastjson - ${fastjson.version} - - - org.projectlombok - lombok - ${lombok.version} - - - com.google.code.gson - gson - ${gson.version} - - - cn.hutool - hutool-all - 5.8.25 - - - com.github.ulisesbocchio - jasypt-spring-boot-starter - ${jasypt.version} - - - - org.springframework - spring-context-support - - - - org.springframework - spring-tx - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis.version} - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - slf4j-api - org.slf4j - - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - org.apache.httpcomponents - httpmime - ${httpmime.version} - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - - com.thoughtworks.xstream - xstream - 1.4.20 - - - - - commons-io - commons-io - ${commons-io.version} - - - commons-lang - commons-lang - 2.6 - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - - commons-logging - commons-logging - ${commons-logging.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - com.github.binarywang - weixin-java-cp - ${weixin-java-cp.version} - - - org.json - json - 20231013 - - - com.ruoyi - ruoyi-framework - - - com.ruoyi - ruoyi-system - - - com.ruoyi - ruoyi-common - - - com.ruoyi - hig-common - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/cms/utils/FileUpload.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/cms/utils/FileUpload.java deleted file mode 100644 index 7ca227a..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/cms/utils/FileUpload.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hig.cms.utils; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; -import org.springframework.web.multipart.MultipartFile; - -public class FileUpload { - /** - * 文件上传处理 - * - * @param file - * @return - */ - public static String writeUploadFile(MultipartFile file,String path) { - String filename = file.getOriginalFilename(); - System.out.println("原始文件名:" + filename); - File fileDir = new File(path); - if (!fileDir.exists()) - fileDir.mkdirs(); - - String extname = FilenameUtils.getExtension(filename); - String allowImgFormat = "gif,jpg,jpeg,png"; - if (!allowImgFormat.contains(extname.toLowerCase())) { - return "NOT_IMAGE"; - } - - filename = Math.abs(file.getOriginalFilename().hashCode()) + RandomUtils.createRandomString( 4 ) + "." + extname; - InputStream input = null; - FileOutputStream fos = null; - try { - input = file.getInputStream(); - fos = new FileOutputStream(path + "/" + filename); - IOUtils.copy(input, fos); - } catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (input != null) { - try { - input.close(); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } - - if (fos != null) { - try { - fos.close(); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } - } - return filename; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/cms/utils/RandomUtils.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/cms/utils/RandomUtils.java deleted file mode 100644 index 462d85d..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/cms/utils/RandomUtils.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hig.cms.utils; - -public class RandomUtils { - private static final String charlist = "0123456789"; - - public static String createRandomString(int len) { - String str = new String(); - for (int i = 0; i < len; i++) { - str += charlist.charAt(getRandom(charlist.length())); - } - return str; - } - - public static int getRandom(int mod) { - if (mod < 1) { - return 0; - } - int ret = getInt() % mod; - return ret; - } - - private static int getInt() { - int ret = Math.abs(Long.valueOf(getRandomNumString()).intValue()); - return ret; - } - - private static String getRandomNumString() { - double d = Math.random(); - String dStr = String.valueOf(d).replaceAll("[^\\d]", ""); - if (dStr.length() > 1) { - dStr = dStr.substring(0, dStr.length() - 1); - } - return dStr; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskDataController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskDataController.java deleted file mode 100644 index 57fcfcc..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskDataController.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hig.exam.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.hig.exam.domain.ExamTaskData; -import com.hig.exam.service.IExamTaskDataService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; - -@RestController -@RequestMapping("/exam/examtask") -public class ExamTaskDataController extends BaseController{ - @Autowired - private IExamTaskDataService examTaskDataService; - - - @PostMapping("/save") - public AjaxResult save(@RequestBody ExamTaskData examTaskData) - { - // 数据判断 - if (examTaskData == null) { - return AjaxResult.error(-1, "传入数据为空!"); - } - - if (examTaskData.getExamTaskManager() == null) { - return AjaxResult.error(-1, "传入任务属性信息为空!"); - } - - if (examTaskData.getTaskQuestionsList() == null || examTaskData.getTaskQuestionsList().size() == 0) { - return AjaxResult.error(-1, "传入题库信息为空!"); - } - - if (examTaskData.getTaskGroupList() == null || examTaskData.getTaskGroupList().size() == 0) { - return AjaxResult.error(-1, "传入人员分组信息为空!"); - } - - try - { - examTaskDataService.saveData(examTaskData); - } - catch(Exception e) { - return AjaxResult.error(-1, e.getMessage()); - } - return AjaxResult.success("保存成功"); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskGroupController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskGroupController.java deleted file mode 100644 index f032899..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskGroupController.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.hig.exam.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.exam.domain.ExamTaskGroup; -import com.hig.exam.service.IExamTaskGroupService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 任务分组Controller - * - * @author qnsdt - * @date 2023-02-10 - */ -@RestController -@RequestMapping("/exam/taskgroup") -public class ExamTaskGroupController extends BaseController -{ - @Autowired - private IExamTaskGroupService examTaskGroupService; - - /** - * 查询任务分组列表 - */ - @GetMapping("/list") - public TableDataInfo list(ExamTaskGroup examTaskGroup) - { - startPage(); - List list = examTaskGroupService.selectExamTaskGroupList(examTaskGroup); - return getDataTable(list); - } - - /** - * 导出任务分组列表 - */ - @GetMapping("/export") - public AjaxResult export(ExamTaskGroup examTaskGroup) - { - List list = examTaskGroupService.selectExamTaskGroupList(examTaskGroup); - ExcelUtil util = new ExcelUtil(ExamTaskGroup.class); - return util.exportExcel(list, "任务分组数据"); - } - - /** - * 获取任务分组详细信息 - */ - @GetMapping(value = "/{examCode}") - public AjaxResult getInfo(@PathVariable("examCode") String examCode) - { - return AjaxResult.success(examTaskGroupService.selectExamTaskGroupById(examCode)); - } - - /** - * 新增任务分组 - */ - @PostMapping - public AjaxResult add(@RequestBody ExamTaskGroup examTaskGroup) - { - return toAjax(examTaskGroupService.insertExamTaskGroup(examTaskGroup)); - } - - /** - * 修改任务分组 - */ - @PostMapping("/update") - public AjaxResult edit(@RequestBody ExamTaskGroup examTaskGroup) - { - return toAjax(examTaskGroupService.updateExamTaskGroup(examTaskGroup)); - } - - @PostMapping("/batchupdate") - public AjaxResult batchUpdate(@RequestBody List examTaskGroupList) - { - try - { - examTaskGroupService.batchUpdateExamTaskGroup(examTaskGroupList); - } - catch(Exception e) { - return AjaxResult.error(e.getMessage()); - } - - return AjaxResult.success(); - } - /** - * 删除任务分组 - */ - @GetMapping("/delete/{examCodes}") - public AjaxResult remove(@PathVariable String[] examCodes) - { - return toAjax(examTaskGroupService.deleteExamTaskGroupByIds(examCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskManagerController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskManagerController.java deleted file mode 100644 index 2789fd1..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskManagerController.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.hig.exam.controller; - -import java.util.List; -import java.util.Map; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.cms.utils.FileUpload; -import com.hig.exam.domain.ExamTaskManager; -import com.hig.exam.domain.ExamTaskPicture; -import com.hig.exam.service.IExamTaskManagerService; -import com.hig.exam.service.IExamTaskPictureService; -import com.hig.questions.domain.ExamBankPicture; -import com.hig.utils.DateUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 创建考试Controller - * - * @author qnsdt - * @date 2023-01-06 - */ -@RestController -@RequestMapping("/exam/examtask") -public class ExamTaskManagerController extends BaseController -{ - @Value("${cms.exam.photo-path:/photo/exam}") - private String photopath; - - @Autowired - private IExamTaskManagerService examTaskManagerService; - - @Autowired - private TokenService tokenService; - - @Autowired - private IExamTaskPictureService examTaskPictureService; - /** - * 查询创建考试列表 - */ - @PreAuthorize("@ss.hasPermi('exam:examtask:list')") - @GetMapping("/list") - public TableDataInfo list(ExamTaskManager examTaskManager) - { - - if (examTaskManager.getStartTime() != null) { - examTaskManager.setStartDateText(DateUtils.toShortDateString(examTaskManager.getStartTime())); - } - - if (examTaskManager.getEndTime() != null) { - examTaskManager.setEndDateText(DateUtils.toShortDateString(examTaskManager.getEndTime())); - } - - startPage(); - List list = examTaskManagerService.selectExamTaskManagerList(examTaskManager); - return getDataTable(list); - } - - /** - * 导出创建考试列表 - */ - @PreAuthorize("@ss.hasPermi('exam:examtask:export')") - @Log(title = "创建考试", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamTaskManager examTaskManager) - { - List list = examTaskManagerService.selectExamTaskManagerList(examTaskManager); - ExcelUtil util = new ExcelUtil(ExamTaskManager.class); - return util.exportExcel(list, "创建考试数据"); - } - - /** - * 获取创建考试详细信息 - */ - @PreAuthorize("@ss.hasPermi('exam:examtask:query')") - @GetMapping(value = "/{examCode}") - public AjaxResult getInfo(@PathVariable("examCode") String examCode) - { - return AjaxResult.success(examTaskManagerService.selectExamTaskManagerById(examCode)); - } - - /** - * 新增创建考试 - */ - @PreAuthorize("@ss.hasPermi('exam:examtask:add')") - @Log(title = "创建考试", businessType = BusinessType.INSERT) - @PostMapping("/add") - public AjaxResult add(@RequestBody ExamTaskManager examTaskManager) - { - return toAjax(examTaskManagerService.insertExamTaskManager(examTaskManager)); - } - - /** - * 修改创建考试 - */ - @PreAuthorize("@ss.hasPermi('exam:examtask:edit')") - @Log(title = "创建考试", businessType = BusinessType.UPDATE) - // @PutMapping - @PostMapping("/update") - public AjaxResult edit(@RequestBody ExamTaskManager examTaskManager) - { - return toAjax(examTaskManagerService.updateExamTaskManager(examTaskManager)); - } - - /** - * 删除创建考试 - */ - @PreAuthorize("@ss.hasPermi('exam:examtask:remove')") - @Log(title = "创建考试", businessType = BusinessType.DELETE) - @GetMapping("/delete/{examCodes}") - public AjaxResult remove(@PathVariable String[] examCodes) - { - return toAjax(examTaskManagerService.deleteExamTaskManagerByIds(examCodes)); - } - - /** - * 新增参数配置 - */ - @PostMapping("/uploadphoto/{examCodes}") - public AjaxResult uploadPhoto(@PathVariable String examCodes, - @RequestParam("file") MultipartFile file) - { - // 取得原始文件名 - String originalfile = file.getOriginalFilename(); - - // 拼接路径 - String path = RuoYiConfig.getProfile() + photopath; - String filename = FileUpload.writeUploadFile(file,path); - String fileurl = photopath + "/" + filename; - - int count = 0; - - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - - ExamTaskPicture examTaskPicture = new ExamTaskPicture(examCodes,path,fileurl,filename,originalfile,loginUser.getUser().getUserName()); - System.out.println("examTaskPicture:" + examTaskPicture.toString()); - - try - { - examTaskPictureService.deleteExamTaskPictureById(examCodes); - count = examTaskPictureService.insertExamTaskPicture(examTaskPicture); - } - catch(Exception e) - { - return AjaxResult.error(e.getMessage()); - } - - - return AjaxResult.success(examTaskPicture); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskPersonController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskPersonController.java deleted file mode 100644 index 057442c..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskPersonController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.hig.exam.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.exam.domain.ExamTaskPerson; -import com.hig.exam.service.IExamTaskPersonService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 考试人员Controller - * - * @author qnsdt - * @date 2023-01-06 - */ -@RestController -@RequestMapping("/exam/taskperson") -public class ExamTaskPersonController extends BaseController -{ - @Autowired - private IExamTaskPersonService examTaskPersonService; - - /** - * 查询考试人员列表 - */ - @PreAuthorize("@ss.hasPermi('exam:taskperson:list')") - @GetMapping("/list") - public TableDataInfo list(ExamTaskPerson examTaskPerson) - { - startPage(); - List list = examTaskPersonService.selectExamTaskPersonList(examTaskPerson); - return getDataTable(list); - } - - /** - * 导出考试人员列表 - */ - @PreAuthorize("@ss.hasPermi('exam:taskperson:export')") - @Log(title = "考试人员", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamTaskPerson examTaskPerson) - { - List list = examTaskPersonService.selectExamTaskPersonList(examTaskPerson); - ExcelUtil util = new ExcelUtil(ExamTaskPerson.class); - return util.exportExcel(list, "考试人员数据"); - } - - /** - * 获取考试人员详细信息 - */ - @PreAuthorize("@ss.hasPermi('exam:taskperson:query')") - @GetMapping(value = "/{examCode}") - public AjaxResult getInfo(@PathVariable("examCode") String examCode) - { - return AjaxResult.success(examTaskPersonService.selectExamTaskPersonById(examCode)); - } - - /** - * 新增考试人员 - */ - @PreAuthorize("@ss.hasPermi('exam:taskperson:add')") - @Log(title = "考试人员", businessType = BusinessType.INSERT) - @PostMapping("/add") - public AjaxResult add(@RequestBody ExamTaskPerson examTaskPerson) - { - return toAjax(examTaskPersonService.insertExamTaskPerson(examTaskPerson)); - } - - /** - * 修改考试人员 - */ - @PreAuthorize("@ss.hasPermi('exam:taskperson:edit')") - @Log(title = "考试人员", businessType = BusinessType.UPDATE) - @PostMapping("/update") - public AjaxResult edit(@RequestBody ExamTaskPerson examTaskPerson) - { - return toAjax(examTaskPersonService.updateExamTaskPerson(examTaskPerson)); - } - - /** - * 更新考试开始时间 - */ - @PostMapping("/starttime") - public AjaxResult updateStartTime(@RequestBody ExamTaskPerson examTaskPerson) - { - return toAjax(examTaskPersonService.updateStartTime(examTaskPerson)); - } - /** - * 删除考试人员 - */ - @PreAuthorize("@ss.hasPermi('exam:taskperson:remove')") - @Log(title = "考试人员", businessType = BusinessType.DELETE) - @GetMapping("/delete/{examCodes}") - public AjaxResult remove(@PathVariable String[] examCodes) - { - return toAjax(examTaskPersonService.deleteExamTaskPersonByIds(examCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskPictureController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskPictureController.java deleted file mode 100644 index 1b91087..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskPictureController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.hig.exam.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.exam.domain.ExamTaskPicture; -import com.hig.exam.service.IExamTaskPictureService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 考试任务图片管理Controller - * - * @author qnsdt - * @date 2023-01-18 - */ -@RestController -@RequestMapping("/exam/exampicture") -public class ExamTaskPictureController extends BaseController -{ - @Autowired - private IExamTaskPictureService examTaskPictureService; - - /** - * 查询考试任务图片管理列表 - */ - @PreAuthorize("@ss.hasPermi('exam:exampicture:list')") - @GetMapping("/list") - public TableDataInfo list(ExamTaskPicture examTaskPicture) - { - startPage(); - List list = examTaskPictureService.selectExamTaskPictureList(examTaskPicture); - return getDataTable(list); - } - - /** - * 导出考试任务图片管理列表 - */ - @PreAuthorize("@ss.hasPermi('exam:exampicture:export')") - @Log(title = "考试任务图片管理", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamTaskPicture examTaskPicture) - { - List list = examTaskPictureService.selectExamTaskPictureList(examTaskPicture); - ExcelUtil util = new ExcelUtil(ExamTaskPicture.class); - return util.exportExcel(list, "考试任务图片管理数据"); - } - - /** - * 获取考试任务图片管理详细信息 - */ - @PreAuthorize("@ss.hasPermi('exam:exampicture:query')") - @GetMapping(value = "/{photoCode}") - public AjaxResult getInfo(@PathVariable("photoCode") String photoCode) - { - return AjaxResult.success(examTaskPictureService.selectExamTaskPictureById(photoCode)); - } - - /** - * 新增考试任务图片管理 - */ - @PreAuthorize("@ss.hasPermi('exam:exampicture:add')") - @Log(title = "考试任务图片管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ExamTaskPicture examTaskPicture) - { - return toAjax(examTaskPictureService.insertExamTaskPicture(examTaskPicture)); - } - - /** - * 修改考试任务图片管理 - */ - @PreAuthorize("@ss.hasPermi('exam:exampicture:edit')") - @Log(title = "考试任务图片管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ExamTaskPicture examTaskPicture) - { - return toAjax(examTaskPictureService.updateExamTaskPicture(examTaskPicture)); - } - - /** - * 删除考试任务图片管理 - */ - @PreAuthorize("@ss.hasPermi('exam:exampicture:remove')") - @Log(title = "考试任务图片管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{photoCodes}") - public AjaxResult remove(@PathVariable String[] photoCodes) - { - return toAjax(examTaskPictureService.deleteExamTaskPictureByIds(photoCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskQuestionsController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskQuestionsController.java deleted file mode 100644 index 066de37..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/controller/ExamTaskQuestionsController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hig.exam.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.exam.domain.ExamTaskQuestions; -import com.hig.exam.service.IExamTaskQuestionsService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 任务题目Controller - * - * @author qnsdt - * @date 2023-02-10 - */ -@RestController -@RequestMapping("/exam/taskquestions") -public class ExamTaskQuestionsController extends BaseController -{ - @Autowired - private IExamTaskQuestionsService examTaskQuestionsService; - - /** - * 查询任务题目列表 - */ - @GetMapping("/list") - public TableDataInfo list(ExamTaskQuestions examTaskQuestions) - { - startPage(); - List list = examTaskQuestionsService.selectExamTaskQuestionsList(examTaskQuestions); - return getDataTable(list); - } - - /** - * 导出任务题目列表 - */ - @GetMapping("/export") - public AjaxResult export(ExamTaskQuestions examTaskQuestions) - { - List list = examTaskQuestionsService.selectExamTaskQuestionsList(examTaskQuestions); - ExcelUtil util = new ExcelUtil(ExamTaskQuestions.class); - return util.exportExcel(list, "任务题目数据"); - } - - /** - * 获取任务题目详细信息 - */ - @GetMapping(value = "/{examCode}") - public AjaxResult getInfo(@PathVariable("examCode") String examCode) - { - return AjaxResult.success(examTaskQuestionsService.selectExamTaskQuestionsById(examCode)); - } - - - @PostMapping("/batchupdate") - public AjaxResult batchUpdate(@RequestBody List examTaskQuestionsList) - { - int count = -1; - - try - { - count = examTaskQuestionsService.batchUpdateExamTaskQuestions(examTaskQuestionsList); - } - catch(Exception e) { - return AjaxResult.error(e.getMessage()); - } - return AjaxResult.success("更新成功"); - } - - /** - * 修改任务题目 - */ - @PostMapping("/update") - public AjaxResult edit(@RequestBody ExamTaskQuestions examTaskQuestions) - { - return toAjax(examTaskQuestionsService.updateExamTaskQuestions(examTaskQuestions)); - } - - /** - * 删除任务题目 - */ - @GetMapping("/delete/{examCodes}") - public AjaxResult remove(@PathVariable String[] examCodes) - { - return toAjax(examTaskQuestionsService.deleteExamTaskQuestionsByIds(examCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskData.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskData.java deleted file mode 100644 index 1fd07fc..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskData.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hig.exam.domain; - -import java.util.List; - -import lombok.Data; - -@Data -public class ExamTaskData { - private ExamTaskManager examTaskManager; - private List taskGroupList; - private List taskQuestionsList; - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskGroup.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskGroup.java deleted file mode 100644 index 5b41d58..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskGroup.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hig.exam.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 任务分组对象 exam_task_group - * - * @author qnsdt - * @date 2023-02-10 - */ -public class ExamTaskGroup extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 考试代码 */ - @Excel(name = "考试代码") - private String examCode; - - /** 分组代码 */ - @Excel(name = "分组代码") - private String groupCode; - - /** 排序编号 */ - @Excel(name = "排序编号") - private Long orderId; - - public void setExamCode(String examCode) - { - this.examCode = examCode; - } - - public String getExamCode() - { - return examCode; - } - public void setGroupCode(String groupCode) - { - this.groupCode = groupCode; - } - - public String getGroupCode() - { - return groupCode; - } - public void setOrderId(Long orderId) - { - this.orderId = orderId; - } - - public Long getOrderId() - { - return orderId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("examCode", getExamCode()) - .append("groupCode", getGroupCode()) - .append("orderId", getOrderId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskManager.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskManager.java deleted file mode 100644 index 4749a89..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskManager.java +++ /dev/null @@ -1,270 +0,0 @@ -package com.hig.exam.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 创建考试对象 exam_task_manager - * - * @author qnsdt - * @date 2023-01-06 - */ -public class ExamTaskManager extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 考试序号 */ - @Excel(name = "考试序号") - private Long examId; - - /** 考试代码 */ - @Excel(name = "考试代码") - private String examCode; - - /** 考试名称 */ - @Excel(name = "考试名称") - private String examName; - - /** 考试说明 */ - @Excel(name = "考试说明") - private String examDescribe; - - /** 组卷方式 */ - @Excel(name = "组卷方式") - private String buildType; - - /** 强制抽卷 */ - @Excel(name = "强制抽卷") - private String forceDone; - - /** 考试题库 */ - @Excel(name = "考试题库") - private String examBank; - - /** 考试题库文字 */ - @Excel(name = "考试题库文字") - private String examBankText; - - @Excel(name = "考试类型1 固定时间考试 2固定时间段考试") - private Integer examType; - - public Integer getExamType() { - return examType; - } - - public void setExamType(Integer examType) { - this.examType = examType; - } - - public Integer getExamTimes() { - return examTimes; - } - - public void setExamTimes(Integer examTimes) { - this.examTimes = examTimes; - } - - @Excel(name = "考试次数") - private Integer examTimes; - - /** 图片链接 */ - @Excel(name = "图片链接") - private String pictureUrl; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - - /** 考试时长 */ - @Excel(name = "考试时长") - private String examDuration; - - /** 状态 */ - @Excel(name = "状态") - private Long status; - - private String startDateText; - - public String getStartDateText() { - return startDateText; - } - - public void setStartDateText(String startDateText) { - this.startDateText = startDateText; - } - - - private String endDateText; - - public String getEndDateText() { - return endDateText; - } - - public void setEndDateText(String endDateText) { - this.endDateText = endDateText; - } - - /** 创建部门 */ - private Long createDept; - - public void setExamId(Long examId) - { - this.examId = examId; - } - - public Long getExamId() - { - return examId; - } - public void setExamCode(String examCode) - { - this.examCode = examCode; - } - - public String getExamCode() - { - return examCode; - } - public void setExamName(String examName) - { - this.examName = examName; - } - - public String getExamName() - { - return examName; - } - public void setExamDescribe(String examDescribe) - { - this.examDescribe = examDescribe; - } - - public String getExamDescribe() - { - return examDescribe; - } - public void setBuildType(String buildType) - { - this.buildType = buildType; - } - - public String getBuildType() - { - return buildType; - } - public void setForceDone(String forceDone) - { - this.forceDone = forceDone; - } - - public String getForceDone() - { - return forceDone; - } - public void setExamBank(String examBank) - { - this.examBank = examBank; - } - - public String getExamBank() - { - return examBank; - } - public void setPictureUrl(String pictureUrl) - { - this.pictureUrl = pictureUrl; - } - - public void setExamBankText(String examBankText) - { - this.examBankText = examBankText; - } - - public String getExamBankText() - { - return examBankText; - } - - public String getPictureUrl() - { - return pictureUrl; - } - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStartTime() - { - return startTime; - } - public void setEndTime(Date endTime) - { - this.endTime = endTime; - } - - public Date getEndTime() - { - return endTime; - } - public void setExamDuration(String examDuration) - { - this.examDuration = examDuration; - } - - public String getExamDuration() - { - return examDuration; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setCreateDept(Long createDept) - { - this.createDept = createDept; - } - - public Long getCreateDept() - { - return createDept; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("examId", getExamId()) - .append("examCode", getExamCode()) - .append("examName", getExamName()) - .append("examDescribe", getExamDescribe()) - .append("buildType", getBuildType()) - .append("forceDone", getForceDone()) - .append("examBank", getExamBank()) - .append("examBankText", getExamBankText()) - .append("pictureUrl", getPictureUrl()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("examDuration", getExamDuration()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createDept", getCreateDept()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskPerson.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskPerson.java deleted file mode 100644 index 732eacd..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskPerson.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.hig.exam.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 考试人员对象 exam_task_person - * - * @author qnsdt - * @date 2023-02-14 - */ -public class ExamTaskPerson extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 考试代码 */ - @Excel(name = "考试代码") - private String examCode; - - /** 考试人员 */ - @Excel(name = "考试人员") - private String userCode; - - /** 个人任务码 */ - private String taskCode; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; - - /** 状态 */ - @Excel(name = "状态") - private Long status; - - public void setExamCode(String examCode) - { - this.examCode = examCode; - } - - public String getExamCode() - { - return examCode; - } - public void setuserCode(String userCode) - { - this.userCode = userCode; - } - - public String getuserCode() - { - return userCode; - } - public void setTaskCode(String taskCode) - { - this.taskCode = taskCode; - } - - public String getTaskCode() - { - return taskCode; - } - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStartTime() - { - return startTime; - } - public void setEndTime(Date endTime) - { - this.endTime = endTime; - } - - public Date getEndTime() - { - return endTime; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("examCode", getExamCode()) - .append("userCode", getuserCode()) - .append("taskCode", getTaskCode()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("status", getStatus()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskPicture.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskPicture.java deleted file mode 100644 index ba00487..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskPicture.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.hig.exam.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 考试任务图片管理对象 exam_task_picture - * - * @author qnsdt - * @date 2023-01-18 - */ -public class ExamTaskPicture extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 图片序号 */ - private Long photoId; - - /** 图片代码 */ - private String photoCode; - - /** 文档代码 */ - @Excel(name = "文档代码") - private String photoPath; - - /** 图片链接 */ - @Excel(name = "图片链接") - private String photoUrl; - - /** 文件名称 */ - @Excel(name = "文件名称") - private String fileName; - - /** 原始名称 */ - @Excel(name = "原始名称") - private String originalName; - - private String createBy; - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - /** 状态 */ - @Excel(name = "状态") - private Long status; - - public void setPhotoId(Long photoId) - { - this.photoId = photoId; - } - - public Long getPhotoId() - { - return photoId; - } - public void setPhotoCode(String photoCode) - { - this.photoCode = photoCode; - } - - public String getPhotoCode() - { - return photoCode; - } - public void setPhotoPath(String photoPath) - { - this.photoPath = photoPath; - } - - public String getPhotoPath() - { - return photoPath; - } - public void setPhotoUrl(String photoUrl) - { - this.photoUrl = photoUrl; - } - - public String getPhotoUrl() - { - return photoUrl; - } - public void setFileName(String fileName) - { - this.fileName = fileName; - } - - public String getFileName() - { - return fileName; - } - public void setOriginalName(String originalName) - { - this.originalName = originalName; - } - - public String getOriginalName() - { - return originalName; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - - - - - public ExamTaskPicture(String photoCode, String photoPath, String photoUrl, String fileName, String originalName, - String createBy) { - super(); - this.photoCode = photoCode; - this.photoPath = photoPath; - this.photoUrl = photoUrl; - this.fileName = fileName; - this.originalName = originalName; - this.createBy = createBy; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("photoId", getPhotoId()) - .append("photoCode", getPhotoCode()) - .append("photoPath", getPhotoPath()) - .append("photoUrl", getPhotoUrl()) - .append("fileName", getFileName()) - .append("originalName", getOriginalName()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("status", getStatus()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskQuestions.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskQuestions.java deleted file mode 100644 index f98cd0d..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/domain/ExamTaskQuestions.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hig.exam.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 任务题目对象 exam_task_questions - * - * @author qnsdt - * @date 2023-02-15 - */ -public class ExamTaskQuestions extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 考试代码 */ - @Excel(name = "考试代码") - private String examCode; - - /** 题目代码 */ - @Excel(name = "题目代码") - private String questionsCode; - - /** 题号 */ - @Excel(name = "题号") - private int questionsNumber; - - public void setExamCode(String examCode) - { - this.examCode = examCode; - } - - public String getExamCode() - { - return examCode; - } - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setQuestionsNumber(int questionsNumber) - { - this.questionsNumber = questionsNumber; - } - - public int getQuestionsNumber() - { - return questionsNumber; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("examCode", getExamCode()) - .append("questionsCode", getQuestionsCode()) - .append("questionsNumber", getQuestionsNumber()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskGroupMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskGroupMapper.java deleted file mode 100644 index 58d00ae..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskGroupMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.exam.mapper; - -import java.util.List; -import com.hig.exam.domain.ExamTaskGroup; - -/** - * 任务分组Mapper接口 - * - * @author qnsdt - * @date 2023-02-10 - */ -public interface ExamTaskGroupMapper -{ - /** - * 查询任务分组 - * - * @param examCode 任务分组ID - * @return 任务分组 - */ - public ExamTaskGroup selectExamTaskGroupById(String examCode); - - /** - * 查询任务分组列表 - * - * @param examTaskGroup 任务分组 - * @return 任务分组集合 - */ - public List selectExamTaskGroupList(ExamTaskGroup examTaskGroup); - - /** - * 新增任务分组 - * - * @param examTaskGroup 任务分组 - * @return 结果 - */ - public int insertExamTaskGroup(ExamTaskGroup examTaskGroup); - - /** - * 修改任务分组 - * - * @param examTaskGroup 任务分组 - * @return 结果 - */ - public int updateExamTaskGroup(ExamTaskGroup examTaskGroup); - - /** - * 删除任务分组 - * - * @param examCode 任务分组ID - * @return 结果 - */ - public int deleteExamTaskGroupById(String examCode); - - /** - * 批量删除任务分组 - * - * @param examCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamTaskGroupByIds(String[] examCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskManagerMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskManagerMapper.java deleted file mode 100644 index 476fbaf..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskManagerMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.exam.mapper; - -import java.util.List; -import com.hig.exam.domain.ExamTaskManager; -import org.apache.ibatis.annotations.Param; - -/** - * 创建考试Mapper接口 - * - * @author qnsdt - * @date 2023-01-06 - */ -public interface ExamTaskManagerMapper -{ - /** - * 查询创建考试 - * - * @param examCode 创建考试ID - * @return 创建考试 - */ - public ExamTaskManager selectExamTaskManagerById(String examCode); - - - /** - * 查询创建考试列表 - * - * @param examTaskManager 创建考试 - * @return 创建考试集合 - */ - public List selectExamTaskManagerList(ExamTaskManager examTaskManager); - - /** - * 新增创建考试 - * - * @param examTaskManager 创建考试 - * @return 结果 - */ - public int insertExamTaskManager(ExamTaskManager examTaskManager); - - /** - * 修改创建考试 - * - * @param examTaskManager 创建考试 - * @return 结果 - */ - public int updateExamTaskManager(ExamTaskManager examTaskManager); - - /** - * 删除创建考试 - * - * @param examCode 创建考试ID - * @return 结果 - */ - public int deleteExamTaskManagerById(String examCode); - - /** - * 批量删除创建考试 - * - * @param examCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamTaskManagerByIds(String[] examCodes); - - public List selectCurrentExam(@Param("userCode") String userCode); - - public List countExamScore(@Param("examCodeList") List examCodeList); - - public List groupExamTypeCount(@Param("examCodeList") List examCodeList); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskPersonMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskPersonMapper.java deleted file mode 100644 index 1e15c9a..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskPersonMapper.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hig.exam.mapper; - -import java.util.List; -import com.hig.exam.domain.ExamTaskPerson; - -/** - * 考试人员Mapper接口 - * - * @author qnsdt - * @date 2023-01-06 - */ -public interface ExamTaskPersonMapper -{ - /** - * 查询考试人员 - * - * @param examCode 考试人员ID - * @return 考试人员 - */ - public ExamTaskPerson selectExamTaskPersonById(String examCode); - - /** - * 查询考试人员 - * - * @param examTaskPerson 考试人员 - * @return 考试人员 - */ - public ExamTaskPerson selectExamTaskPerson(ExamTaskPerson examTaskPerson); - - /** - * 查询考试人员列表 - * - * @param examTaskPerson 考试人员 - * @return 考试人员集合 - */ - public List selectExamTaskPersonList(ExamTaskPerson examTaskPerson); - - /** - * 新增考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int insertExamTaskPerson(ExamTaskPerson examTaskPerson); - - /** - * 批量拷贝考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int batchInsertPerson(String examCode); - - /** - * 修改考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int updateExamTaskPerson(ExamTaskPerson examTaskPerson); - - /** - * 更新考试开始时间 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int updateStartTime(ExamTaskPerson examTaskPerson); - - /** - * 更新完成状态 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int updateDoneStatus(ExamTaskPerson examTaskPerson); - - /** - * 删除考试人员 - * - * @param examCode 考试人员ID - * @return 结果 - */ - public int deleteExamTaskPersonById(String examCode); - - /** - * 批量删除考试人员 - * - * @param examCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamTaskPersonByIds(String[] examCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskPictureMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskPictureMapper.java deleted file mode 100644 index 1524578..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskPictureMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.exam.mapper; - -import java.util.List; -import com.hig.exam.domain.ExamTaskPicture; - -/** - * 考试任务图片管理Mapper接口 - * - * @author qnsdt - * @date 2023-01-18 - */ -public interface ExamTaskPictureMapper -{ - /** - * 查询考试任务图片管理 - * - * @param photoCode 考试任务图片管理ID - * @return 考试任务图片管理 - */ - public ExamTaskPicture selectExamTaskPictureById(String photoCode); - - /** - * 查询考试任务图片管理列表 - * - * @param examTaskPicture 考试任务图片管理 - * @return 考试任务图片管理集合 - */ - public List selectExamTaskPictureList(ExamTaskPicture examTaskPicture); - - /** - * 新增考试任务图片管理 - * - * @param examTaskPicture 考试任务图片管理 - * @return 结果 - */ - public int insertExamTaskPicture(ExamTaskPicture examTaskPicture); - - /** - * 修改考试任务图片管理 - * - * @param examTaskPicture 考试任务图片管理 - * @return 结果 - */ - public int updateExamTaskPicture(ExamTaskPicture examTaskPicture); - - /** - * 删除考试任务图片管理 - * - * @param photoCode 考试任务图片管理ID - * @return 结果 - */ - public int deleteExamTaskPictureById(String photoCode); - - /** - * 批量删除考试任务图片管理 - * - * @param photoCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamTaskPictureByIds(String[] photoCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskQuestionsMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskQuestionsMapper.java deleted file mode 100644 index e512df9..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/mapper/ExamTaskQuestionsMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.exam.mapper; - -import java.util.List; -import com.hig.exam.domain.ExamTaskQuestions; - -/** - * 任务题目Mapper接口 - * - * @author qnsdt - * @date 2023-02-10 - */ -public interface ExamTaskQuestionsMapper -{ - /** - * 查询任务题目 - * - * @param examCode 任务题目ID - * @return 任务题目 - */ - public ExamTaskQuestions selectExamTaskQuestionsById(String examCode); - - /** - * 查询任务题目列表 - * - * @param examTaskQuestions 任务题目 - * @return 任务题目集合 - */ - public List selectExamTaskQuestionsList(ExamTaskQuestions examTaskQuestions); - - /** - * 新增任务题目 - * - * @param examTaskQuestions 任务题目 - * @return 结果 - */ - public int insertExamTaskQuestions(ExamTaskQuestions examTaskQuestions); - - /** - * 修改任务题目 - * - * @param examTaskQuestions 任务题目 - * @return 结果 - */ - public int updateExamTaskQuestions(ExamTaskQuestions examTaskQuestions); - - /** - * 删除任务题目 - * - * @param examCode 任务题目ID - * @return 结果 - */ - public int deleteExamTaskQuestionsById(String examCode); - - /** - * 批量删除任务题目 - * - * @param examCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamTaskQuestionsByIds(String[] examCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskDataService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskDataService.java deleted file mode 100644 index b38c22e..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskDataService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hig.exam.service; - -import com.hig.exam.domain.ExamTaskData; - -public interface IExamTaskDataService { - public int saveData(ExamTaskData examTaskData) throws Exception; -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskGroupService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskGroupService.java deleted file mode 100644 index d2b4fc3..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskGroupService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hig.exam.service; - -import java.util.List; -import com.hig.exam.domain.ExamTaskGroup; - -/** - * 任务分组Service接口 - * - * @author qnsdt - * @date 2023-02-10 - */ -public interface IExamTaskGroupService -{ - /** - * 查询任务分组 - * - * @param examCode 任务分组ID - * @return 任务分组 - */ - public ExamTaskGroup selectExamTaskGroupById(String examCode); - - /** - * 查询任务分组列表 - * - * @param examTaskGroup 任务分组 - * @return 任务分组集合 - */ - public List selectExamTaskGroupList(ExamTaskGroup examTaskGroup); - - /** - * 新增任务分组 - * - * @param examTaskGroup 任务分组 - * @return 结果 - */ - public int insertExamTaskGroup(ExamTaskGroup examTaskGroup); - - /** - * 修改任务分组 - * - * @param examTaskGroup 任务分组 - * @return 结果 - */ - public int updateExamTaskGroup(ExamTaskGroup examTaskGroup); - - /** - * 修改任务分组 - * - * @param examTaskGroup 任务分组 - * @return 结果 - * @throws Exception - */ - public int batchUpdateExamTaskGroup(List examTaskGroupList) throws Exception; - - /** - * 批量删除任务分组 - * - * @param examCodes 需要删除的任务分组ID - * @return 结果 - */ - public int deleteExamTaskGroupByIds(String[] examCodes); - - /** - * 删除任务分组信息 - * - * @param examCode 任务分组ID - * @return 结果 - */ - public int deleteExamTaskGroupById(String examCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskManagerService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskManagerService.java deleted file mode 100644 index bda4e0f..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskManagerService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.exam.service; - -import java.util.List; -import com.hig.exam.domain.ExamTaskManager; -import com.hig.onlineexam.domain.dto.ExamTitleData; - -/** - * 创建考试Service接口 - * - * @author qnsdt - * @date 2023-01-06 - */ -public interface IExamTaskManagerService -{ - /** - * 查询创建考试 - * - * @param examCode 创建考试ID - * @return 创建考试 - */ - public ExamTaskManager selectExamTaskManagerById(String examCode); - - /** - * 查询创建考试列表 - * - * @param examTaskManager 创建考试 - * @return 创建考试集合 - */ - public List selectExamTaskManagerList(ExamTaskManager examTaskManager); - - /** - * 新增创建考试 - * - * @param examTaskManager 创建考试 - * @return 结果 - */ - public int insertExamTaskManager(ExamTaskManager examTaskManager); - - /** - * 修改创建考试 - * - * @param examTaskManager 创建考试 - * @return 结果 - */ - public int updateExamTaskManager(ExamTaskManager examTaskManager); - - /** - * 批量删除创建考试 - * - * @param examCodes 需要删除的创建考试ID - * @return 结果 - */ - public int deleteExamTaskManagerByIds(String[] examCodes); - - /** - * 删除创建考试信息 - * - * @param examCode 创建考试ID - * @return 结果 - */ - public int deleteExamTaskManagerById(String examCode); - - /** - * 获取当前用户可以参加的考试 - * @param userCode - * @return - */ - public List selectCurrentExam(String userCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskPersonService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskPersonService.java deleted file mode 100644 index 8ca9ce6..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskPersonService.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.hig.exam.service; - -import java.util.List; - -import com.hig.exam.domain.ExamTaskManager; -import com.hig.exam.domain.ExamTaskPerson; - -/** - * 考试人员Service接口 - * - * @author qnsdt - * @date 2023-01-06 - */ -public interface IExamTaskPersonService -{ - /** - * 查询考试人员 - * - * @param examCode 考试人员ID - * @return 考试人员 - */ - public ExamTaskPerson selectExamTaskPersonById(String examCode); - - /** - * 查询考试人员 - * - * @param examTaskPerson 考试人员 - * @return 考试人员 - */ - public ExamTaskPerson selectExamTaskPerson(ExamTaskPerson examTaskPerson); - - /** - * 查询考试人员列表 - * - * @param examTaskPerson 考试人员 - * @return 考试人员集合 - */ - public List selectExamTaskPersonList(ExamTaskPerson examTaskPerson); - - /** - * 新增考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int insertExamTaskPerson(ExamTaskPerson examTaskPerson); - - /** - * 批量拷贝考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int batchInsertPerson(String examCode); - - /** - * 修改考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int updateExamTaskPerson(ExamTaskPerson examTaskPerson); - - - /** - * 更新考试开始时间 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int updateStartTime(ExamTaskPerson examTaskPerson); - - /** - * 更新完成状态 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - public int updateDoneStatus(ExamTaskPerson examTaskPerson); - - - /** - * 批量删除考试人员 - * - * @param examCodes 需要删除的考试人员ID - * @return 结果 - */ - public int deleteExamTaskPersonByIds(String[] examCodes); - - /** - * 删除考试人员信息 - * - * @param examCode 考试人员ID - * @return 结果 - */ - public int deleteExamTaskPersonById(String examCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskPictureService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskPictureService.java deleted file mode 100644 index 7b34bbf..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskPictureService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.exam.service; - -import java.util.List; -import com.hig.exam.domain.ExamTaskPicture; - -/** - * 考试任务图片管理Service接口 - * - * @author qnsdt - * @date 2023-01-18 - */ -public interface IExamTaskPictureService -{ - /** - * 查询考试任务图片管理 - * - * @param photoCode 考试任务图片管理ID - * @return 考试任务图片管理 - */ - public ExamTaskPicture selectExamTaskPictureById(String photoCode); - - /** - * 查询考试任务图片管理列表 - * - * @param examTaskPicture 考试任务图片管理 - * @return 考试任务图片管理集合 - */ - public List selectExamTaskPictureList(ExamTaskPicture examTaskPicture); - - /** - * 新增考试任务图片管理 - * - * @param examTaskPicture 考试任务图片管理 - * @return 结果 - */ - public int insertExamTaskPicture(ExamTaskPicture examTaskPicture); - - /** - * 修改考试任务图片管理 - * - * @param examTaskPicture 考试任务图片管理 - * @return 结果 - */ - public int updateExamTaskPicture(ExamTaskPicture examTaskPicture); - - /** - * 批量删除考试任务图片管理 - * - * @param photoCodes 需要删除的考试任务图片管理ID - * @return 结果 - */ - public int deleteExamTaskPictureByIds(String[] photoCodes); - - /** - * 删除考试任务图片管理信息 - * - * @param photoCode 考试任务图片管理ID - * @return 结果 - */ - public int deleteExamTaskPictureById(String photoCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskQuestionsService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskQuestionsService.java deleted file mode 100644 index 9a78fcc..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/IExamTaskQuestionsService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hig.exam.service; - -import java.util.List; -import com.hig.exam.domain.ExamTaskQuestions; - -/** - * 任务题目Service接口 - * - * @author qnsdt - * @date 2023-02-10 - */ -public interface IExamTaskQuestionsService -{ - /** - * 查询任务题目 - * - * @param examCode 任务题目ID - * @return 任务题目 - */ - public ExamTaskQuestions selectExamTaskQuestionsById(String examCode); - - /** - * 查询任务题目列表 - * - * @param examTaskQuestions 任务题目 - * @return 任务题目集合 - */ - public List selectExamTaskQuestionsList(ExamTaskQuestions examTaskQuestions); - - /** - * 新增任务题目 - * - * @param examTaskQuestions 任务题目 - * @return 结果 - */ - public int insertExamTaskQuestions(ExamTaskQuestions examTaskQuestions); - - public int batchUpdateExamTaskQuestions(List examTaskQuestionsList) throws Exception; - - /** - * 修改任务题目 - * - * @param examTaskQuestions 任务题目 - * @return 结果 - */ - public int updateExamTaskQuestions(ExamTaskQuestions examTaskQuestions); - - /** - * 批量删除任务题目 - * - * @param examCodes 需要删除的任务题目ID - * @return 结果 - */ - public int deleteExamTaskQuestionsByIds(String[] examCodes); - - /** - * 删除任务题目信息 - * - * @param examCode 任务题目ID - * @return 结果 - */ - public int deleteExamTaskQuestionsById(String examCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskDataServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskDataServiceImpl.java deleted file mode 100644 index 125c9ff..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskDataServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.hig.exam.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.hig.exam.domain.ExamTaskData; -import com.hig.exam.domain.ExamTaskGroup; -import com.hig.exam.domain.ExamTaskManager; -import com.hig.exam.domain.ExamTaskQuestions; -import com.hig.exam.service.IExamTaskDataService; -import com.hig.exam.service.IExamTaskGroupService; -import com.hig.exam.service.IExamTaskManagerService; -import com.hig.exam.service.IExamTaskPersonService; -import com.hig.exam.service.IExamTaskQuestionsService; - -@Service -public class ExamTaskDataServiceImpl implements IExamTaskDataService { - @Autowired - private IExamTaskGroupService examTaskGroupService; - - @Autowired - private IExamTaskManagerService examTaskManagerService; - - @Autowired - private IExamTaskQuestionsService examTaskQuestionsService; - - @Autowired - private IExamTaskPersonService examTaskPersonService; - - - @Override - public int saveData(ExamTaskData examTaskData) throws Exception { - // TODO Auto-generated method stub - ExamTaskManager examTaskManager = examTaskData.getExamTaskManager(); - - int count = 0; - try - { - // 安全删除 - examTaskManagerService.deleteExamTaskManagerById(examTaskManager.getExamCode()); - - // 保存数据 - count = examTaskManagerService.insertExamTaskManager(examTaskManager); - } - catch(Exception e) { - throw new Exception("保存属性出错,信息:" + e.getMessage()); - } - - List questionsList = examTaskData.getTaskQuestionsList(); - - // 安全删除 - examTaskQuestionsService.deleteExamTaskQuestionsById(examTaskManager.getExamCode()); - - for(ExamTaskQuestions examTaskQuestions: questionsList) { - try - { - count = examTaskQuestionsService.insertExamTaskQuestions(examTaskQuestions); - } - catch(Exception e) { - throw new Exception("保存题目信息出错,信息:" + e.getMessage()); - } - } - - List groupList = examTaskData.getTaskGroupList(); - - // 安全删除 - examTaskGroupService.deleteExamTaskGroupById(examTaskManager.getExamCode()); - - for (ExamTaskGroup examTaskGroup: groupList) { - try - { - count = examTaskGroupService.insertExamTaskGroup(examTaskGroup); - } - catch(Exception e) { - throw new Exception("保存分组信息出错,信息:" + e.getMessage()); - } - } - - // 安全删除 - examTaskPersonService.deleteExamTaskPersonById(examTaskManager.getExamCode()); - - try - { - count = examTaskPersonService.batchInsertPerson(examTaskManager.getExamCode()); - } - catch(Exception e) { - throw new Exception("保存考试人员信息出错,信息:" + e.getMessage()); - } - - return 1; - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskGroupServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskGroupServiceImpl.java deleted file mode 100644 index 1b2c470..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskGroupServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.hig.exam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.exam.mapper.ExamTaskGroupMapper; -import com.hig.exam.domain.ExamTaskGroup; -import com.hig.exam.service.IExamTaskGroupService; -import com.hig.exam.service.IExamTaskPersonService; - -/** - * 任务分组Service业务层处理 - * - * @author qnsdt - * @date 2023-02-10 - */ -@Service -public class ExamTaskGroupServiceImpl implements IExamTaskGroupService -{ - @Autowired - private ExamTaskGroupMapper examTaskGroupMapper; - - @Autowired - private IExamTaskPersonService examTaskPersonService; - /** - * 查询任务分组 - * - * @param examCode 任务分组ID - * @return 任务分组 - */ - @Override - public ExamTaskGroup selectExamTaskGroupById(String examCode) - { - return examTaskGroupMapper.selectExamTaskGroupById(examCode); - } - - /** - * 查询任务分组列表 - * - * @param examTaskGroup 任务分组 - * @return 任务分组 - */ - @Override - public List selectExamTaskGroupList(ExamTaskGroup examTaskGroup) - { - return examTaskGroupMapper.selectExamTaskGroupList(examTaskGroup); - } - - /** - * 新增任务分组 - * - * @param examTaskGroup 任务分组 - * @return 结果 - */ - @Override - public int insertExamTaskGroup(ExamTaskGroup examTaskGroup) - { - return examTaskGroupMapper.insertExamTaskGroup(examTaskGroup); - } - - /** - * 修改任务分组 - * - * @param examTaskGroup 任务分组 - * @return 结果 - */ - @Override - public int updateExamTaskGroup(ExamTaskGroup examTaskGroup) - { - return examTaskGroupMapper.updateExamTaskGroup(examTaskGroup); - } - - /** - * 批量删除任务分组 - * - * @param examCodes 需要删除的任务分组ID - * @return 结果 - */ - @Override - public int deleteExamTaskGroupByIds(String[] examCodes) - { - return examTaskGroupMapper.deleteExamTaskGroupByIds(examCodes); - } - - /** - * 删除任务分组信息 - * - * @param examCode 任务分组ID - * @return 结果 - */ - @Override - public int deleteExamTaskGroupById(String examCode) - { - return examTaskGroupMapper.deleteExamTaskGroupById(examCode); - } - - @Override - public int batchUpdateExamTaskGroup(List examTaskGroupList) throws Exception { - // TODO Auto-generated method stub - // 安全删除 - int count = 0; - String examCode = examTaskGroupList.get(0).getExamCode(); - examTaskGroupMapper.deleteExamTaskGroupById(examCode); - - for (ExamTaskGroup examTaskGroup: examTaskGroupList) { - try - { - count = examTaskGroupMapper.insertExamTaskGroup(examTaskGroup); - } - catch(Exception e) { - throw new Exception("保存分组信息出错,信息:" + e.getMessage()); - } - } - - // 安全删除 - examTaskPersonService.deleteExamTaskPersonById(examCode); - - try - { - count = examTaskPersonService.batchInsertPerson(examCode); - } - catch(Exception e) { - throw new Exception("保存考试人员信息出错,信息:" + e.getMessage()); - } - return 1; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskManagerServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskManagerServiceImpl.java deleted file mode 100644 index 4421563..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskManagerServiceImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.hig.exam.service.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.bean.BeanUtil; -import com.hig.onlineexam.domain.dto.ExamTitleData; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.exam.mapper.ExamTaskManagerMapper; -import com.hig.exam.domain.ExamTaskManager; -import com.hig.exam.service.IExamTaskGroupService; -import com.hig.exam.service.IExamTaskManagerService; -import com.hig.exam.service.IExamTaskPersonService; -import com.hig.exam.service.IExamTaskQuestionsService; - -/** - * 创建考试Service业务层处理 - * - * @author qnsdt - * @date 2023-01-06 - */ -@Service -public class ExamTaskManagerServiceImpl implements IExamTaskManagerService -{ - @Autowired - private ExamTaskManagerMapper examTaskManagerMapper; - - @Autowired - private IExamTaskGroupService examTaskGroupService; - - @Autowired - private IExamTaskQuestionsService examTaskQuestionsService; - - @Autowired - private IExamTaskPersonService examTaskPersonService; - - /** - * 查询创建考试 - * - * @param examCode 创建考试ID - * @return 创建考试 - */ - @Override - public ExamTaskManager selectExamTaskManagerById(String examCode) - { - return examTaskManagerMapper.selectExamTaskManagerById(examCode); - } - - /** - * 查询创建考试列表 - * - * @param examTaskManager 创建考试 - * @return 创建考试 - */ - @Override - public List selectExamTaskManagerList(ExamTaskManager examTaskManager) - { - return examTaskManagerMapper.selectExamTaskManagerList(examTaskManager); - } - - /** - * 新增创建考试 - * - * @param examTaskManager 创建考试 - * @return 结果 - */ - @Override - public int insertExamTaskManager(ExamTaskManager examTaskManager) - { - examTaskManager.setCreateTime(DateUtils.getNowDate()); - return examTaskManagerMapper.insertExamTaskManager(examTaskManager); - } - - /** - * 修改创建考试 - * - * @param examTaskManager 创建考试 - * @return 结果 - */ - @Override - public int updateExamTaskManager(ExamTaskManager examTaskManager) - { - return examTaskManagerMapper.updateExamTaskManager(examTaskManager); - } - - /** - * 批量删除创建考试 - * - * @param examCodes 需要删除的创建考试ID - * @return 结果 - */ - @Override - public int deleteExamTaskManagerByIds(String[] examCodes) - { - // 删除题目 - examTaskQuestionsService.deleteExamTaskQuestionsByIds(examCodes); - // 删除人员分组 - examTaskGroupService.deleteExamTaskGroupByIds(examCodes); - // 删除人员 - examTaskPersonService.deleteExamTaskPersonByIds(examCodes); - - return examTaskManagerMapper.deleteExamTaskManagerByIds(examCodes); - } - - /** - * 删除创建考试信息 - * - * @param examCode 创建考试ID - * @return 结果 - */ - @Override - public int deleteExamTaskManagerById(String examCode) - { - return examTaskManagerMapper.deleteExamTaskManagerById(examCode); - } - - /** - * 获取当前用户可以参加的考试 - * @param userCode - * @return - */ - @Override - public List selectCurrentExam(String userCode) { - //先根据当前时间和startDate和endDate过滤一下 - List list=examTaskManagerMapper.selectCurrentExam(userCode); - List retList=new ArrayList<>(); - List examCodeList=new ArrayList<>(); - for(ExamTaskManager examTaskManager:list){ - if(examTaskManager.getExamType()==1){ - if(!checkCanRun(examTaskManager)){ - continue; - } - }else{ - - } - ExamTitleData ed=new ExamTitleData(); - examCodeList.add(examTaskManager.getExamCode()); - // 使用 Hutool 的 BeanUtil.copyProperties 方法复制属性 - BeanUtil.copyProperties(examTaskManager, ed); - retList.add(ed); - } - List listScore=examTaskManagerMapper.countExamScore(examCodeList); - List listTypeCount=examTaskManagerMapper.groupExamTypeCount(examCodeList); - for(ExamTitleData item :retList){ - List tmp= listScore.stream().filter(d->d.getExamCode().equals(item.getExamCode())).collect(Collectors.toList()); - if(tmp.size()>0){ - item.setQuestionsScore(tmp.get(0).getExamType()); - } - tmp=listTypeCount.stream().filter(d->d.getExamCode().equals(item.getExamCode()) && d.getExamId()==1).collect(Collectors.toList()); - if(tmp.size()>0){ - item.setJudgeNumber(tmp.get(0).getExamType()); - } - tmp=listTypeCount.stream().filter(d->d.getExamCode().equals(item.getExamCode()) && d.getExamId()==2).collect(Collectors.toList()); - if(tmp.size()>0){ - item.setRadioNumber(tmp.get(0).getExamType()); - } - tmp=listTypeCount.stream().filter(d->d.getExamCode().equals(item.getExamCode()) && d.getExamId()==3).collect(Collectors.toList()); - if(tmp.size()>0){ - item.setChoiceNumber(tmp.get(0).getExamType()); - } - } - return retList; - } - - private boolean checkCanRun(ExamTaskManager examTaskManager) { - //开始时间+考试时长 小于当前时间表示考试已发结束,大于表示还可能继续考试 - DateTime dtStart=new DateTime( examTaskManager.getStartTime()); - String sp=examTaskManager.getExamDuration(); - String[] timeParts = sp.split(":"); - int hours = Integer.parseInt(timeParts[0]); - int minutes = Integer.parseInt(timeParts[1]); - // 计算结束时间 - DateTime endDateTime = dtStart.offset(DateField.HOUR_OF_DAY, hours) - .offset(DateField.MINUTE, minutes); - return endDateTime.isAfter(DateUtils.getNowDate()); - - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskPersonServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskPersonServiceImpl.java deleted file mode 100644 index 9e20984..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskPersonServiceImpl.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.hig.exam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.exam.mapper.ExamTaskPersonMapper; -import com.hig.exam.domain.ExamTaskManager; -import com.hig.exam.domain.ExamTaskPerson; -import com.hig.exam.service.IExamTaskPersonService; - -/** - * 考试人员Service业务层处理 - * - * @author qnsdt - * @date 2023-01-06 - */ -@Service -public class ExamTaskPersonServiceImpl implements IExamTaskPersonService -{ - @Autowired - private ExamTaskPersonMapper examTaskPersonMapper; - - /** - * 查询考试人员 - * - * @param examCode 考试人员ID - * @return 考试人员 - */ - @Override - public ExamTaskPerson selectExamTaskPersonById(String examCode) - { - return examTaskPersonMapper.selectExamTaskPersonById(examCode); - } - - /** - * 查询考试人员列表 - * - * @param examTaskPerson 考试人员 - * @return 考试人员 - */ - @Override - public List selectExamTaskPersonList(ExamTaskPerson examTaskPerson) - { - return examTaskPersonMapper.selectExamTaskPersonList(examTaskPerson); - } - - /** - * 新增考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - @Override - public int insertExamTaskPerson(ExamTaskPerson examTaskPerson) - { - return examTaskPersonMapper.insertExamTaskPerson(examTaskPerson); - } - - /** - * 修改考试人员 - * - * @param examTaskPerson 考试人员 - * @return 结果 - */ - @Override - public int updateExamTaskPerson(ExamTaskPerson examTaskPerson) - { - return examTaskPersonMapper.updateExamTaskPerson(examTaskPerson); - } - - /** - * 批量删除考试人员 - * - * @param examCodes 需要删除的考试人员ID - * @return 结果 - */ - @Override - public int deleteExamTaskPersonByIds(String[] examCodes) - { - return examTaskPersonMapper.deleteExamTaskPersonByIds(examCodes); - } - - /** - * 删除考试人员信息 - * - * @param examCode 考试人员ID - * @return 结果 - */ - @Override - public int deleteExamTaskPersonById(String examCode) - { - return examTaskPersonMapper.deleteExamTaskPersonById(examCode); - } - - @Override - public int batchInsertPerson(String examCode) { - // TODO Auto-generated method stub - return examTaskPersonMapper.batchInsertPerson(examCode); - } - - @Override - public int updateStartTime(ExamTaskPerson examTaskPerson) { - // TODO Auto-generated method stub - ExamTaskPerson taskPerson = examTaskPersonMapper.selectExamTaskPerson(examTaskPerson); - - if (taskPerson != null && taskPerson.getStartTime() == null) { - examTaskPersonMapper.updateStartTime(examTaskPerson); - } - return 1; - } - - @Override - public ExamTaskPerson selectExamTaskPerson(ExamTaskPerson examTaskPerson) { - // TODO Auto-generated method stub - return examTaskPersonMapper.selectExamTaskPerson(examTaskPerson); - } - - @Override - public int updateDoneStatus(ExamTaskPerson examTaskPerson) { - // TODO Auto-generated method stub - return examTaskPersonMapper.updateDoneStatus(examTaskPerson); - } - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskPictureServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskPictureServiceImpl.java deleted file mode 100644 index dd08981..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskPictureServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.hig.exam.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.exam.mapper.ExamTaskPictureMapper; -import com.hig.exam.domain.ExamTaskPicture; -import com.hig.exam.service.IExamTaskPictureService; - -/** - * 考试任务图片管理Service业务层处理 - * - * @author qnsdt - * @date 2023-01-18 - */ -@Service -public class ExamTaskPictureServiceImpl implements IExamTaskPictureService -{ - @Autowired - private ExamTaskPictureMapper examTaskPictureMapper; - - /** - * 查询考试任务图片管理 - * - * @param photoCode 考试任务图片管理ID - * @return 考试任务图片管理 - */ - @Override - public ExamTaskPicture selectExamTaskPictureById(String photoCode) - { - return examTaskPictureMapper.selectExamTaskPictureById(photoCode); - } - - /** - * 查询考试任务图片管理列表 - * - * @param examTaskPicture 考试任务图片管理 - * @return 考试任务图片管理 - */ - @Override - public List selectExamTaskPictureList(ExamTaskPicture examTaskPicture) - { - return examTaskPictureMapper.selectExamTaskPictureList(examTaskPicture); - } - - /** - * 新增考试任务图片管理 - * - * @param examTaskPicture 考试任务图片管理 - * @return 结果 - */ - @Override - public int insertExamTaskPicture(ExamTaskPicture examTaskPicture) - { - examTaskPicture.setCreateTime(DateUtils.getNowDate()); - return examTaskPictureMapper.insertExamTaskPicture(examTaskPicture); - } - - /** - * 修改考试任务图片管理 - * - * @param examTaskPicture 考试任务图片管理 - * @return 结果 - */ - @Override - public int updateExamTaskPicture(ExamTaskPicture examTaskPicture) - { - return examTaskPictureMapper.updateExamTaskPicture(examTaskPicture); - } - - /** - * 批量删除考试任务图片管理 - * - * @param photoCodes 需要删除的考试任务图片管理ID - * @return 结果 - */ - @Override - public int deleteExamTaskPictureByIds(String[] photoCodes) - { - return examTaskPictureMapper.deleteExamTaskPictureByIds(photoCodes); - } - - /** - * 删除考试任务图片管理信息 - * - * @param photoCode 考试任务图片管理ID - * @return 结果 - */ - @Override - public int deleteExamTaskPictureById(String photoCode) - { - return examTaskPictureMapper.deleteExamTaskPictureById(photoCode); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskQuestionsServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskQuestionsServiceImpl.java deleted file mode 100644 index e60ee30..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/exam/service/impl/ExamTaskQuestionsServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hig.exam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.exam.mapper.ExamTaskQuestionsMapper; -import com.hig.exam.domain.ExamTaskQuestions; -import com.hig.exam.service.IExamTaskQuestionsService; - -/** - * 任务题目Service业务层处理 - * - * @author qnsdt - * @date 2023-02-10 - */ -@Service -public class ExamTaskQuestionsServiceImpl implements IExamTaskQuestionsService -{ - @Autowired - private ExamTaskQuestionsMapper examTaskQuestionsMapper; - - /** - * 查询任务题目 - * - * @param examCode 任务题目ID - * @return 任务题目 - */ - @Override - public ExamTaskQuestions selectExamTaskQuestionsById(String examCode) - { - return examTaskQuestionsMapper.selectExamTaskQuestionsById(examCode); - } - - /** - * 查询任务题目列表 - * - * @param examTaskQuestions 任务题目 - * @return 任务题目 - */ - @Override - public List selectExamTaskQuestionsList(ExamTaskQuestions examTaskQuestions) - { - return examTaskQuestionsMapper.selectExamTaskQuestionsList(examTaskQuestions); - } - - /** - * 新增任务题目 - * - * @param examTaskQuestions 任务题目 - * @return 结果 - */ - @Override - public int insertExamTaskQuestions(ExamTaskQuestions examTaskQuestions) - { - return examTaskQuestionsMapper.insertExamTaskQuestions(examTaskQuestions); - } - - /** - * 修改任务题目 - * - * @param examTaskQuestions 任务题目 - * @return 结果 - */ - @Override - public int updateExamTaskQuestions(ExamTaskQuestions examTaskQuestions) - { - return examTaskQuestionsMapper.updateExamTaskQuestions(examTaskQuestions); - } - - /** - * 批量删除任务题目 - * - * @param examCodes 需要删除的任务题目ID - * @return 结果 - */ - @Override - public int deleteExamTaskQuestionsByIds(String[] examCodes) - { - return examTaskQuestionsMapper.deleteExamTaskQuestionsByIds(examCodes); - } - - /** - * 删除任务题目信息 - * - * @param examCode 任务题目ID - * @return 结果 - */ - @Override - public int deleteExamTaskQuestionsById(String examCode) - { - return examTaskQuestionsMapper.deleteExamTaskQuestionsById(examCode); - } - - @Override - public int batchUpdateExamTaskQuestions(List examTaskQuestionsList) throws Exception { - // TODO Auto-generated method stub - // 安全删除 - - examTaskQuestionsMapper.deleteExamTaskQuestionsById(examTaskQuestionsList.get(0).getExamCode()); - - for(ExamTaskQuestions examTaskQuestions: examTaskQuestionsList) { - try - { - examTaskQuestionsMapper.insertExamTaskQuestions(examTaskQuestions); - } - catch(Exception e) { - throw new Exception("保存题目信息出错,信息:" + e.getMessage()); - } - - } - return 1; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/common/NotSameFileExpection.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/common/NotSameFileExpection.java deleted file mode 100644 index deae362..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/common/NotSameFileExpection.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hig.fms.common; - -public class NotSameFileExpection extends Exception { - public NotSameFileExpection() { - super("File MD5 Different"); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/controller/FmsFilesController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/controller/FmsFilesController.java deleted file mode 100644 index 4336c86..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/controller/FmsFilesController.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.hig.fms.controller; - -import java.io.File; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.cms.utils.FileUpload; -import com.hig.fms.common.NotSameFileExpection; -import com.hig.fms.domain.FmsFiles; -import com.hig.fms.domain.MultipartFileParam; -import com.hig.fms.domain.dto.StdOut; -import com.hig.fms.service.ChunkService; -import com.hig.fms.service.IFmsFilesService; -import com.hig.utils.DateUtils; -import com.hig.utils.UUIDGenerator; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 文件管理Controller - * - * @author qnsdt - * @date 2021-12-17 - */ -@RestController -@RequestMapping("/fms/files") -public class FmsFilesController extends BaseController -{ - @Autowired - private IFmsFilesService fmsFilesService; - - @Autowired - ChunkService chunkService; - - @Value("${cms.files.photo-path}") - private String filespath; - - /** - * 查询文件管理列表 - */ - @PreAuthorize("@ss.hasPermi('fms:files:list')") - @GetMapping("/list") - public TableDataInfo list(FmsFiles fmsFiles) - { - startPage(); - List list = fmsFilesService.selectFmsFilesList(fmsFiles); - // System.out.println("文件列表:" + list.toString()); - return getDataTable(list); - } - - /** - * 导出文件管理列表 - */ - @PreAuthorize("@ss.hasPermi('fms:files:export')") - @Log(title = "文件管理", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(FmsFiles fmsFiles) - { - List list = fmsFilesService.selectFmsFilesList(fmsFiles); - ExcelUtil util = new ExcelUtil(FmsFiles.class); - return util.exportExcel(list, "文件管理数据"); - } - - /** - * 获取文件管理详细信息 - */ - @PreAuthorize("@ss.hasPermi('fms:files:query')") - @GetMapping(value = "/{fileId}") - public AjaxResult getInfo(@PathVariable("fileId") Long fileId) - { - return AjaxResult.success(fmsFilesService.selectFmsFilesById(fileId)); - } - - /** - * 新增文件管理 - */ - @PreAuthorize("@ss.hasPermi('fms:files:add')") - @Log(title = "文件管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody FmsFiles fmsFiles) - { - return toAjax(fmsFilesService.insertFmsFiles(fmsFiles)); - } - - @RequestMapping("/chunkupload/{guid}/{username}") - // @PostMapping(value = "/chunkupload") - public StdOut chunkUpload(@PathVariable String guid,@PathVariable String username,MultipartFileParam param, HttpServletRequest request, HttpServletResponse response) { - StdOut out = new StdOut(); - - // 在此更换路径 - // File file = new File("D:\\chunk_test");//存储路径 - // 拼接路径 - String fileurl = filespath + "/" + DateUtils.toDateString() + "/" + guid ; - // System.out.println("拼接地址为:" + fileurl); - String filepath = RuoYiConfig.getProfile() + fileurl; - // System.out.println("拼接路径为:" + filepath); - File file = new File(filepath);//存储路径 - - - String path = file.getAbsolutePath(); - response.setContentType("text/html;charset=UTF-8"); - - try { - //判断前端Form表单格式是否支持文件上传 - boolean isMultipart = ServletFileUpload.isMultipartContent(request); - if (!isMultipart) { - out.setCode(StdOut.PARAMETER_NULL); - out.setMessage("表单格式错误"); - return out; - } else { - param.setTaskId(param.getIdentifier()); - out.setModel(chunkService.chunkUploadByMappedByteBuffer(param, path)); - // System.out.println("保存后:" + out.toString()); - if (out.getModel() != null) { - // System.out.println("文件名:" + out.getModel().toString()); - // 保存文件信息 - // 取得文件名 - String filename = out.getModel().toString(); - // 取文件类型 - String suffix = getSuffix(filename); - - // 开始保存 - // String fileTitle, String fileDescribe, String fileName, String filePath, String fileUrl, - // String fileSuffix, String originalName, String uploadName - FmsFiles fmsFiles = new FmsFiles(null, null, filename, filepath, fileurl, suffix, filename, username); - System.out.println(fmsFiles.toString()); - int count = fmsFilesService.insertFmsFiles(fmsFiles); - - } - return out; - } - } catch (NotSameFileExpection e) { - out.setCode(StdOut.FAIL); - out.setMessage("MD5校验失败"); - return out; - } catch (Exception e) { - out.setCode(StdOut.FAIL); - out.setMessage("上传失败"); - return out; - } - } - - private String getSuffix(String filename) { - String suffix = null; - try - { - suffix = filename.substring(filename.lastIndexOf(".") + 1); - } - catch(Exception e) { - - } - - return suffix; - } - /** - * 修改文件管理 - */ - @PreAuthorize("@ss.hasPermi('fms:files:edit')") - @Log(title = "文件管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody FmsFiles fmsFiles) - { - System.out.println("fmsFiles:" + fmsFiles.toString()); - return toAjax(fmsFilesService.updateFmsFiles(fmsFiles)); - } - - /** - * 删除文件管理 - */ - @PreAuthorize("@ss.hasPermi('fms:files:remove')") - @Log(title = "文件管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{fileIds}") - public AjaxResult remove(@PathVariable Long[] fileIds) - { - return toAjax(fmsFilesService.deleteFmsFilesByIds(fileIds)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/controller/FmsPhotoController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/controller/FmsPhotoController.java deleted file mode 100644 index 12de578..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/controller/FmsPhotoController.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.hig.fms.controller; - -import java.util.Date; -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.cms.utils.FileUpload; -import com.hig.fms.domain.FmsPhoto; -import com.hig.fms.service.IFmsPhotoService; -import com.hig.utils.DateUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 图片管理Controller - * - * @author qnsdt - * @date 2021-12-14 - */ -@RestController -@RequestMapping("/fms/photo") -public class FmsPhotoController extends BaseController -{ - @Autowired - private IFmsPhotoService fmsPhotoService; - - @Value("${cms.fms.photo-path}") - private String fmspath; - - private TokenService tokenService; - - /** - * 查询图片管理列表 - */ - @PreAuthorize("@ss.hasPermi('fms:photo:list')") - @GetMapping("/list") - public TableDataInfo list(FmsPhoto fmsPhoto) - { - startPage(); - List list = fmsPhotoService.selectFmsPhotoList(fmsPhoto); - return getDataTable(list); - } - - /** - * 导出图片管理列表 - */ - @PreAuthorize("@ss.hasPermi('fms:photo:export')") - @Log(title = "图片管理", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(FmsPhoto fmsPhoto) - { - List list = fmsPhotoService.selectFmsPhotoList(fmsPhoto); - ExcelUtil util = new ExcelUtil(FmsPhoto.class); - return util.exportExcel(list, "图片管理数据"); - } - - /** - * 获取图片管理详细信息 - */ - @PreAuthorize("@ss.hasPermi('fms:photo:query')") - @GetMapping(value = "/{photoId}") - public AjaxResult getInfo(@PathVariable("photoId") Long photoId) - { - return AjaxResult.success(fmsPhotoService.selectFmsPhotoById(photoId)); - } - - /** - * 新增图片管理 - */ - // @PreAuthorize("@ss.hasPermi('fms:photo:add')") - // @Log(title = "图片管理", businessType = BusinessType.INSERT) - @PostMapping(value = "/add/{username}") - public AjaxResult add(@PathVariable String username,@RequestParam("file") MultipartFile file) - { - if (username == null || username.trim().equals("")) { - return AjaxResult.error("用户名不能为空"); - } - System.out.println("当前日期:" + DateUtils.toDateString()); - // 取得原始文件名 - String originalfile = file.getOriginalFilename(); - - // 拼接路径 - String path = RuoYiConfig.getProfile() + fmspath + "/" + DateUtils.toDateString(); - System.out.println("拼接路径为:" + path); - String filename = FileUpload.writeUploadFile(file,path); - String fileurl = fmspath + "/" + DateUtils.toDateString() + "/" + filename; - System.out.println(fileurl); - - - int count = 0; - - // System.out.println("photoid:" + swipperid); - - System.out.println("RuoYiConfig.getProfile()" + RuoYiConfig.getProfile()); - - /*LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - SysUser user = loginUser.getUser(); - - System.out.println("取得用户信息:" + user.toString());*/ - - // String fileName, String photoPath, String photoUrl, String originalName, String uploadName,String uploadDept, Long status - FmsPhoto fmsPhoto = new FmsPhoto(filename, path, fileurl, originalfile, username, "", (long) 0); - - // System.out.println("fmsPhoto:" + fmsPhoto.toString()); - try - { - return toAjax(fmsPhotoService.insertFmsPhoto(fmsPhoto)); - } - catch(Exception e) - { - return AjaxResult.error(e.getMessage()); - } - // select photo_id,file_name,photo_path,photo_url,original_name,upload_name,upload_dept,upload_time,status from fms_photo; - - // 相应赋值 - //int photoId, int swipperId, String photoPath, String photoUrl, String fileName,String originalName - - /*SysSwipper sysSwipper = new SysSwipper(Integer.parseInt(swipperid), path, fileurl, filename, originalfile); - - System.out.println("sysSwipper:" + sysSwipper.toString()); - try - { - count = swipperService.insertSwipper(sysSwipper); - } - catch(Exception e) - { - return AjaxResult.error(e.getMessage()); - }*/ - - // FmsPhoto fmsPhoto - - // return AjaxResult.success(sysSwipper); - - - } - - /** - * 修改图片管理 - */ - @PreAuthorize("@ss.hasPermi('fms:photo:edit')") - @Log(title = "图片管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody FmsPhoto fmsPhoto) - { - return toAjax(fmsPhotoService.updateFmsPhoto(fmsPhoto)); - } - - /** - * 删除图片管理 - */ - @PreAuthorize("@ss.hasPermi('fms:photo:remove')") - @Log(title = "图片管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{photoIds}") - public AjaxResult remove(@PathVariable Long[] photoIds) - { - return toAjax(fmsPhotoService.deleteFmsPhotoByIds(photoIds)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/FmsFiles.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/FmsFiles.java deleted file mode 100644 index 2dd41de..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/FmsFiles.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hig.fms.domain; - -import java.util.Date; - -import org.apache.commons.lang3.builder.ToStringBuilder; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; - -import lombok.Data; - -@Data -public class FmsFiles { - /** 文件序号 */ - private int fileId; - - /** 文件标题 */ - @Excel(name = "文件标题") - private String fileTitle; - - /** 文件描述 */ - @Excel(name = "文件描述") - private String fileDescribe; - - /** 文件名称 */ - private String fileName; - - /** 文件路径 */ - private String filePath; - - /** 文件链接 */ - private String fileUrl; - - /** 文件类型 */ - private String fileSuffix; - - /** 原始名称 */ - private String originalName; - - /** 上传者 */ - @Excel(name = "上传者") - private String uploadName; - - /** 上传部门 */ - private String uploadDept; - - /** 上传时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date uploadTime; - - /** 状态 */ - private int status; - - public FmsFiles() { - super(); - } - - public FmsFiles(String fileTitle, String fileDescribe, String fileName, String filePath, String fileUrl, - String fileSuffix, String originalName, String uploadName) { - super(); - this.fileTitle = fileTitle; - this.fileDescribe = fileDescribe; - this.fileName = fileName; - this.filePath = filePath; - this.fileUrl = fileUrl; - this.fileSuffix = fileSuffix; - this.originalName = originalName; - this.uploadName = uploadName; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("fileId", getFileId()) - .append("fileTitle", getFileTitle()) - .append("fileDescribe", getFileDescribe()) - .append("fileName", getFileName()) - .append("filePath", getFilePath()) - .append("fileUrl", getFileUrl()) - .append("fileSuffix", getFileSuffix()) - .append("originalName", getOriginalName()) - .append("uploadName", getUploadName()) - .append("uploadDept", getUploadDept()) - .append("uploadTime", getUploadTime()) - .append("status", getStatus()) - .toString(); - } - - - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/FmsPhoto.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/FmsPhoto.java deleted file mode 100644 index 31e52d7..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/FmsPhoto.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.hig.fms.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 图片管理对象 fms_photo - * - * @author qnsdt - * @date 2021-12-14 - */ -public class FmsPhoto extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 图片序号 */ - @Excel(name = "图片序号") - private Long photoId; - - /** 文件名称 */ - @Excel(name = "文件名称") - private String fileName; - - /** 图片路径 */ - @Excel(name = "图片路径") - private String photoPath; - - /** 图片链接 */ - @Excel(name = "图片链接") - private String photoUrl; - - /** 原始名称 */ - @Excel(name = "原始名称") - private String originalName; - - /** 上传者 */ - @Excel(name = "上传者") - private String uploadName; - - /** 上传部门 */ - @Excel(name = "上传部门") - private String uploadDept; - - /** 上传时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date uploadTime; - - /** 状态 */ - @Excel(name = "状态") - private Long status; - - public void setPhotoId(Long photoId) - { - this.photoId = photoId; - } - - public Long getPhotoId() - { - return photoId; - } - public void setFileName(String fileName) - { - this.fileName = fileName; - } - - public String getFileName() - { - return fileName; - } - public void setPhotoPath(String photoPath) - { - this.photoPath = photoPath; - } - - public String getPhotoPath() - { - return photoPath; - } - public void setPhotoUrl(String photoUrl) - { - this.photoUrl = photoUrl; - } - - public String getPhotoUrl() - { - return photoUrl; - } - public void setOriginalName(String originalName) - { - this.originalName = originalName; - } - - public String getOriginalName() - { - return originalName; - } - public void setUploadName(String uploadName) - { - this.uploadName = uploadName; - } - - public String getUploadName() - { - return uploadName; - } - public void setUploadDept(String uploadDept) - { - this.uploadDept = uploadDept; - } - - public String getUploadDept() - { - return uploadDept; - } - public void setUploadTime(Date uploadTime) - { - this.uploadTime = uploadTime; - } - - public Date getUploadTime() - { - return uploadTime; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - - - public FmsPhoto(String fileName, String photoPath, String photoUrl, String originalName, String uploadName, - String uploadDept, Long status) { - super(); - this.fileName = fileName; - this.photoPath = photoPath; - this.photoUrl = photoUrl; - this.originalName = originalName; - this.uploadName = uploadName; - this.uploadDept = uploadDept; - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("photoId", getPhotoId()) - .append("fileName", getFileName()) - .append("photoPath", getPhotoPath()) - .append("photoUrl", getPhotoUrl()) - .append("originalName", getOriginalName()) - .append("uploadName", getUploadName()) - .append("uploadDept", getUploadDept()) - .append("uploadTime", getUploadTime()) - .append("status", getStatus()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/MultipartFileParam.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/MultipartFileParam.java deleted file mode 100644 index 4669a6d..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/MultipartFileParam.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.fms.domain; - -import org.springframework.web.multipart.MultipartFile; - -public class MultipartFileParam { - private String taskId; - private int chunkNumber; - private long chunkSize; - private int totalChunks; - private String identifier; - private MultipartFile file; - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public int getChunkNumber() { - return chunkNumber; - } - - public void setChunkNumber(int chunkNumber) { - this.chunkNumber = chunkNumber; - } - - public long getChunkSize() { - return chunkSize; - } - - public void setChunkSize(long chunkSize) { - this.chunkSize = chunkSize; - } - - public int getTotalChunks() { - return totalChunks; - } - - public void setTotalChunks(int totalChunks) { - this.totalChunks = totalChunks; - } - - public String getIdentifier() { - return identifier; - } - - public void setIdentifier(String identifier) { - this.identifier = identifier; - } - - public MultipartFile getFile() { - return file; - } - - public void setFile(MultipartFile file) { - this.file = file; - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/dto/StdOut.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/dto/StdOut.java deleted file mode 100644 index d7cdb1d..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/domain/dto/StdOut.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hig.fms.domain.dto; - -import java.util.List; -import java.util.Map; - -import com.alibaba.fastjson.JSON; - -public class StdOut { - public static final int SUCCESS = 200; - public static final int FAIL = 400; - public static final int PARAMETER_NULL = 500; - public static final int NO_LOGIN = 600; - private int code = 200; - private Object model = null; - private String message = null; - - public StdOut() { - this.setCode(200); - this.setModel((Object)null); - } - - public StdOut(int code) { - this.setCode(code); - this.setModel((Object)null); - } - - public StdOut(List> model) { - this.setCode(200); - this.setModel(model); - } - - public StdOut(int code, List> model) { - this.setCode(code); - this.setModel(model); - } - - public int getCode() { - return this.code; - } - - public void setCode(int code) { - this.code = code; - } - - public String toString() { - return JSON.toJSONString(this); - } - - public Object getModel() { - return this.model; - } - - public void setModel(Object model) { - this.model = model; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/mapper/FmsFilesMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/mapper/FmsFilesMapper.java deleted file mode 100644 index 3ceda73..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/mapper/FmsFilesMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.fms.mapper; - -import java.util.List; -import com.hig.fms.domain.FmsFiles; - -/** - * 文件管理Mapper接口 - * - * @author qnsdt - * @date 2021-12-17 - */ -public interface FmsFilesMapper -{ - /** - * 查询文件管理 - * - * @param fileId 文件管理ID - * @return 文件管理 - */ - public FmsFiles selectFmsFilesById(Long fileId); - - /** - * 查询文件管理列表 - * - * @param fmsFiles 文件管理 - * @return 文件管理集合 - */ - public List selectFmsFilesList(FmsFiles fmsFiles); - - /** - * 新增文件管理 - * - * @param fmsFiles 文件管理 - * @return 结果 - */ - public int insertFmsFiles(FmsFiles fmsFiles); - - /** - * 修改文件管理 - * - * @param fmsFiles 文件管理 - * @return 结果 - */ - public int updateFmsFiles(FmsFiles fmsFiles); - - /** - * 删除文件管理 - * - * @param fileId 文件管理ID - * @return 结果 - */ - public int deleteFmsFilesById(Long fileId); - - /** - * 批量删除文件管理 - * - * @param fileIds 需要删除的数据ID - * @return 结果 - */ - public int deleteFmsFilesByIds(Long[] fileIds); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/mapper/FmsPhotoMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/mapper/FmsPhotoMapper.java deleted file mode 100644 index 88699ce..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/mapper/FmsPhotoMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.fms.mapper; - -import java.util.List; -import com.hig.fms.domain.FmsPhoto; - -/** - * 图片管理Mapper接口 - * - * @author qnsdt - * @date 2021-12-14 - */ -public interface FmsPhotoMapper -{ - /** - * 查询图片管理 - * - * @param photoId 图片管理ID - * @return 图片管理 - */ - public FmsPhoto selectFmsPhotoById(Long photoId); - - /** - * 查询图片管理列表 - * - * @param fmsPhoto 图片管理 - * @return 图片管理集合 - */ - public List selectFmsPhotoList(FmsPhoto fmsPhoto); - - /** - * 新增图片管理 - * - * @param fmsPhoto 图片管理 - * @return 结果 - */ - public int insertFmsPhoto(FmsPhoto fmsPhoto); - - /** - * 修改图片管理 - * - * @param fmsPhoto 图片管理 - * @return 结果 - */ - public int updateFmsPhoto(FmsPhoto fmsPhoto); - - /** - * 删除图片管理 - * - * @param photoId 图片管理ID - * @return 结果 - */ - public int deleteFmsPhotoById(Long photoId); - - /** - * 批量删除图片管理 - * - * @param photoIds 需要删除的数据ID - * @return 结果 - */ - public int deleteFmsPhotoByIds(Long[] photoIds); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/ChunkService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/ChunkService.java deleted file mode 100644 index 998bef5..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/ChunkService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hig.fms.service; - -import java.io.File; -import java.io.IOException; - -import com.hig.fms.common.NotSameFileExpection; -import com.hig.fms.domain.MultipartFileParam; - - -public interface ChunkService { - public String chunkUploadByMappedByteBuffer(MultipartFileParam param, String filePath) throws IOException, NotSameFileExpection; - - public void renameFile(File toBeRenamed, String toFileNewName); - - public boolean checkUploadStatus(MultipartFileParam param, String fileName, String filePath) throws IOException; -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/IFmsFilesService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/IFmsFilesService.java deleted file mode 100644 index cbd7948..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/IFmsFilesService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.fms.service; - -import java.util.List; -import com.hig.fms.domain.FmsFiles; - -/** - * 文件管理Service接口 - * - * @author qnsdt - * @date 2021-12-17 - */ -public interface IFmsFilesService -{ - /** - * 查询文件管理 - * - * @param fileId 文件管理ID - * @return 文件管理 - */ - public FmsFiles selectFmsFilesById(Long fileId); - - /** - * 查询文件管理列表 - * - * @param fmsFiles 文件管理 - * @return 文件管理集合 - */ - public List selectFmsFilesList(FmsFiles fmsFiles); - - /** - * 新增文件管理 - * - * @param fmsFiles 文件管理 - * @return 结果 - */ - public int insertFmsFiles(FmsFiles fmsFiles); - - /** - * 修改文件管理 - * - * @param fmsFiles 文件管理 - * @return 结果 - */ - public int updateFmsFiles(FmsFiles fmsFiles); - - /** - * 批量删除文件管理 - * - * @param fileIds 需要删除的文件管理ID - * @return 结果 - */ - public int deleteFmsFilesByIds(Long[] fileIds); - - /** - * 删除文件管理信息 - * - * @param fileId 文件管理ID - * @return 结果 - */ - public int deleteFmsFilesById(Long fileId); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/IFmsPhotoService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/IFmsPhotoService.java deleted file mode 100644 index c0dc236..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/IFmsPhotoService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.fms.service; - -import java.util.List; -import com.hig.fms.domain.FmsPhoto; - -/** - * 图片管理Service接口 - * - * @author qnsdt - * @date 2021-12-14 - */ -public interface IFmsPhotoService -{ - /** - * 查询图片管理 - * - * @param photoId 图片管理ID - * @return 图片管理 - */ - public FmsPhoto selectFmsPhotoById(Long photoId); - - /** - * 查询图片管理列表 - * - * @param fmsPhoto 图片管理 - * @return 图片管理集合 - */ - public List selectFmsPhotoList(FmsPhoto fmsPhoto); - - /** - * 新增图片管理 - * - * @param fmsPhoto 图片管理 - * @return 结果 - */ - public int insertFmsPhoto(FmsPhoto fmsPhoto); - - /** - * 修改图片管理 - * - * @param fmsPhoto 图片管理 - * @return 结果 - */ - public int updateFmsPhoto(FmsPhoto fmsPhoto); - - /** - * 批量删除图片管理 - * - * @param photoIds 需要删除的图片管理ID - * @return 结果 - */ - public int deleteFmsPhotoByIds(Long[] photoIds); - - /** - * 删除图片管理信息 - * - * @param photoId 图片管理ID - * @return 结果 - */ - public int deleteFmsPhotoById(Long photoId); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/ChunkServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/ChunkServiceImpl.java deleted file mode 100644 index 40ba85c..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/ChunkServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.hig.fms.service.impl; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.util.UUID; - -import org.apache.commons.lang.StringUtils; -import org.springframework.stereotype.Service; - -import com.hig.fms.common.NotSameFileExpection; -import com.hig.fms.domain.MultipartFileParam; -import com.hig.fms.service.ChunkService; - -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.io.FileUtils; - - -@Service -public class ChunkServiceImpl implements ChunkService { - - @Override - public String chunkUploadByMappedByteBuffer(MultipartFileParam param, String filePath) throws IOException, NotSameFileExpection { - // TODO Auto-generated method stub - if (param.getTaskId() == null || "".equals(param.getTaskId())) { - param.setTaskId(UUID.randomUUID().toString()); - } - - String fileName = param.getFile().getOriginalFilename(); - String tempFileName = param.getTaskId() + fileName.substring(fileName.lastIndexOf(".")) + "_tmp"; - File fileDir = new File(filePath); - if (!fileDir.exists()) { - fileDir.mkdirs(); - } - File tempFile = new File(filePath, tempFileName); - //第一步 打开将要写入的文件 - RandomAccessFile raf = new RandomAccessFile(tempFile, "rw"); - //第二步 打开通道 - FileChannel fileChannel = raf.getChannel(); - //第三步 计算偏移量 - long position = (param.getChunkNumber() - 1) * param.getChunkSize(); - //第四步 获取分片数据 - byte[] fileData = param.getFile().getBytes(); - //第五步 写入数据 - fileChannel.position(position); - fileChannel.write(ByteBuffer.wrap(fileData)); - fileChannel.force(true); - fileChannel.close(); - raf.close(); - //判断是否完成文件的传输并进行校验与重命名 - boolean isComplete = checkUploadStatus(param, fileName, filePath); - if (isComplete) { - FileInputStream fileInputStream = new FileInputStream(tempFile.getPath()); - String md5 = DigestUtils.md5Hex(fileInputStream); - fileInputStream.close(); - if (StringUtils.isNotBlank(md5) && !md5.equals(param.getIdentifier())) { - throw new NotSameFileExpection(); - } - renameFile(tempFile, fileName); - return fileName; - } - return null; - } - - @Override - public void renameFile(File toBeRenamed, String toFileNewName) { - // TODO Auto-generated method stub - if (!toBeRenamed.exists() || toBeRenamed.isDirectory()) { - System.err.println("文件不存在"); - return; - } - String p = toBeRenamed.getParent(); - File newFile = new File(p + File.separatorChar + toFileNewName); - toBeRenamed.renameTo(newFile); - - } - - @Override - public boolean checkUploadStatus(MultipartFileParam param, String fileName, String filePath) throws IOException { - // TODO Auto-generated method stub - File confFile = new File(filePath, fileName + ".conf"); - RandomAccessFile confAccessFile = new RandomAccessFile(confFile, "rw"); - //设置文件长度 - confAccessFile.setLength(param.getTotalChunks()); - //设置起始偏移量 - confAccessFile.seek(param.getChunkNumber() - 1); - //将指定的一个字节写入文件中 127， - confAccessFile.write(Byte.MAX_VALUE); - byte[] completeStatusList = FileUtils.readFileToByteArray(confFile); - confAccessFile.close();//不关闭会造成无法占用 - //创建conf文件文件长度为总分片数，每上传一个分块即向conf文件中写入一个127，那么没上传的位置就是默认的0,已上传的就是127 - for (int i = 0; i < completeStatusList.length; i++) { - if (completeStatusList[i] != Byte.MAX_VALUE) { - return false; - } - } - confFile.delete(); - return true; - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/FmsFilesServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/FmsFilesServiceImpl.java deleted file mode 100644 index f0289fd..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/FmsFilesServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hig.fms.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.fms.mapper.FmsFilesMapper; -import com.hig.fms.domain.FmsFiles; -import com.hig.fms.service.IFmsFilesService; - -/** - * 文件管理Service业务层处理 - * - * @author qnsdt - * @date 2021-12-17 - */ -@Service -public class FmsFilesServiceImpl implements IFmsFilesService -{ - @Autowired - private FmsFilesMapper fmsFilesMapper; - - /** - * 查询文件管理 - * - * @param fileId 文件管理ID - * @return 文件管理 - */ - @Override - public FmsFiles selectFmsFilesById(Long fileId) - { - return fmsFilesMapper.selectFmsFilesById(fileId); - } - - /** - * 查询文件管理列表 - * - * @param fmsFiles 文件管理 - * @return 文件管理 - */ - @Override - public List selectFmsFilesList(FmsFiles fmsFiles) - { - return fmsFilesMapper.selectFmsFilesList(fmsFiles); - } - - /** - * 新增文件管理 - * - * @param fmsFiles 文件管理 - * @return 结果 - */ - @Override - public int insertFmsFiles(FmsFiles fmsFiles) - { - return fmsFilesMapper.insertFmsFiles(fmsFiles); - } - - /** - * 修改文件管理 - * - * @param fmsFiles 文件管理 - * @return 结果 - */ - @Override - public int updateFmsFiles(FmsFiles fmsFiles) - { - return fmsFilesMapper.updateFmsFiles(fmsFiles); - } - - /** - * 批量删除文件管理 - * - * @param fileIds 需要删除的文件管理ID - * @return 结果 - */ - @Override - public int deleteFmsFilesByIds(Long[] fileIds) - { - return fmsFilesMapper.deleteFmsFilesByIds(fileIds); - } - - /** - * 删除文件管理信息 - * - * @param fileId 文件管理ID - * @return 结果 - */ - @Override - public int deleteFmsFilesById(Long fileId) - { - return fmsFilesMapper.deleteFmsFilesById(fileId); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/FmsPhotoServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/FmsPhotoServiceImpl.java deleted file mode 100644 index e15ff9f..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/service/impl/FmsPhotoServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hig.fms.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.fms.mapper.FmsPhotoMapper; -import com.hig.fms.domain.FmsPhoto; -import com.hig.fms.service.IFmsPhotoService; - -/** - * 图片管理Service业务层处理 - * - * @author qnsdt - * @date 2021-12-14 - */ -@Service -public class FmsPhotoServiceImpl implements IFmsPhotoService -{ - @Autowired - private FmsPhotoMapper fmsPhotoMapper; - - /** - * 查询图片管理 - * - * @param photoId 图片管理ID - * @return 图片管理 - */ - @Override - public FmsPhoto selectFmsPhotoById(Long photoId) - { - return fmsPhotoMapper.selectFmsPhotoById(photoId); - } - - /** - * 查询图片管理列表 - * - * @param fmsPhoto 图片管理 - * @return 图片管理 - */ - @Override - public List selectFmsPhotoList(FmsPhoto fmsPhoto) - { - return fmsPhotoMapper.selectFmsPhotoList(fmsPhoto); - } - - /** - * 新增图片管理 - * - * @param fmsPhoto 图片管理 - * @return 结果 - */ - @Override - public int insertFmsPhoto(FmsPhoto fmsPhoto) - { - return fmsPhotoMapper.insertFmsPhoto(fmsPhoto); - } - - /** - * 修改图片管理 - * - * @param fmsPhoto 图片管理 - * @return 结果 - */ - @Override - public int updateFmsPhoto(FmsPhoto fmsPhoto) - { - return fmsPhotoMapper.updateFmsPhoto(fmsPhoto); - } - - /** - * 批量删除图片管理 - * - * @param photoIds 需要删除的图片管理ID - * @return 结果 - */ - @Override - public int deleteFmsPhotoByIds(Long[] photoIds) - { - return fmsPhotoMapper.deleteFmsPhotoByIds(photoIds); - } - - /** - * 删除图片管理信息 - * - * @param photoId 图片管理ID - * @return 结果 - */ - @Override - public int deleteFmsPhotoById(Long photoId) - { - return fmsPhotoMapper.deleteFmsPhotoById(photoId); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/utils/FileUpload.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/utils/FileUpload.java deleted file mode 100644 index c906da5..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/utils/FileUpload.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hig.fms.utils; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; -import org.springframework.web.multipart.MultipartFile; - -public class FileUpload { - /** - * 文件上传处理 - * - * @param file - * @return - */ - public static String writeUploadFile(MultipartFile file,String path) { - String filename = file.getOriginalFilename(); - System.out.println("原始文件名:" + filename); - // String realpath = "D:/image/photo/" + module +"/"; - File fileDir = new File(path); - if (!fileDir.exists()) - fileDir.mkdirs(); - - String extname = FilenameUtils.getExtension(filename); - String allowImgFormat = "gif,jpg,jpeg,png"; - if (!allowImgFormat.contains(extname.toLowerCase())) { - return "NOT_IMAGE"; - } - - filename = Math.abs(file.getOriginalFilename().hashCode()) + RandomUtils.createRandomString( 4 ) + "." + extname; - InputStream input = null; - FileOutputStream fos = null; - try { - input = file.getInputStream(); - fos = new FileOutputStream(path + "/" + filename); - IOUtils.copy(input, fos); - } catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - /*IOUtils.closeQuietly(input); - IOUtils.closeQuietly(fos);*/ - if (input != null) { - try { - input.close(); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } - - if (fos != null) { - try { - fos.close(); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } - } - return filename; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/utils/RandomUtils.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/utils/RandomUtils.java deleted file mode 100644 index c972389..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/fms/utils/RandomUtils.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hig.fms.utils; - -public class RandomUtils { - private static final String charlist = "0123456789"; - - public static String createRandomString(int len) { - String str = new String(); - for (int i = 0; i < len; i++) { - str += charlist.charAt(getRandom(charlist.length())); - } - return str; - } - - public static int getRandom(int mod) { - if (mod < 1) { - return 0; - } - int ret = getInt() % mod; - return ret; - } - - private static int getInt() { - int ret = Math.abs(Long.valueOf(getRandomNumString()).intValue()); - return ret; - } - - private static String getRandomNumString() { - double d = Math.random(); - String dStr = String.valueOf(d).replaceAll("[^\\d]", ""); - if (dStr.length() > 1) { - dStr = dStr.substring(0, dStr.length() - 1); - } - return dStr; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamFinishAnswerController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamFinishAnswerController.java deleted file mode 100644 index 02f8eca..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamFinishAnswerController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hig.onlineexam.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.onlineexam.domain.ExamFinishAnswer; -import com.hig.onlineexam.service.IExamFinishAnswerService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 考试成绩Controller - * - * @author qnsdt - * @date 2023-02-24 - */ -@RestController -@RequestMapping("/onlineexam/finishanswer") -public class ExamFinishAnswerController extends BaseController -{ - @Autowired - private IExamFinishAnswerService examFinishAnswerService; - - /** - * 查询考试成绩列表 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:finishanswer:list')") - @GetMapping("/list") - public TableDataInfo list(ExamFinishAnswer examFinishAnswer) - { - startPage(); - List list = examFinishAnswerService.selectExamFinishAnswerList(examFinishAnswer); - return getDataTable(list); - } - - /** - * 导出考试成绩列表 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:finishanswer:export')") - @Log(title = "考试成绩", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamFinishAnswer examFinishAnswer) - { - List list = examFinishAnswerService.selectExamFinishAnswerList(examFinishAnswer); - ExcelUtil util = new ExcelUtil(ExamFinishAnswer.class); - return util.exportExcel(list, "考试成绩数据"); - } - - /** - * 获取考试成绩详细信息 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:finishanswer:query')") - @GetMapping(value = "/{examCode}") - public AjaxResult getInfo(@PathVariable("examCode") String examCode) - { - return AjaxResult.success(examFinishAnswerService.selectExamFinishAnswerById(examCode)); - } - - /** - * 新增考试成绩 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:finishanswer:add')") - @Log(title = "考试成绩", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ExamFinishAnswer examFinishAnswer) - { - return toAjax(examFinishAnswerService.insertExamFinishAnswer(examFinishAnswer)); - } - - /** - * 维护考试成绩 - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody ExamFinishAnswer examFinishAnswer) - { - System.out.println("examFinishAnswer:" + examFinishAnswer.toString()); - return toAjax(examFinishAnswerService.intoExamFinishAnswer(examFinishAnswer)); - } - - /** - * 修改考试成绩 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:finishanswer:edit')") - @Log(title = "考试成绩", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ExamFinishAnswer examFinishAnswer) - { - return toAjax(examFinishAnswerService.updateExamFinishAnswer(examFinishAnswer)); - } - - /** - * 删除考试成绩 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:finishanswer:remove')") - @Log(title = "考试成绩", businessType = BusinessType.DELETE) - @DeleteMapping("/{examCodes}") - public AjaxResult remove(@PathVariable String[] examCodes) - { - return toAjax(examFinishAnswerService.deleteExamFinishAnswerByIds(examCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamQuestionsContentDataController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamQuestionsContentDataController.java deleted file mode 100644 index e8c98f2..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamQuestionsContentDataController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hig.onlineexam.controller; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.hig.onlineexam.domain.dto.ExamQuestionsContentData; -import com.hig.onlineexam.domain.dto.ExamQuestionsData; -import com.hig.onlineexam.service.IExamQuestionsContentDataService; -import com.hig.questions.domain.ExamQuestionsAnswer; -import com.hig.questions.service.IExamQuestionsAnswerService; -import com.hig.utils.DigitUtils; -import com.ruoyi.common.core.domain.AjaxResult; - -@RestController -@RequestMapping("/onlineexam") -public class ExamQuestionsContentDataController { - @Autowired - private IExamQuestionsContentDataService examQuestionsContentDataService; - - @Autowired - private IExamQuestionsAnswerService examQuestionsAnswerService; - - @GetMapping("/content") - public AjaxResult option(@RequestBody ExamQuestionsContentData examQuestionsContentData) - { - ExamQuestionsContentData contentData = examQuestionsContentDataService.selectExamQuestionsContent(examQuestionsContentData); - return AjaxResult.success(contentData); - } - - @PostMapping("/data") - public AjaxResult data(@RequestBody ExamQuestionsContentData examQuestionsContentData) - { - ExamQuestionsContentData contentData = examQuestionsContentDataService.selectExamQuestionsContent(examQuestionsContentData); - - // 转换题号 - - String str = DigitUtils.toChinese(String.valueOf(contentData.getQuestionsNumber())); - contentData.setQuestionsNumberText("第" + str + "题"); - - List examQuestionsOptionList = examQuestionsAnswerService.selectExamQuestionsOptionList(examQuestionsContentData.getQuestionsCode()); - - ExamQuestionsData examQuestionsData = new ExamQuestionsData(contentData, examQuestionsOptionList); - return AjaxResult.success(examQuestionsData); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamQuestionsListDataController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamQuestionsListDataController.java deleted file mode 100644 index 1628947..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamQuestionsListDataController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hig.onlineexam.controller; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.hig.onlineexam.domain.dto.ExamQuestionsListData; -import com.hig.onlineexam.service.IExamQuestionsListDataService; -import com.ruoyi.common.core.domain.AjaxResult; - -@RestController -@RequestMapping("/onlineexam/questionslist") -public class ExamQuestionsListDataController { - - @Autowired - IExamQuestionsListDataService examQuestionsListDataService; - - @GetMapping() - public AjaxResult getQuestionsList(ExamQuestionsListData examQuestionsListData) - { - List examQuestionsList = examQuestionsListDataService.selectQuestionsList(examQuestionsListData); - return AjaxResult.success(examQuestionsList); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamTaskAnswerController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamTaskAnswerController.java deleted file mode 100644 index 380a91e..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamTaskAnswerController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.hig.onlineexam.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.onlineexam.domain.ExamTaskAnswer; -import com.hig.onlineexam.service.IExamTaskAnswerService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 考试实时数据Controller - * - * @author qnsdt - * @date 2023-02-24 - */ -@RestController -@RequestMapping("/onlineexam/taskanswer") -public class ExamTaskAnswerController extends BaseController -{ - @Autowired - private IExamTaskAnswerService examTaskAnswerService; - - /** - * 查询考试实时数据列表 - */ - @GetMapping("/list") - public TableDataInfo list(ExamTaskAnswer examTaskAnswer) - { - startPage(); - List list = examTaskAnswerService.selectExamTaskAnswerList(examTaskAnswer); - return getDataTable(list); - } - - /** - * 导出考试实时数据列表 - */ - @GetMapping("/export") - public AjaxResult export(ExamTaskAnswer examTaskAnswer) - { - List list = examTaskAnswerService.selectExamTaskAnswerList(examTaskAnswer); - ExcelUtil util = new ExcelUtil(ExamTaskAnswer.class); - return util.exportExcel(list, "考试实时数据数据"); - } - - /** - * 获取考试实时数据详细信息 - */ - @GetMapping(value = "/{examCode}") - public AjaxResult getInfo(@PathVariable("examCode") String examCode) - { - return AjaxResult.success(examTaskAnswerService.selectExamTaskAnswerById(examCode)); - } - - /** - * 新增考试实时数据 - */ - @PostMapping - public AjaxResult add(@RequestBody ExamTaskAnswer examTaskAnswer) - { - - return toAjax(examTaskAnswerService.insertExamTaskAnswer(examTaskAnswer)); - } - - /** - * 修改考试实时数据 - */ - @PutMapping - public AjaxResult edit(@RequestBody ExamTaskAnswer examTaskAnswer) - { - return toAjax(examTaskAnswerService.updateExamTaskAnswer(examTaskAnswer)); - } - - /** - * 删除考试实时数据 - */ - @GetMapping("/remove/{examCodes}") - public AjaxResult remove(@PathVariable String[] examCodes) - { - return toAjax(examTaskAnswerService.deleteExamTaskAnswerByIds(examCodes)); - } - - /** - * 删除考试实时数据 - */ - @PostMapping("/delete") - public AjaxResult delete(ExamTaskAnswer examTaskAnswer) - { - return toAjax(examTaskAnswerService.deleteExamTaskAnswer(examTaskAnswer)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamTitleController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamTitleController.java deleted file mode 100644 index c50f310..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamTitleController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hig.onlineexam.controller; - -import java.util.List; - -import com.hig.exam.domain.ExamTaskManager; -import com.hig.exam.service.IExamTaskManagerService; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.hig.onlineexam.domain.dto.ExamTitleData; -import com.hig.onlineexam.service.IExamTitleDataService; -import com.ruoyi.common.core.domain.AjaxResult; - -@RestController -@RequestMapping("/onlineexam/examtitle") -public class ExamTitleController { - - @Autowired - IExamTitleDataService examTitleDataService; - - @Autowired - IExamTaskManagerService examTaskManagerService; - - @GetMapping(value = "/selectCurrentExam") - public AjaxResult selectCurrentExam() - { - - LoginUser user=SecurityUtils.getLoginUser(); - List list= examTaskManagerService.selectCurrentExam(user.getUser().getUserCode()); - //ExamTitleData examTitleData = examTitleDataService.selectCurrentExam(user.getUser().getUserCode()); - //return AjaxResult.success(examTitleData); - return AjaxResult.success(list); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamUserScoreController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamUserScoreController.java deleted file mode 100644 index bf04a78..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/controller/ExamUserScoreController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.hig.onlineexam.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.onlineexam.domain.ExamUserScore; -import com.hig.onlineexam.service.IExamUserScoreService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 考试成绩Controller - * - * @author qnsdt - * @date 2023-03-03 - */ -@RestController -@RequestMapping("/onlineexam/userscore") -public class ExamUserScoreController extends BaseController -{ - @Autowired - private IExamUserScoreService examUserScoreService; - - /** - * 查询考试成绩列表 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:userscore:list')") - @GetMapping("/list") - public TableDataInfo list(ExamUserScore examUserScore) - { - startPage(); - List list = examUserScoreService.selectExamUserScoreList(examUserScore); - return getDataTable(list); - } - - /** - * 导出考试成绩列表 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:userscore:export')") - @Log(title = "考试成绩", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamUserScore examUserScore) - { - List list = examUserScoreService.selectExamUserScoreList(examUserScore); - ExcelUtil util = new ExcelUtil(ExamUserScore.class); - return util.exportExcel(list, "考试成绩数据"); - } - - /** - * 获取考试成绩详细信息 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:userscore:query')") - @GetMapping(value = "/{examCode}") - public AjaxResult getInfo(@PathVariable("examCode") String examCode) - { - return AjaxResult.success(examUserScoreService.selectExamUserScoreById(examCode)); - } - - /** - * 新增考试成绩 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:userscore:add')") - @Log(title = "考试成绩", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ExamUserScore examUserScore) - { - return toAjax(examUserScoreService.insertExamUserScore(examUserScore)); - } - - /** - * 维护考试成绩 - */ - @PostMapping("/into") - public AjaxResult into(@RequestBody ExamUserScore examUserScore) - { - return toAjax(examUserScoreService.intoExamUserScore(examUserScore)); - } - - /** - * 修改考试成绩 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:userscore:edit')") - @Log(title = "考试成绩", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ExamUserScore examUserScore) - { - return toAjax(examUserScoreService.updateExamUserScore(examUserScore)); - } - - /** - * 删除考试成绩 - */ - @PreAuthorize("@ss.hasPermi('onlineexam:userscore:remove')") - @Log(title = "考试成绩", businessType = BusinessType.DELETE) - @DeleteMapping("/{examCodes}") - public AjaxResult remove(@PathVariable String[] examCodes) - { - return toAjax(examUserScoreService.deleteExamUserScoreByIds(examCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamFinishAnswer.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamFinishAnswer.java deleted file mode 100644 index 3dd51ac..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamFinishAnswer.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.hig.onlineexam.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 考试成绩对象 exam_finish_answer - * - * @author qnsdt - * @date 2023-03-02 - */ -public class ExamFinishAnswer extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 考试代码 */ - private String examCode; - - /** 考试用户 */ - private String userCode; - - /** 题目代码 */ - private String questionsCode; - - /** 正确答案 */ - @Excel(name = "正确答案") - private String rightAnswer; - - /** 分数 */ - @Excel(name = "分数") - private Long examScore; - - /** 题目回答 */ - @Excel(name = "题目回答") - private String questionsAnswer; - - /** 题目得分 */ - @Excel(name = "题目得分") - private Long questionsScore; - - public void setExamCode(String examCode) - { - this.examCode = examCode; - } - - public String getExamCode() - { - return examCode; - } - public void setUserCode(String userCode) - { - this.userCode = userCode; - } - - public String getUserCode() - { - return userCode; - } - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setRightAnswer(String rightAnswer) - { - this.rightAnswer = rightAnswer; - } - - public String getRightAnswer() - { - return rightAnswer; - } - public void setExamScore(Long examScore) - { - this.examScore = examScore; - } - - public Long getExamScore() - { - return examScore; - } - public void setQuestionsAnswer(String questionsAnswer) - { - this.questionsAnswer = questionsAnswer; - } - - public String getQuestionsAnswer() - { - return questionsAnswer; - } - public void setQuestionsScore(Long questionsScore) - { - this.questionsScore = questionsScore; - } - - public Long getQuestionsScore() - { - return questionsScore; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("examCode", getExamCode()) - .append("userCode", getUserCode()) - .append("questionsCode", getQuestionsCode()) - .append("rightAnswer", getRightAnswer()) - .append("examScore", getExamScore()) - .append("questionsAnswer", getQuestionsAnswer()) - .append("questionsScore", getQuestionsScore()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamTaskAnswer.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamTaskAnswer.java deleted file mode 100644 index fd306f6..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamTaskAnswer.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.hig.onlineexam.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 考试实时数据对象 exam_task_answer - * - * @author qnsdt - * @date 2023-02-24 - */ -public class ExamTaskAnswer extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 考试代码 */ - @Excel(name = "考试代码") - private String examCode; - - /** 考试用户 */ - @Excel(name = "考试用户") - private String userCode; - - /** 题目代码 */ - @Excel(name = "题目代码") - private String questionsCode; - - - private String examTimes; - - public String getExamTimes() { - return examTimes; - } - - public void setExamTimes(String examTimes) { - this.examTimes = examTimes; - } - - /** 题号 */ - @Excel(name = "题号") - private Long questionsNumber; - - /** 试题类型 */ - @Excel(name = "试题类型") - private Long questionsType; - - /** 题目回答 */ - @Excel(name = "题目回答") - private String questionsAnswer; - - /** 是否标记 */ - @Excel(name = "是否标记") - private String isMark; - - /** 是否当前 */ - @Excel(name = "是否当前") - private String isCurrent; - - public void setExamCode(String examCode) - { - this.examCode = examCode; - } - - public String getExamCode() - { - return examCode; - } - public void setUserCode(String userCode) - { - this.userCode = userCode; - } - - public String getUserCode() - { - return userCode; - } - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setQuestionsNumber(Long questionsNumber) - { - this.questionsNumber = questionsNumber; - } - - public Long getQuestionsNumber() - { - return questionsNumber; - } - public void setQuestionsType(Long questionsType) - { - this.questionsType = questionsType; - } - - public Long getQuestionsType() - { - return questionsType; - } - public void setQuestionsAnswer(String questionsAnswer) - { - this.questionsAnswer = questionsAnswer; - } - - public String getQuestionsAnswer() - { - return questionsAnswer; - } - public void setIsMark(String isMark) - { - this.isMark = isMark; - } - - public String getIsMark() - { - return isMark; - } - public void setIsCurrent(String isCurrent) - { - this.isCurrent = isCurrent; - } - - public String getIsCurrent() - { - return isCurrent; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("examCode", getExamCode()) - .append("userCode", getUserCode()) - .append("questionsCode", getQuestionsCode()) - .append("questionsNumber", getQuestionsNumber()) - .append("questionsType", getQuestionsType()) - .append("questionsAnswer", getQuestionsAnswer()) - .append("isMark", getIsMark()) - .append("isCurrent", getIsCurrent()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamUserScore.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamUserScore.java deleted file mode 100644 index c49def9..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/ExamUserScore.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.hig.onlineexam.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 考试成绩对象 exam_user_score - * - * @author qnsdt - * @date 2023-03-03 - */ -public class ExamUserScore extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 考试代码 */ - private String examCode; - - /** 考试人员 */ - private String userCode; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; - - /** 分数 */ - @Excel(name = "分数") - private Integer examScore; - - /** 题目分数 */ - @Excel(name = "题目分数") - private Integer questionsScore; - - /** 题目数 */ - @Excel(name = "题目数") - private Integer examNumber; - - /** 答题数 */ - @Excel(name = "答题数") - private Integer answeredNumber; - - /** 未答题数 */ - @Excel(name = "未答题数") - private Integer notAnswered; - - /** 状态 */ - @Excel(name = "状态") - private Integer status; - - public void setExamCode(String examCode) - { - this.examCode = examCode; - } - - public String getExamCode() - { - return examCode; - } - public void setUserCode(String userCode) - { - this.userCode = userCode; - } - - public String getUserCode() - { - return userCode; - } - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStartTime() - { - return startTime; - } - public void setEndTime(Date endTime) - { - this.endTime = endTime; - } - - public Date getEndTime() - { - return endTime; - } - public void setExamScore(Integer examScore) - { - this.examScore = examScore; - } - - public Integer getExamScore() - { - return examScore; - } - public void setQuestionsScore(Integer questionsScore) - { - this.questionsScore = questionsScore; - } - - public Integer getQuestionsScore() - { - return questionsScore; - } - public void setExamNumber(Integer examNumber) - { - this.examNumber = examNumber; - } - - public Integer getExamNumber() - { - return examNumber; - } - public void setAnsweredNumber(Integer answeredNumber) - { - this.answeredNumber = answeredNumber; - } - - public Integer getAnsweredNumber() - { - return answeredNumber; - } - public void setNotAnswered(Integer notAnswered) - { - this.notAnswered = notAnswered; - } - - public Integer getNotAnswered() - { - return notAnswered; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("examCode", getExamCode()) - .append("userCode", getUserCode()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("examScore", getExamScore()) - .append("questionsScore", getQuestionsScore()) - .append("examNumber", getExamNumber()) - .append("answeredNumber", getAnsweredNumber()) - .append("notAnswered", getNotAnswered()) - .append("status", getStatus()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsContentData.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsContentData.java deleted file mode 100644 index f442c0b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsContentData.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hig.onlineexam.domain.dto; - -import lombok.Data; - -@Data -public class ExamQuestionsContentData { - private String bankCode; - private String examCode; - private int questionsId; - private int questionsNumber; - private String questionsNumberText; - private String questionsCode; - private String questionsContent; - private int questionsType; - private int questionsScore; - private int rateNumber; -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsData.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsData.java deleted file mode 100644 index a8a0141..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsData.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hig.onlineexam.domain.dto; - -import java.util.List; - -import com.hig.questions.domain.ExamQuestionsAnswer; - -import lombok.Data; - -@Data -public class ExamQuestionsData { - - private ExamQuestionsContentData examQuestionsContentData; - private List examQuestionsOptionList; - - - public ExamQuestionsData(ExamQuestionsContentData examQuestionsContentData, - List examQuestionsOptionList) { - super(); - this.examQuestionsContentData = examQuestionsContentData; - this.examQuestionsOptionList = examQuestionsOptionList; - } - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsListData.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsListData.java deleted file mode 100644 index 83e562f..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamQuestionsListData.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hig.onlineexam.domain.dto; - -import lombok.Data; - -@Data -public class ExamQuestionsListData { - private String examCode; - private String userCode; - private String questionsCode; - private int questionsNumber; - private int questionsType; - private int questionsScore; - private String questionsAnswer; - private int isMark; - private int isCurrent; -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamTitleData.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamTitleData.java deleted file mode 100644 index b1ba268..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/domain/dto/ExamTitleData.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.hig.onlineexam.domain.dto; - -import java.util.Date; - -import lombok.Data; - - -@Data -public class ExamTitleData { - /** 考试序号 */ - private Long examId; - - /** 考试代码 */ - private String examCode; - - /** 考试名称 */ - private String examName; - - private Integer examType; - private Integer examTimes; - /** 考试说明 */ - private String examDescribe; - - /** 组卷方式 */ - private String buildType; - - /** 强制抽卷 */ - private String forceDone; - - /** 考试题库 */ - private String examBank; - - /** 考试题库文字 */ - private String examBankText; - - - /** 图片链接 */ - private String pictureUrl; - - /** 开始时间 */ - private Date startTime; - - /** 结束时间 */ - private Date endTime; - - /** 当前日期 */ - private Date currentDate; - /** 考试时长 */ - private String examDuration; - - private int diffTime; - - /** 判断题数 */ - private int judgeNumber; - - /** 单选题数 */ - private int radioNumber; - - /** 多选题数 */ - private int choiceNumber; - - private int questionsScore; - /** 状态 */ - private Long status; - - /** 创建人 */ - private String createBy; - - /** 创建部门 */ - private int createDept; - - /** 创建时间 */ - private Date createTime; -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamFinishAnswerMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamFinishAnswerMapper.java deleted file mode 100644 index da58b92..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamFinishAnswerMapper.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hig.onlineexam.mapper; - -import java.util.List; -import com.hig.onlineexam.domain.ExamFinishAnswer; - -/** - * 考试成绩Mapper接口 - * - * @author qnsdt - * @date 2023-02-24 - */ -public interface ExamFinishAnswerMapper -{ - /** - * 查询考试成绩 - * - * @param examCode 考试成绩ID - * @return 考试成绩 - */ - public ExamFinishAnswer selectExamFinishAnswerById(String examCode); - - /** - * 查询考试成绩列表 - * - * @param examFinishAnswer 考试成绩 - * @return 考试成绩集合 - */ - public List selectExamFinishAnswerList(ExamFinishAnswer examFinishAnswer); - - /** - * 新增考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int insertExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 考试结束将考试成绩拷入 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int intoExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 修改考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int updateExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 删除考试成绩 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - public int deleteExamFinishAnswerById(String examCode); - - /** - * 删除个人考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int deleteExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 批量删除考试成绩 - * - * @param examCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamFinishAnswerByIds(String[] examCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamQuestionsContentDataMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamQuestionsContentDataMapper.java deleted file mode 100644 index ddf249f..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamQuestionsContentDataMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.hig.onlineexam.mapper; - -import java.util.List; - -import com.hig.onlineexam.domain.dto.ExamQuestionsContentData; - -public interface ExamQuestionsContentDataMapper { - public ExamQuestionsContentData selectExamQuestionsContent(ExamQuestionsContentData questionsContentData); - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamQuestionsListDataMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamQuestionsListDataMapper.java deleted file mode 100644 index 5f73317..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamQuestionsListDataMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hig.onlineexam.mapper; - -import java.util.List; - -import com.hig.onlineexam.domain.dto.ExamQuestionsListData; - -public interface ExamQuestionsListDataMapper { - public List selectQuestionsList(ExamQuestionsListData examQuestionsListData); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamTaskAnswerMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamTaskAnswerMapper.java deleted file mode 100644 index 195f68c..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamTaskAnswerMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hig.onlineexam.mapper; - -import java.util.List; -import com.hig.onlineexam.domain.ExamTaskAnswer; - -/** - * 考试实时数据Mapper接口 - * - * @author qnsdt - * @date 2023-02-24 - */ -public interface ExamTaskAnswerMapper -{ - /** - * 查询考试实时数据 - * - * @param examCode 考试实时数据ID - * @return 考试实时数据 - */ - public ExamTaskAnswer selectExamTaskAnswerById(String examCode); - - /** - * 查询考试实时数据列表 - * - * @param examTaskAnswer 考试实时数据 - * @return 考试实时数据集合 - */ - public List selectExamTaskAnswerList(ExamTaskAnswer examTaskAnswer); - - /** - * 新增考试实时数据 - * - * @param examTaskAnswer 考试实时数据 - * @return 结果 - */ - public int insertExamTaskAnswer(ExamTaskAnswer examTaskAnswer); - - /** - * 修改考试实时数据 - * - * @param examTaskAnswer 考试实时数据 - * @return 结果 - */ - public int updateExamTaskAnswer(ExamTaskAnswer examTaskAnswer); - - /** - * 删除个人单条考试实时数据 - * - * @param examCode 考试实时数据ID - * @return 结果 - */ - public int deleteExamTaskAnswer(ExamTaskAnswer examTaskAnswer); - /** - * 删除考试实时数据 - * - * @param examCode 考试实时数据ID - * @return 结果 - */ - public int deleteExamTaskAnswerById(String examCode); - - /** - * 批量删除考试实时数据 - * - * @param examCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamTaskAnswerByIds(String[] examCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamTitleDataMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamTitleDataMapper.java deleted file mode 100644 index 7ea2114..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamTitleDataMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hig.onlineexam.mapper; - -import com.hig.onlineexam.domain.dto.ExamTitleData; - -public interface ExamTitleDataMapper { - public ExamTitleData selectCurrentExam(String userCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamUserScoreMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamUserScoreMapper.java deleted file mode 100644 index c717094..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/mapper/ExamUserScoreMapper.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hig.onlineexam.mapper; - -import java.util.List; -import com.hig.onlineexam.domain.ExamUserScore; - -/** - * 考试成绩Mapper接口 - * - * @author qnsdt - * @date 2023-03-03 - */ -public interface ExamUserScoreMapper -{ - /** - * 查询考试成绩 - * - * @param examCode 考试成绩ID - * @return 考试成绩 - */ - public ExamUserScore selectExamUserScoreById(String examCode); - - /** - * 查询考试成绩列表 - * - * @param examUserScore 考试成绩 - * @return 考试成绩集合 - */ - public List selectExamUserScoreList(ExamUserScore examUserScore); - - /** - * 新增考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - public int insertExamUserScore(ExamUserScore examUserScore); - - /** - * 维护考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - public int intoExamUserScore(ExamUserScore examUserScore); - - /** - * 修改考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - public int updateExamUserScore(ExamUserScore examUserScore); - - /** - * 删除考试成绩 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - public int deleteExamUserScore(ExamUserScore examUserScore); - - - /** - * 删除考试成绩 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - public int deleteExamUserScoreById(String examCode); - - /** - * 批量删除考试成绩 - * - * @param examCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamUserScoreByIds(String[] examCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamFinishAnswerService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamFinishAnswerService.java deleted file mode 100644 index c4fae66..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamFinishAnswerService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hig.onlineexam.service; - -import java.util.List; -import com.hig.onlineexam.domain.ExamFinishAnswer; - -/** - * 考试成绩Service接口 - * - * @author qnsdt - * @date 2023-02-24 - */ -public interface IExamFinishAnswerService -{ - /** - * 查询考试成绩 - * - * @param examCode 考试成绩ID - * @return 考试成绩 - */ - public ExamFinishAnswer selectExamFinishAnswerById(String examCode); - - /** - * 查询考试成绩列表 - * - * @param examFinishAnswer 考试成绩 - * @return 考试成绩集合 - */ - public List selectExamFinishAnswerList(ExamFinishAnswer examFinishAnswer); - - /** - * 新增考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int insertExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 考试结束将考试成绩拷入 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int intoExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 修改考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int updateExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 批量删除考试成绩 - * - * @param examCodes 需要删除的考试成绩ID - * @return 结果 - */ - public int deleteExamFinishAnswerByIds(String[] examCodes); - - /** - * 删除个人考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - public int deleteExamFinishAnswer(ExamFinishAnswer examFinishAnswer); - - /** - * 删除考试成绩信息 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - public int deleteExamFinishAnswerById(String examCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamQuestionsContentDataService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamQuestionsContentDataService.java deleted file mode 100644 index ac3b4f2..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamQuestionsContentDataService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.hig.onlineexam.service; - -import java.util.List; - -import com.hig.onlineexam.domain.dto.ExamQuestionsContentData; - -public interface IExamQuestionsContentDataService { - public ExamQuestionsContentData selectExamQuestionsContent(ExamQuestionsContentData questionsContentData); - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamQuestionsListDataService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamQuestionsListDataService.java deleted file mode 100644 index 387cf53..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamQuestionsListDataService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.hig.onlineexam.service; - -import java.util.List; - -import com.hig.onlineexam.domain.dto.ExamQuestionsListData; - -public interface IExamQuestionsListDataService { - public List selectQuestionsList(ExamQuestionsListData examQuestionsListData); - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamTaskAnswerService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamTaskAnswerService.java deleted file mode 100644 index 4e030d0..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamTaskAnswerService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.onlineexam.service; - -import java.util.List; -import com.hig.onlineexam.domain.ExamTaskAnswer; - -/** - * 考试实时数据Service接口 - * - * @author qnsdt - * @date 2023-02-24 - */ -public interface IExamTaskAnswerService -{ - /** - * 查询考试实时数据 - * - * @param examCode 考试实时数据ID - * @return 考试实时数据 - */ - public ExamTaskAnswer selectExamTaskAnswerById(String examCode); - - /** - * 查询考试实时数据列表 - * - * @param examTaskAnswer 考试实时数据 - * @return 考试实时数据集合 - */ - public List selectExamTaskAnswerList(ExamTaskAnswer examTaskAnswer); - - /** - * 新增考试实时数据 - * - * @param examTaskAnswer 考试实时数据 - * @return 结果 - */ - public int insertExamTaskAnswer(ExamTaskAnswer examTaskAnswer); - - /** - * 修改考试实时数据 - * - * @param examTaskAnswer 考试实时数据 - * @return 结果 - */ - public int updateExamTaskAnswer(ExamTaskAnswer examTaskAnswer); - - /** - * 删除个人单条考试实时数据 - * - * @param examCode 考试实时数据ID - * @return 结果 - */ - public int deleteExamTaskAnswer(ExamTaskAnswer examTaskAnswer); - - /** - * 批量删除考试实时数据 - * - * @param examCodes 需要删除的考试实时数据ID - * @return 结果 - */ - public int deleteExamTaskAnswerByIds(String[] examCodes); - - /** - * 删除考试实时数据信息 - * - * @param examCode 考试实时数据ID - * @return 结果 - */ - public int deleteExamTaskAnswerById(String examCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamTitleDataService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamTitleDataService.java deleted file mode 100644 index 9a917a5..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamTitleDataService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hig.onlineexam.service; - -import com.hig.onlineexam.domain.dto.ExamTitleData; - -public interface IExamTitleDataService { - public ExamTitleData selectCurrentExam(String userCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamUserScoreService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamUserScoreService.java deleted file mode 100644 index 4143377..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/IExamUserScoreService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hig.onlineexam.service; - -import java.util.List; -import com.hig.onlineexam.domain.ExamUserScore; - -/** - * 考试成绩Service接口 - * - * @author qnsdt - * @date 2023-03-03 - */ -public interface IExamUserScoreService -{ - /** - * 查询考试成绩 - * - * @param examCode 考试成绩ID - * @return 考试成绩 - */ - public ExamUserScore selectExamUserScoreById(String examCode); - - /** - * 查询考试成绩列表 - * - * @param examUserScore 考试成绩 - * @return 考试成绩集合 - */ - public List selectExamUserScoreList(ExamUserScore examUserScore); - - /** - * 新增考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - public int insertExamUserScore(ExamUserScore examUserScore); - - /** - * 维护考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - public int intoExamUserScore(ExamUserScore examUserScore); - - /** - * 修改考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - public int updateExamUserScore(ExamUserScore examUserScore); - - /** - * 批量删除考试成绩 - * - * @param examCodes 需要删除的考试成绩ID - * @return 结果 - */ - - /** - * 删除考试成绩 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - public int deleteExamUserScore(ExamUserScore examUserScore); - - public int deleteExamUserScoreByIds(String[] examCodes); - - /** - * 删除考试成绩信息 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - public int deleteExamUserScoreById(String examCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamFinishAnswerServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamFinishAnswerServiceImpl.java deleted file mode 100644 index d60db85..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamFinishAnswerServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.hig.onlineexam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.onlineexam.mapper.ExamFinishAnswerMapper; -import com.hig.exam.domain.ExamTaskPerson; -import com.hig.exam.service.IExamTaskPersonService; -import com.hig.onlineexam.domain.ExamFinishAnswer; -import com.hig.onlineexam.domain.ExamUserScore; -import com.hig.onlineexam.service.IExamFinishAnswerService; -import com.hig.onlineexam.service.IExamUserScoreService; - -/** - * 考试成绩Service业务层处理 - * - * @author qnsdt - * @date 2023-02-24 - */ -@Service -public class ExamFinishAnswerServiceImpl implements IExamFinishAnswerService -{ - @Autowired - private ExamFinishAnswerMapper examFinishAnswerMapper; - - @Autowired - private IExamUserScoreService examUserScoreService; - - @Autowired - private IExamTaskPersonService examTaskPersonService; - - - /** - * 查询考试成绩 - * - * @param examCode 考试成绩ID - * @return 考试成绩 - */ - @Override - public ExamFinishAnswer selectExamFinishAnswerById(String examCode) - { - return examFinishAnswerMapper.selectExamFinishAnswerById(examCode); - } - - /** - * 查询考试成绩列表 - * - * @param examFinishAnswer 考试成绩 - * @return 考试成绩 - */ - @Override - public List selectExamFinishAnswerList(ExamFinishAnswer examFinishAnswer) - { - return examFinishAnswerMapper.selectExamFinishAnswerList(examFinishAnswer); - } - - /** - * 新增考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - @Override - public int insertExamFinishAnswer(ExamFinishAnswer examFinishAnswer) - { - return examFinishAnswerMapper.insertExamFinishAnswer(examFinishAnswer); - } - - /** - * 修改考试成绩 - * - * @param examFinishAnswer 考试成绩 - * @return 结果 - */ - @Override - public int updateExamFinishAnswer(ExamFinishAnswer examFinishAnswer) - { - return examFinishAnswerMapper.updateExamFinishAnswer(examFinishAnswer); - } - - /** - * 批量删除考试成绩 - * - * @param examCodes 需要删除的考试成绩ID - * @return 结果 - */ - @Override - public int deleteExamFinishAnswerByIds(String[] examCodes) - { - return examFinishAnswerMapper.deleteExamFinishAnswerByIds(examCodes); - } - - /** - * 删除考试成绩信息 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - @Override - public int deleteExamFinishAnswerById(String examCode) - { - return examFinishAnswerMapper.deleteExamFinishAnswerById(examCode); - } - - @Override - public int intoExamFinishAnswer(ExamFinishAnswer examFinishAnswer) { - // TODO Auto-generated method stub - examFinishAnswerMapper.deleteExamFinishAnswer(examFinishAnswer); - - int result = examFinishAnswerMapper.intoExamFinishAnswer(examFinishAnswer); - - // 维护成绩数据 - ExamUserScore examUserScore = new ExamUserScore(); - examUserScore.setExamCode(examFinishAnswer.getExamCode()); - examUserScore.setUserCode(examFinishAnswer.getUserCode()); - - result = examUserScoreService.intoExamUserScore(examUserScore); - - // 更新状态 - ExamTaskPerson examTaskPerson = new ExamTaskPerson(); - examTaskPerson.setExamCode(examFinishAnswer.getExamCode()); - examTaskPerson.setuserCode(examFinishAnswer.getUserCode()); - examTaskPersonService.updateDoneStatus(examTaskPerson); - return result; - } - - @Override - public int deleteExamFinishAnswer(ExamFinishAnswer examFinishAnswer) { - // TODO Auto-generated method stub - return examFinishAnswerMapper.deleteExamFinishAnswer(examFinishAnswer); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamQuestionsContentDataServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamQuestionsContentDataServiceImpl.java deleted file mode 100644 index 4cf6447..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamQuestionsContentDataServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hig.onlineexam.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.hig.onlineexam.domain.dto.ExamQuestionsContentData; -import com.hig.onlineexam.mapper.ExamQuestionsContentDataMapper; -import com.hig.onlineexam.service.IExamQuestionsContentDataService; - -@Service -public class ExamQuestionsContentDataServiceImpl implements IExamQuestionsContentDataService { - @Autowired - ExamQuestionsContentDataMapper examQuestionsContentDataMapper; - - - @Override - public ExamQuestionsContentData selectExamQuestionsContent(ExamQuestionsContentData questionsContentData) { - // TODO Auto-generated method stub - return examQuestionsContentDataMapper.selectExamQuestionsContent(questionsContentData); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamQuestionsListDataServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamQuestionsListDataServiceImpl.java deleted file mode 100644 index a0d8a8f..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamQuestionsListDataServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hig.onlineexam.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.hig.onlineexam.domain.dto.ExamQuestionsListData; -import com.hig.onlineexam.mapper.ExamQuestionsListDataMapper; -import com.hig.onlineexam.service.IExamQuestionsListDataService; - -@Service -public class ExamQuestionsListDataServiceImpl implements IExamQuestionsListDataService { - @Autowired - ExamQuestionsListDataMapper examQuestionsListDataMapper; - - @Override - public List selectQuestionsList(ExamQuestionsListData examQuestionsListData) { - // TODO Auto-generated method stub - return examQuestionsListDataMapper.selectQuestionsList(examQuestionsListData); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamTaskAnswerServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamTaskAnswerServiceImpl.java deleted file mode 100644 index d400517..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamTaskAnswerServiceImpl.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.hig.onlineexam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.onlineexam.mapper.ExamTaskAnswerMapper; -import com.hig.onlineexam.domain.ExamTaskAnswer; -import com.hig.onlineexam.domain.ExamUserScore; -import com.hig.onlineexam.service.IExamTaskAnswerService; -import com.hig.onlineexam.service.IExamUserScoreService; - -/** - * 考试实时数据Service业务层处理 - * - * @author qnsdt - * @date 2023-02-24 - */ -@Service -public class ExamTaskAnswerServiceImpl implements IExamTaskAnswerService -{ - @Autowired - private ExamTaskAnswerMapper examTaskAnswerMapper; - - - /** - * 查询考试实时数据 - * - * @param examCode 考试实时数据ID - * @return 考试实时数据 - */ - @Override - public ExamTaskAnswer selectExamTaskAnswerById(String examCode) - { - return examTaskAnswerMapper.selectExamTaskAnswerById(examCode); - } - - /** - * 查询考试实时数据列表 - * - * @param examTaskAnswer 考试实时数据 - * @return 考试实时数据 - */ - @Override - public List selectExamTaskAnswerList(ExamTaskAnswer examTaskAnswer) - { - return examTaskAnswerMapper.selectExamTaskAnswerList(examTaskAnswer); - } - - /** - * 新增考试实时数据 - * - * @param examTaskAnswer 考试实时数据 - * @return 结果 - */ - @Override - public int insertExamTaskAnswer(ExamTaskAnswer examTaskAnswer) - { - // 安全删除 - examTaskAnswerMapper.deleteExamTaskAnswer(examTaskAnswer); - - return examTaskAnswerMapper.insertExamTaskAnswer(examTaskAnswer); - } - - /** - * 修改考试实时数据 - * - * @param examTaskAnswer 考试实时数据 - * @return 结果 - */ - @Override - public int updateExamTaskAnswer(ExamTaskAnswer examTaskAnswer) - { - return examTaskAnswerMapper.updateExamTaskAnswer(examTaskAnswer); - } - - /** - * 批量删除考试实时数据 - * - * @param examCodes 需要删除的考试实时数据ID - * @return 结果 - */ - @Override - public int deleteExamTaskAnswerByIds(String[] examCodes) - { - return examTaskAnswerMapper.deleteExamTaskAnswerByIds(examCodes); - } - - /** - * 删除考试实时数据信息 - * - * @param examCode 考试实时数据ID - * @return 结果 - */ - @Override - public int deleteExamTaskAnswerById(String examCode) - { - return examTaskAnswerMapper.deleteExamTaskAnswerById(examCode); - } - - @Override - public int deleteExamTaskAnswer(ExamTaskAnswer examTaskAnswer) { - // TODO Auto-generated method stub - return examTaskAnswerMapper.deleteExamTaskAnswer(examTaskAnswer); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamTitleDataServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamTitleDataServiceImpl.java deleted file mode 100644 index 52744f6..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamTitleDataServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hig.onlineexam.service.impl; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.hig.onlineexam.domain.dto.ExamTitleData; -import com.hig.onlineexam.mapper.ExamTitleDataMapper; -import com.hig.onlineexam.service.IExamTitleDataService; - -@Service -public class ExamTitleDataServiceImpl implements IExamTitleDataService { - @Autowired - ExamTitleDataMapper examTitleDataMapper; - - @Override - public ExamTitleData selectCurrentExam(String userCode) { - // TODO Auto-generated method stub - return examTitleDataMapper.selectCurrentExam(userCode); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamUserScoreServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamUserScoreServiceImpl.java deleted file mode 100644 index eed3abc..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/onlineexam/service/impl/ExamUserScoreServiceImpl.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.hig.onlineexam.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.onlineexam.mapper.ExamUserScoreMapper; -import com.hig.onlineexam.domain.ExamUserScore; -import com.hig.onlineexam.service.IExamUserScoreService; - -/** - * 考试成绩Service业务层处理 - * - * @author qnsdt - * @date 2023-03-03 - */ -@Service -public class ExamUserScoreServiceImpl implements IExamUserScoreService -{ - @Autowired - private ExamUserScoreMapper examUserScoreMapper; - - /** - * 查询考试成绩 - * - * @param examCode 考试成绩ID - * @return 考试成绩 - */ - @Override - public ExamUserScore selectExamUserScoreById(String examCode) - { - return examUserScoreMapper.selectExamUserScoreById(examCode); - } - - /** - * 查询考试成绩列表 - * - * @param examUserScore 考试成绩 - * @return 考试成绩 - */ - @Override - public List selectExamUserScoreList(ExamUserScore examUserScore) - { - return examUserScoreMapper.selectExamUserScoreList(examUserScore); - } - - /** - * 新增考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - @Override - public int insertExamUserScore(ExamUserScore examUserScore) - { - return examUserScoreMapper.insertExamUserScore(examUserScore); - } - - /** - * 修改考试成绩 - * - * @param examUserScore 考试成绩 - * @return 结果 - */ - @Override - public int updateExamUserScore(ExamUserScore examUserScore) - { - return examUserScoreMapper.updateExamUserScore(examUserScore); - } - - /** - * 批量删除考试成绩 - * - * @param examCodes 需要删除的考试成绩ID - * @return 结果 - */ - @Override - public int deleteExamUserScoreByIds(String[] examCodes) - { - return examUserScoreMapper.deleteExamUserScoreByIds(examCodes); - } - - /** - * 删除考试成绩信息 - * - * @param examCode 考试成绩ID - * @return 结果 - */ - @Override - public int deleteExamUserScoreById(String examCode) - { - return examUserScoreMapper.deleteExamUserScoreById(examCode); - } - - @Override - public int intoExamUserScore(ExamUserScore examUserScore) { - // TODO Auto-generated method stub - // 安全删除 - examUserScoreMapper.deleteExamUserScore(examUserScore); - return examUserScoreMapper.intoExamUserScore(examUserScore); - } - - @Override - public int deleteExamUserScore(ExamUserScore examUserScore) { - // TODO Auto-generated method stub - return examUserScoreMapper.deleteExamUserScore(examUserScore); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamBankPictureController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamBankPictureController.java deleted file mode 100644 index a5d5521..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamBankPictureController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.hig.questions.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.questions.domain.ExamBankPicture; -import com.hig.questions.service.IExamBankPictureService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 题库图片Controller - * - * @author qnsdt - * @date 2022-12-22 - */ -@RestController -@RequestMapping("/questions/bankpicture") -public class ExamBankPictureController extends BaseController -{ - @Autowired - private IExamBankPictureService examBankPictureService; - - /** - * 查询题库图片列表 - */ - @PreAuthorize("@ss.hasPermi('questions:bankpicture:list')") - @GetMapping("/list") - public TableDataInfo list(ExamBankPicture examBankPicture) - { - startPage(); - List list = examBankPictureService.selectExamBankPictureList(examBankPicture); - return getDataTable(list); - } - - /** - * 导出题库图片列表 - */ - @PreAuthorize("@ss.hasPermi('questions:bankpicture:export')") - @Log(title = "题库图片", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamBankPicture examBankPicture) - { - List list = examBankPictureService.selectExamBankPictureList(examBankPicture); - ExcelUtil util = new ExcelUtil(ExamBankPicture.class); - return util.exportExcel(list, "题库图片数据"); - } - - /** - * 获取题库图片详细信息 - */ - @PreAuthorize("@ss.hasPermi('questions:bankpicture:query')") - @GetMapping(value = "/{photoCode}") - public AjaxResult getInfo(@PathVariable("photoCode") String photoCode) - { - return AjaxResult.success(examBankPictureService.selectExamBankPictureById(photoCode)); - } - - /** - * 新增题库图片 - */ - @PreAuthorize("@ss.hasPermi('questions:bankpicture:add')") - @Log(title = "题库图片", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ExamBankPicture examBankPicture) - { - return toAjax(examBankPictureService.insertExamBankPicture(examBankPicture)); - } - - /** - * 修改题库图片 - */ - @PreAuthorize("@ss.hasPermi('questions:bankpicture:edit')") - @Log(title = "题库图片", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ExamBankPicture examBankPicture) - { - return toAjax(examBankPictureService.updateExamBankPicture(examBankPicture)); - } - - /** - * 删除题库图片 - */ - @PreAuthorize("@ss.hasPermi('questions:bankpicture:remove')") - @Log(title = "题库图片", businessType = BusinessType.DELETE) - @DeleteMapping("/{photoCodes}") - public AjaxResult remove(@PathVariable String[] photoCodes) - { - return toAjax(examBankPictureService.deleteExamBankPictureByIds(photoCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsAnswerController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsAnswerController.java deleted file mode 100644 index 8ba22c9..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsAnswerController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.hig.questions.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.questions.domain.ExamQuestionsAnswer; -import com.hig.questions.service.IExamQuestionsAnswerService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 考试题目答案Controller - * - * @author qnsdt - * @date 2022-12-29 - */ -@RestController -@RequestMapping("/questions/answer") -public class ExamQuestionsAnswerController extends BaseController -{ - @Autowired - private IExamQuestionsAnswerService examQuestionsAnswerService; - - /** - * 查询考试题目答案列表 - */ - @GetMapping("/list") - public TableDataInfo list(ExamQuestionsAnswer examQuestionsAnswer) - { - startPage(); - List list = examQuestionsAnswerService.selectExamQuestionsAnswerList(examQuestionsAnswer); - return getDataTable(list); - } - - @GetMapping("/optionlist/{questionsCode}") - public AjaxResult optionList(@PathVariable("questionsCode") String questionsCode) - { - List list = examQuestionsAnswerService.selectExamQuestionsOptionList(questionsCode); - return AjaxResult.success(list); - } - - /** - * 导出考试题目答案列表 - */ - @PreAuthorize("@ss.hasPermi('questions:answer:export')") - @Log(title = "考试题目答案", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamQuestionsAnswer examQuestionsAnswer) - { - List list = examQuestionsAnswerService.selectExamQuestionsAnswerList(examQuestionsAnswer); - ExcelUtil util = new ExcelUtil(ExamQuestionsAnswer.class); - return util.exportExcel(list, "考试题目答案数据"); - } - - /** - * 获取考试题目答案详细信息 - */ - @PreAuthorize("@ss.hasPermi('questions:answer:query')") - @GetMapping(value = "/{questionsCode}") - public AjaxResult getInfo(@PathVariable("questionsCode") String questionsCode) - { - return AjaxResult.success(examQuestionsAnswerService.selectExamQuestionsAnswerById(questionsCode)); - } - - /** - * 新增考试题目答案 - */ - @PreAuthorize("@ss.hasPermi('questions:answer:add')") - @Log(title = "考试题目答案", businessType = BusinessType.INSERT) - @PostMapping("/add") - public AjaxResult add(@RequestBody ExamQuestionsAnswer examQuestionsAnswer) - { - return toAjax(examQuestionsAnswerService.insertExamQuestionsAnswer(examQuestionsAnswer)); - } - - /** - * 修改考试题目答案 - */ - @PreAuthorize("@ss.hasPermi('questions:answer:edit')") - @Log(title = "考试题目答案", businessType = BusinessType.UPDATE) - @PostMapping("/update") - public AjaxResult edit(@RequestBody ExamQuestionsAnswer examQuestionsAnswer) - { - return toAjax(examQuestionsAnswerService.updateExamQuestionsAnswer(examQuestionsAnswer)); - } - - /** - * 删除考试题目答案 - */ - @PreAuthorize("@ss.hasPermi('questions:answer:remove')") - @Log(title = "考试题目答案", businessType = BusinessType.DELETE) - @GetMapping("/delete/{questionsCodes}") - public AjaxResult remove(@PathVariable String[] questionsCodes) - { - return toAjax(examQuestionsAnswerService.deleteExamQuestionsAnswerByIds(questionsCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsBankController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsBankController.java deleted file mode 100644 index 7c96d3d..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsBankController.java +++ /dev/null @@ -1,210 +0,0 @@ -package com.hig.questions.controller; - -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.cms.utils.FileUpload; -import com.hig.questions.domain.ExamBankPicture; -import com.hig.questions.domain.ExamQuestionsBank; -import com.hig.questions.service.IExamBankPictureService; -import com.hig.questions.service.IExamQuestionsBankService; -import com.hig.utils.UUIDGenerator; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 题库管理Controller - * - * @author qnsdt - * @date 2022-12-19 - */ -@RestController -@RequestMapping("/questions/questionsbank") -public class ExamQuestionsBankController extends BaseController -{ - private static final Logger log = LoggerFactory.getLogger(ExamQuestionsBankController.class); - - @Value("${cms.exam.photo-path:/photo/exam}") - private String photopath; - - @Autowired - private IExamQuestionsBankService examQuestionsBankService; - - @Autowired - private TokenService tokenService; - - @Autowired - private IExamBankPictureService examBankPictureService; - - /** - * 查询题库管理列表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsbank:list')") - @GetMapping("/list") - public TableDataInfo list(ExamQuestionsBank examQuestionsBank) - { - startPage(); - List list = examQuestionsBankService.selectExamQuestionsBankList(examQuestionsBank); - return getDataTable(list); - } - - @GetMapping("/arraylist/{bankCodes}") - public AjaxResult arrayList(@PathVariable("bankCodes") String bankCodes) - { - // startPage(); - // log.debug("bankCodes: {}", bankCodes); - List list = examQuestionsBankService.selectExamQuestionsBankListByCode(bankCodes.split(",")); - return AjaxResult.success(list); - } - - /** - * 导出题库管理列表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsbank:export')") - @Log(title = "题库管理", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamQuestionsBank examQuestionsBank) - { - List list = examQuestionsBankService.selectExamQuestionsBankList(examQuestionsBank); - ExcelUtil util = new ExcelUtil(ExamQuestionsBank.class); - return util.exportExcel(list, "题库管理数据"); - } - - /** - * 导入题库管理数据 - */ - @Log(title = "题库管理", businessType = BusinessType.IMPORT) - @PreAuthorize("@ss.hasPermi('questions:questionsbank:import')") - @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception - { - ExcelUtil util = new ExcelUtil(ExamQuestionsBank.class); - List examQuestionsBankList = util.importExcel(file.getInputStream()); - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - String operName = loginUser.getUsername(); - String message = examQuestionsBankService.importExamQuestionsBank(examQuestionsBankList, updateSupport, operName); - return AjaxResult.success(message); - } - - /** - * 下载题库管理导入模板 - */ - @GetMapping("/importTemplate") - public AjaxResult importTemplate() - { - ExcelUtil util = new ExcelUtil(ExamQuestionsBank.class); - return util.importTemplateExcel("题库管理数据"); - } - - /** - * 获取题库管理详细信息 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsbank:query')") - @GetMapping(value = "/{bankCode}") - public AjaxResult getInfo(@PathVariable("bankCode") String bankCode) - { - return AjaxResult.success(examQuestionsBankService.selectExamQuestionsBankById(bankCode)); - } - - /** - * 新增题库管理 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsbank:add')") - @Log(title = "题库管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ExamQuestionsBank examQuestionsBank) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - log.debug("用户名: {}", loginUser.getUser().getUserName()); - log.debug("部门ID: {}", loginUser.getUser().getDept().getDeptId()); - examQuestionsBank.setCreateBy(loginUser.getUser().getUserName()); - examQuestionsBank.setCreateDept(loginUser.getUser().getDept().getDeptId()); - examQuestionsBank.setBankCode(UUIDGenerator.generate()); - - log.debug("examQuestionsBank: {}", examQuestionsBank.toString()); - return toAjax(examQuestionsBankService.insertExamQuestionsBank(examQuestionsBank)); - } - - /** - * 修改题库管理 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsbank:edit')") - @Log(title = "题库管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ExamQuestionsBank examQuestionsBank) - { - log.debug("examQuestionsBank: {}", examQuestionsBank.toString()); - return toAjax(examQuestionsBankService.updateExamQuestionsBank(examQuestionsBank)); - } - - /** - * 删除题库管理 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsbank:remove')") - @Log(title = "题库管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{bankCodes}") - public AjaxResult remove(@PathVariable String[] bankCodes) - { - return toAjax(examQuestionsBankService.deleteExamQuestionsBankByIds(bankCodes)); - } - - /** - * 新增参数配置 - */ - @PostMapping("/uploadphoto/{bankcode}") - public AjaxResult uploadPhoto(@PathVariable String bankcode, - @RequestParam("file") MultipartFile file) - { - // 取得原始文件名 - String originalfile = file.getOriginalFilename(); - - // 拼接路径 - String path = RuoYiConfig.getProfile() + photopath; - log.debug("拼接路径为: {}", path); - String filename = FileUpload.writeUploadFile(file,path); - String fileurl = photopath + "/" + filename; - log.debug("fileurl: {}", fileurl); - - - int count = 0; - - // 相应赋值 - ExamBankPicture examBankPicture = new ExamBankPicture(bankcode, path, fileurl, filename, originalfile); - - log.debug("examBankPicture: {}", examBankPicture.toString()); - - try - { - examBankPictureService.deleteExamBankPictureById(bankcode); - count = examBankPictureService.insertExamBankPicture(examBankPicture); - } - catch(Exception e) - { - return AjaxResult.error(e.getMessage()); - } - - return AjaxResult.success(examBankPicture); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsContentController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsContentController.java deleted file mode 100644 index b15e102..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsContentController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.hig.questions.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.questions.domain.ExamQuestionsContent; -import com.hig.questions.service.IExamQuestionsContentService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 题目内容表Controller - * - * @author qnsdt - * @date 2022-12-28 - */ -@RestController -@RequestMapping("/questions/questionscontent") -public class ExamQuestionsContentController extends BaseController -{ - @Autowired - private IExamQuestionsContentService examQuestionsContentService; - - /** - * 查询题目内容表列表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionscontent:list')") - @GetMapping("/list") - public TableDataInfo list(ExamQuestionsContent examQuestionsContent) - { - startPage(); - List list = examQuestionsContentService.selectExamQuestionsContentList(examQuestionsContent); - return getDataTable(list); - } - - /** - * 导出题目内容表列表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionscontent:export')") - @Log(title = "题目内容表", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamQuestionsContent examQuestionsContent) - { - List list = examQuestionsContentService.selectExamQuestionsContentList(examQuestionsContent); - ExcelUtil util = new ExcelUtil(ExamQuestionsContent.class); - return util.exportExcel(list, "题目内容表数据"); - } - - /** - * 获取题目内容表详细信息 - */ - @GetMapping(value = "/{questionsCode}") - public AjaxResult getInfo(@PathVariable("questionsCode") String questionsCode) - { - return AjaxResult.success(examQuestionsContentService.selectExamQuestionsContentById(questionsCode)); - } - - /** - * 新增题目内容表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionscontent:add')") - @Log(title = "题目内容表", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ExamQuestionsContent examQuestionsContent) - { - return toAjax(examQuestionsContentService.insertExamQuestionsContent(examQuestionsContent)); - } - - /** - * 修改题目内容表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionscontent:edit')") - @Log(title = "题目内容表", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ExamQuestionsContent examQuestionsContent) - { - return toAjax(examQuestionsContentService.updateExamQuestionsContent(examQuestionsContent)); - } - - /** - * 删除题目内容表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionscontent:remove')") - @Log(title = "题目内容表", businessType = BusinessType.DELETE) - @DeleteMapping("/{questionsCodes}") - public AjaxResult remove(@PathVariable String[] questionsCodes) - { - return toAjax(examQuestionsContentService.deleteExamQuestionsContentByIds(questionsCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsController.java deleted file mode 100644 index 43f7f94..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsController.java +++ /dev/null @@ -1,268 +0,0 @@ -package com.hig.questions.controller; - -import java.util.*; - -import com.ruoyi.common.utils.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.questions.domain.ExamQuestions; -import com.hig.questions.domain.ExamQuestionsAnswer; -import com.hig.questions.domain.ExamQuestionsContent; -import com.hig.questions.domain.ExamQuestionsProperty; -import com.hig.questions.service.IExamQuestionsAnswerService; -import com.hig.questions.service.IExamQuestionsContentService; -import com.hig.questions.service.IExamQuestionsPropertyService; -import com.hig.questions.service.IExamQuestionsService; -import com.hig.utils.UUIDGenerator; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 考试题目Controller - * - * @author qnsdt - * @date 2022-12-28 - */ -@RestController -@RequestMapping("/questions/examquestions") -public class ExamQuestionsController extends BaseController -{ - private static final Logger log = LoggerFactory.getLogger(ExamQuestionsController.class); - - @Autowired - private IExamQuestionsService examQuestionsService; - - @Autowired - private TokenService tokenService; - - @Autowired - private IExamQuestionsAnswerService examQuestionsAnswerService; - - @Autowired - private IExamQuestionsContentService examQuestionsContentService; - - @Autowired - private IExamQuestionsPropertyService examQuestionsPropertyService; - - /** - * 查询考试题目列表 - */ - @PreAuthorize("@ss.hasPermi('questions:examquestions:list')") - @GetMapping("/list") - public TableDataInfo list(ExamQuestions examQuestions) - { - startPage(); - List list = examQuestionsService.selectExamQuestionsList(examQuestions); - return getDataTable(list); - } - - /** - * 导出考试题目列表 - */ - @PreAuthorize("@ss.hasPermi('questions:examquestions:export')") - @Log(title = "考试题目", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamQuestions examQuestions) - { - List list = examQuestionsService.selectExamQuestionsList(examQuestions); - ExcelUtil util = new ExcelUtil(ExamQuestions.class); - return util.exportExcel(list, "考试题目数据"); - } - - /** - * 导入考试题目数据 - */ - @Log(title = "考试题目", businessType = BusinessType.IMPORT) - @PreAuthorize("@ss.hasPermi('questions:examquestions:import')") - @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport,String bankCode) throws Exception - { - ExcelUtil util = new ExcelUtil(ExamQuestions.class); - List examQuestionsList = util.importExcel(file.getInputStream()); - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - String operName = loginUser.getUsername(); - List examQuestions=new ArrayList<>(); - examQuestionsList.forEach(x->{ - x.setBankCode(bankCode); - String tmp= x.getQuestionsTypeStr(); - boolean flag=false; - if("判断题".equals(tmp)){ - x.setQuestionsType(1); - flag=true; - } - if("单选题".equals(tmp)){ - x.setQuestionsType(2); - flag=true; - } - if("多选题".equals(tmp)){ - x.setQuestionsType(3); - flag=true; - } - if(flag){ - examQuestions.add(x); - } - if(StringUtils.isEmpty(x.getRateNumberStr())){ - x.setRateNumber(0); - }else{ - x.setRateNumber(x.getRateNumberStr().length()/2); - } - x.setCreateBy(operName); - x.setCreateTime(new Date()); - x.setQuestionsCode(UUID.randomUUID().toString()); - }); - if(CollectionUtils.isEmpty(examQuestions)){ - return AjaxResult.error("导入数据为空！"); - } - - String message = examQuestionsService.importExamQuestions(examQuestions, updateSupport, operName); - return AjaxResult.success(message); - } - - /** - * 下载考试题目导入模板 - */ - @GetMapping("/importTemplate") - public AjaxResult importTemplate() - { - ExcelUtil util = new ExcelUtil(ExamQuestions.class); - return util.importTemplateExcel("考试题目数据"); - } - - /** - * 获取考试题目详细信息 - */ - @PreAuthorize("@ss.hasPermi('questions:examquestions:query')") - @GetMapping(value = "/{questionsCode}") - public AjaxResult getInfo(@PathVariable("questionsCode") String questionsCode) - { - return AjaxResult.success(examQuestionsService.selectExamQuestionsById(questionsCode)); - } - - /** - * 新增考试题目 - */ - @PreAuthorize("@ss.hasPermi('questions:examquestions:add')") - @Log(title = "考试题目", businessType = BusinessType.INSERT) - @PostMapping("/add") - public AjaxResult add(@RequestBody ExamQuestions examQuestions) - { - // 取得用户单位 - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - examQuestions.setCreateBy(loginUser.getUser().getUserName()); - examQuestions.setCreateDept(loginUser.getUser().getDept().getDeptId()); - List answerList = examQuestions.getAnswerList(); - - ExamQuestionsProperty examQuestionsProperty = new ExamQuestionsProperty(examQuestions.getBankCode(),null,examQuestions.getQuestionsCode(),examQuestions.getQuestionsTitle(), - examQuestions.getQuestionsType(),examQuestions.getQuestionsScore(),examQuestions.getRateNumber(),examQuestions.getRightAnswer(),examQuestions.getAnswerAnalyse(), - 0,examQuestions.getCreateBy(), examQuestions.getCreateDept()); - - ExamQuestionsContent examQuestionsContent = new ExamQuestionsContent(examQuestions.getQuestionsCode(), examQuestions.getQuestionsContent()); - - log.debug("examQuestionsContent: {}", examQuestionsContent.toString()); - - // 开始保存数据 - - // 保存题目选项 - // 安全删除 - examQuestionsAnswerService.deleteExamQuestionsAnswerById(examQuestions.getQuestionsCode()); - for (ExamQuestionsAnswer questionsAnswer: answerList) { - questionsAnswer.setOrderId(null); - examQuestionsAnswerService.insertExamQuestionsAnswer(questionsAnswer); - } - - // 保存题目数据 - int count = 0; - examQuestionsContentService.deleteExamQuestionsContentById(examQuestions.getQuestionsCode()); - - count = examQuestionsContentService.insertExamQuestionsContent(examQuestionsContent); - - if (count == 0) { - return new AjaxResult(0,"更新题目信息出错!"); - } - - - // 安全删除 - examQuestionsPropertyService.deleteExamQuestionsPropertyById(examQuestions.getQuestionsCode()); - - return toAjax(examQuestionsPropertyService.insertExamQuestionsProperty(examQuestionsProperty)); - } - - /** - * 修改考试题目 - */ - @PreAuthorize("@ss.hasPermi('questions:examquestions:edit')") - @Log(title = "考试题目", businessType = BusinessType.UPDATE) - @PostMapping("/update") - public AjaxResult edit(@RequestBody ExamQuestions examQuestions) - { - List answerList = examQuestions.getAnswerList(); - - ExamQuestionsProperty examQuestionsProperty = new ExamQuestionsProperty(examQuestions.getBankCode(),null,examQuestions.getQuestionsCode(),examQuestions.getQuestionsTitle(), - examQuestions.getQuestionsType(),examQuestions.getQuestionsScore(),examQuestions.getRateNumber(),examQuestions.getRightAnswer(),examQuestions.getAnswerAnalyse(), - 0,examQuestions.getCreateBy(), examQuestions.getCreateDept()); - - ExamQuestionsContent examQuestionsContent = new ExamQuestionsContent(examQuestions.getQuestionsCode(), examQuestions.getQuestionsContent()); - - - // 开始保存数据 - - // 保存题目选项 - // 安全删除 - examQuestionsAnswerService.deleteExamQuestionsAnswerById(examQuestions.getQuestionsCode()); - for (ExamQuestionsAnswer questionsAnswer: answerList) { - examQuestionsAnswerService.insertExamQuestionsAnswer(questionsAnswer); - } - - // 保存题目数据 - int count = 0; - examQuestionsContentService.deleteExamQuestionsContentById(examQuestions.getQuestionsCode()); - - count = examQuestionsContentService.insertExamQuestionsContent(examQuestionsContent); - - if (count == 0) { - return new AjaxResult(0,"更新题目信息出错!"); - } - - - return toAjax(examQuestionsPropertyService.updateExamQuestionsProperty(examQuestionsProperty)); - - } - - /** - * 删除考试题目 - */ - @PreAuthorize("@ss.hasPermi('questions:examquestions:remove')") - @Log(title = "考试题目", businessType = BusinessType.DELETE) - @GetMapping("/delete/{questionsCodes}") - public AjaxResult remove(@PathVariable String[] questionsCodes) - { - int count = questionsCodes.length; - for (String questionsCode: questionsCodes) { - examQuestionsAnswerService.deleteExamQuestionsAnswerById(questionsCode); - examQuestionsContentService.deleteExamQuestionsContentById(questionsCode); - examQuestionsPropertyService.deleteExamQuestionsPropertyById(questionsCode); - } - - - return toAjax(count); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsListController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsListController.java deleted file mode 100644 index 6e0113b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsListController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hig.questions.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.questions.domain.ExamQuestionsList; -import com.hig.questions.domain.ExamQuestionsProperty; -import com.hig.questions.service.IExamQuestionsListService; -import com.hig.questions.service.IExamQuestionsPropertyService; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 题目属性Controller - * - * @author qnsdt - * @date 2022-12-28 - */ -@RestController -@RequestMapping("/questions/questionslist") -public class ExamQuestionsListController extends BaseController -{ - @Autowired - private IExamQuestionsListService examQuestionsListService; - - @Autowired - private TokenService tokenService; - - /** - * 查询题目属性列表 - */ - @GetMapping("/list") - public TableDataInfo list(ExamQuestionsList examQuestionsList) - { - startPage(); - List list = examQuestionsListService.selectExamQuestionsList(examQuestionsList.getBankCodes()); - return getDataTable(list); - } - - @GetMapping("/selectlist/{examCode}") - public AjaxResult selectList(@PathVariable("examCode") String examCode) - { - List list = examQuestionsListService.selectChoiceExamQuestionsList(examCode); - return AjaxResult.success(list); - } - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsPropertyController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsPropertyController.java deleted file mode 100644 index a2353f2..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamQuestionsPropertyController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hig.questions.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.questions.domain.ExamQuestionsProperty; -import com.hig.questions.service.IExamQuestionsPropertyService; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 题目属性Controller - * - * @author qnsdt - * @date 2022-12-28 - */ -@RestController -@RequestMapping("/questions/questionsproperty") -public class ExamQuestionsPropertyController extends BaseController -{ - @Autowired - private IExamQuestionsPropertyService examQuestionsPropertyService; - - @Autowired - private TokenService tokenService; - - /** - * 查询题目属性列表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsproperty:list')") - @GetMapping("/list") - public TableDataInfo list(ExamQuestionsProperty examQuestionsProperty) - { - startPage(); - List list = examQuestionsPropertyService.selectExamQuestionsPropertyList(examQuestionsProperty); - return getDataTable(list); - } - - /** - * 导出题目属性列表 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsproperty:export')") - @Log(title = "题目属性", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamQuestionsProperty examQuestionsProperty) - { - List list = examQuestionsPropertyService.selectExamQuestionsPropertyList(examQuestionsProperty); - ExcelUtil util = new ExcelUtil(ExamQuestionsProperty.class); - return util.exportExcel(list, "题目属性数据"); - } - - /** - * 获取题目属性详细信息 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsproperty:query')") - @GetMapping(value = "/{questionsCode}") - public AjaxResult getInfo(@PathVariable("questionsCode") String questionsCode) - { - return AjaxResult.success(examQuestionsPropertyService.selectExamQuestionsPropertyById(questionsCode)); - } - - /** - * 新增题目属性 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsproperty:add')") - @Log(title = "题目属性", businessType = BusinessType.INSERT) - @PostMapping("/add") - public AjaxResult add(@RequestBody ExamQuestionsProperty examQuestionsProperty) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - examQuestionsProperty.setCreateBy(loginUser.getUser().getUserName()); - examQuestionsProperty.setCreateDept(loginUser.getUser().getDept().getDeptId()); - - return toAjax(examQuestionsPropertyService.insertExamQuestionsProperty(examQuestionsProperty)); - } - - /** - * 修改题目属性 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsproperty:edit')") - @Log(title = "题目属性", businessType = BusinessType.UPDATE) - @PostMapping("/update") - public AjaxResult edit(@RequestBody ExamQuestionsProperty examQuestionsProperty) - { - return toAjax(examQuestionsPropertyService.updateExamQuestionsProperty(examQuestionsProperty)); - } - - /** - * 删除题目属性 - */ - @PreAuthorize("@ss.hasPermi('questions:questionsproperty:remove')") - @Log(title = "题目属性", businessType = BusinessType.DELETE) - @GetMapping("/delete/{questionsCodes}") - public AjaxResult remove(@PathVariable String[] questionsCodes) - { - return toAjax(examQuestionsPropertyService.deleteExamQuestionsPropertyByIds(questionsCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamTypeController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamTypeController.java deleted file mode 100644 index 45831d6..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/controller/ExamTypeController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.hig.questions.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.questions.domain.ExamType; -import com.hig.questions.service.IExamTypeService; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; - -/** - * 考试分类Controller - * - * @author qnsdt - * @date 2022-12-14 - */ -@RestController -@RequestMapping("/questions/examtype") -public class ExamTypeController extends BaseController -{ - @Autowired - private IExamTypeService examTypeService; - - @Autowired - private TokenService tokenService; - - /** - * 查询考试分类列表 - */ - @PreAuthorize("@ss.hasPermi('questions:examtype:list')") - @GetMapping("/list") - public AjaxResult list(ExamType examType) - { - List list = examTypeService.selectExamTypeList(examType); - return AjaxResult.success(list); - } - - /** - * 导出考试分类列表 - */ - @PreAuthorize("@ss.hasPermi('questions:examtype:export')") - @Log(title = "考试分类", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(ExamType examType) - { - List list = examTypeService.selectExamTypeList(examType); - ExcelUtil util = new ExcelUtil(ExamType.class); - return util.exportExcel(list, "考试分类数据"); - } - - /** - * 获取部门下拉树列表 - */ - @GetMapping("/typetreeselect") - public AjaxResult treeselect(ExamType examType) - { - List list = examTypeService.selectExamTypeList(examType); - return AjaxResult.success(examTypeService.buildTypeTreeSelect(list)); - } - /** - * 获取考试分类详细信息 - */ - @PreAuthorize("@ss.hasPermi('questions:examtype:query')") - @GetMapping(value = "/{typeId}") - public AjaxResult getInfo(@PathVariable("typeId") Long typeId) - { - return AjaxResult.success(examTypeService.selectExamTypeById(typeId)); - } - - /** - * 新增考试分类 - */ - @PreAuthorize("@ss.hasPermi('questions:examtype:add')") - @Log(title = "考试分类", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ExamType examType) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - // System.out.println("loginUser:" + loginUser.toString()); - examType.setCreateBy(loginUser.getUser().getUserName()); - return toAjax(examTypeService.insertExamType(examType)); - } - - /** - * 修改考试分类 - */ - @PreAuthorize("@ss.hasPermi('questions:examtype:edit')") - @Log(title = "考试分类", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ExamType examType) - { - return toAjax(examTypeService.updateExamType(examType)); - } - - /** - * 删除考试分类 - */ - @PreAuthorize("@ss.hasPermi('questions:examtype:remove')") - @Log(title = "考试分类", businessType = BusinessType.DELETE) - @DeleteMapping("/{typeIds}") - public AjaxResult remove(@PathVariable Long[] typeIds) - { - return toAjax(examTypeService.deleteExamTypeByIds(typeIds)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamBankPicture.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamBankPicture.java deleted file mode 100644 index 8e23240..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamBankPicture.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.hig.questions.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 题库图片对象 exam_bank_picture - * - * @author qnsdt - * @date 2022-12-22 - */ -public class ExamBankPicture extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 图片序号 */ - @Excel(name = "图片序号") - private Long photoId; - - /** 图片代码 */ - @Excel(name = "图片代码") - private String photoCode; - - /** 文档代码 */ - @Excel(name = "文档代码") - private String photoPath; - - /** 图片链接 */ - @Excel(name = "图片链接") - private String photoUrl; - - /** 文件名称 */ - @Excel(name = "文件名称") - private String fileName; - - /** 原始名称 */ - @Excel(name = "原始名称") - private String originalName; - - /** 状态 */ - @Excel(name = "状态") - private Long status; - - public void setPhotoId(Long photoId) - { - this.photoId = photoId; - } - - public Long getPhotoId() - { - return photoId; - } - public void setPhotoCode(String photoCode) - { - this.photoCode = photoCode; - } - - public String getPhotoCode() - { - return photoCode; - } - public void setPhotoPath(String photoPath) - { - this.photoPath = photoPath; - } - - public String getPhotoPath() - { - return photoPath; - } - public void setPhotoUrl(String photoUrl) - { - this.photoUrl = photoUrl; - } - - public String getPhotoUrl() - { - return photoUrl; - } - public void setFileName(String fileName) - { - this.fileName = fileName; - } - - public String getFileName() - { - return fileName; - } - public void setOriginalName(String originalName) - { - this.originalName = originalName; - } - - public String getOriginalName() - { - return originalName; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - - - public ExamBankPicture(String photoCode, String photoPath, String photoUrl, String fileName, String originalName) { - super(); - this.photoCode = photoCode; - this.photoPath = photoPath; - this.photoUrl = photoUrl; - this.fileName = fileName; - this.originalName = originalName; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("photoId", getPhotoId()) - .append("photoCode", getPhotoCode()) - .append("photoPath", getPhotoPath()) - .append("photoUrl", getPhotoUrl()) - .append("fileName", getFileName()) - .append("originalName", getOriginalName()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("status", getStatus()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestions.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestions.java deleted file mode 100644 index 2044748..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestions.java +++ /dev/null @@ -1,346 +0,0 @@ -package com.hig.questions.domain; - -import java.util.List; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 考试题目对象 exam_questions - * - * @author qnsdt - * @date 2022-12-28 - */ -public class ExamQuestions extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 题库代码 */ - @Excel(name = "题库代码") - private String bankCode; - - /** 试题id */ - @Excel(name = "试题id") - private Long questionsId; - - /** 试题代码 */ - private String questionsCode; - - /** 试题题目 */ - @Excel(name = "试题题目") - private String questionsTitle; - - /** 试题内容 */ - @Excel(name = "试题内容") - private String questionsContent; - - /** 试题类型 */ - @Excel(name = "试题类型") - private String questionsTypeStr; - - private Integer questionsType; - - /** 题目分数 */ - @Excel(name = "题目分数") - private Integer questionsScore; - - /** 复杂度 */ - @Excel(name = "复杂度") - private String rateNumberStr; - private Integer rateNumber; - - /** 复杂度 */ - @Excel(name = "A") - private String answerA; - - /** 复杂度 */ - @Excel(name = "B") - private String answerB; - - /** 复杂度 */ - @Excel(name = "C") - private String answerC; - - /** 复杂度 */ - @Excel(name = "D") - private String answerD; - - /** 复杂度 */ - @Excel(name = "E") - private String answerE; - - /** 复杂度 */ - @Excel(name = "F") - private String answerF; - - /** 复杂度 */ - @Excel(name = "G") - private String answerG; - - /** 复杂度 */ - @Excel(name = "H") - private String answerH; - - /** 复杂度 */ - @Excel(name = "I") - private String answerI; - - /** 复杂度 */ - @Excel(name = "J") - private String answerJ; - - /** 正确答案 */ - @Excel(name = "正确答案") - private String rightAnswer; - - /** 答案分析 */ - @Excel(name = "答案分析") - private String answerAnalyse; - - /** 状态 */ - @Excel(name = "状态") - private Integer status; - - /** 创建部门 */ - @Excel(name = "创建部门") - private Long createDept; - - /** 题目选项 */ - private List answerList ; - - public String getQuestionsTypeStr() { - return questionsTypeStr; - } - - public void setQuestionsTypeStr(String questionsTypeStr) { - this.questionsTypeStr = questionsTypeStr; - } - - public String getRateNumberStr() { - return rateNumberStr; - } - - public void setRateNumberStr(String rateNumberStr) { - this.rateNumberStr = rateNumberStr; - } - - public String getAnswerA() { - return answerA; - } - - public void setAnswerA(String answerA) { - this.answerA = answerA; - } - - public String getAnswerB() { - return answerB; - } - - public void setAnswerB(String answerB) { - this.answerB = answerB; - } - - public String getAnswerC() { - return answerC; - } - - public void setAnswerC(String answerC) { - this.answerC = answerC; - } - - public String getAnswerD() { - return answerD; - } - - public void setAnswerD(String answerD) { - this.answerD = answerD; - } - - public String getAnswerE() { - return answerE; - } - - public void setAnswerE(String answerE) { - this.answerE = answerE; - } - - public String getAnswerF() { - return answerF; - } - - public void setAnswerF(String answerF) { - this.answerF = answerF; - } - - public String getAnswerG() { - return answerG; - } - - public void setAnswerG(String answerG) { - this.answerG = answerG; - } - - public String getAnswerH() { - return answerH; - } - - public void setAnswerH(String answerH) { - this.answerH = answerH; - } - - public String getAnswerI() { - return answerI; - } - - public void setAnswerI(String answerI) { - this.answerI = answerI; - } - - public String getAnswerJ() { - return answerJ; - } - - public void setAnswerJ(String answerJ) { - this.answerJ = answerJ; - } - - public List getAnswerList() { - return answerList; - } - - public void setAnswerList(List answerList) { - this.answerList = answerList; - } - - public void setBankCode(String bankCode) - { - this.bankCode = bankCode; - } - - public String getBankCode() - { - return bankCode; - } - public void setQuestionsId(Long questionsId) - { - this.questionsId = questionsId; - } - - public Long getQuestionsId() - { - return questionsId; - } - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setQuestionsTitle(String questionsTitle) - { - this.questionsTitle = questionsTitle; - } - - public String getQuestionsTitle() - { - return questionsTitle; - } - public void setQuestionsContent(String questionsContent) - { - this.questionsContent = questionsContent; - } - - public String getQuestionsContent() - { - return questionsContent; - } - public void setQuestionsType(Integer questionsType) - { - this.questionsType = questionsType; - } - - public Integer getQuestionsType() - { - return questionsType; - } - public void setQuestionsScore(Integer questionsScore) - { - this.questionsScore = questionsScore; - } - - public Integer getQuestionsScore() - { - return questionsScore; - } - public void setRateNumber(Integer rateNumber) - { - this.rateNumber = rateNumber; - } - - public Integer getRateNumber() - { - return rateNumber; - } - public void setRightAnswer(String rightAnswer) - { - this.rightAnswer = rightAnswer; - } - - public String getRightAnswer() - { - return rightAnswer; - } - public void setAnswerAnalyse(String answerAnalyse) - { - this.answerAnalyse = answerAnalyse; - } - - public String getAnswerAnalyse() - { - return answerAnalyse; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - public void setCreateDept(Long createDept) - { - this.createDept = createDept; - } - - public Long getCreateDept() - { - return createDept; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("bankCode", getBankCode()) - .append("questionsId", getQuestionsId()) - .append("questionsCode", getQuestionsCode()) - .append("questionsTitle", getQuestionsTitle()) - .append("questionsContent", getQuestionsContent()) - .append("questionsType", getQuestionsType()) - .append("questionsScore", getQuestionsScore()) - .append("rateNumber", getRateNumber()) - .append("rightAnswer", getRightAnswer()) - .append("answerAnalyse", getAnswerAnalyse()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createDept", getCreateDept()) - .append("createTime", getCreateTime()) - .append("answerList", getAnswerList()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsAnswer.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsAnswer.java deleted file mode 100644 index 52e99e8..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsAnswer.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hig.questions.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 考试题目答案对象 exam_questions_answer - * - * @author qnsdt - * @date 2022-12-29 - */ -public class ExamQuestionsAnswer extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 试题代码 */ - @Excel(name = "试题代码") - private String questionsCode; - - /** 试题选项 */ - @Excel(name = "试题选项") - private String optionCode; - - /** 选项描述 */ - @Excel(name = "选项描述") - private String optionDescribe; - - /** 是否正确 */ - @Excel(name = "是否正确") - private Integer isRight; - - /** 排序编号 */ - @Excel(name = "排序编号") - private Long orderId; - - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setOptionCode(String optionCode) - { - this.optionCode = optionCode; - } - - public String getOptionCode() - { - return optionCode; - } - public void setOptionDescribe(String optionDescribe) - { - this.optionDescribe = optionDescribe; - } - - public String getOptionDescribe() - { - return optionDescribe; - } - public void setIsRight(Integer isRight) - { - this.isRight = isRight; - } - - public Integer getIsRight() - { - return isRight; - } - public void setOrderId(Long orderId) - { - this.orderId = orderId; - } - - public Long getOrderId() - { - return orderId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("questionsCode", getQuestionsCode()) - .append("optionCode", getOptionCode()) - .append("optionDescribe", getOptionDescribe()) - .append("isRight", getIsRight()) - .append("orderId", getOrderId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsBank.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsBank.java deleted file mode 100644 index c37ab8b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsBank.java +++ /dev/null @@ -1,262 +0,0 @@ -package com.hig.questions.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 题库管理对象 exam_questions_bank - * - * @author qnsdt - * @date 2022-12-19 - */ -public class ExamQuestionsBank extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 题库id */ - @Excel(name = "题库id") - private Long bankId; - - /** 题库代码 */ - private String bankCode; - - /** 题库名称 */ - @Excel(name = "题库名称") - private String bankName; - - /** 题库描述 */ - @Excel(name = "题库描述") - private String bankDescribe; - - /** 题库版本 */ - @Excel(name = "题库版本") - private String bankVersion; - - /** 考试类型 */ - // @Excel(name = "考试类型") - private Long examType; - - /** 考试类型 */ - @Excel(name = "考试类型") - private String typeName; - - - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - - /** 上线日期 */ - private Date onlineDate; - - /** 图片链接 */ - @Excel(name = "图片链接") - private String pictureUrl; - - /** 单选题数 */ - @Excel(name = "单选题数") - private int radioNumber; - - - /** 多选题数 */ - @Excel(name = "多选题数") - private int choiceNumber; - - /** 判断题数 */ - @Excel(name = "判断题数") - private int judgeNumber; - - /** 单选分数 */ - @Excel(name = "单选分数") - private double radioScore; - - /** 多选分数 */ - @Excel(name = "多选分数") - private double choiceScore; - - /** 判断分数 */ - @Excel(name = "判断分数") - private double judgeScore; - - /** 状态 */ - @Excel(name = "状态") - private Long status; - - /** 创建部门 */ - private Long createDept; - - public void setBankId(Long bankId) - { - this.bankId = bankId; - } - - public Long getBankId() - { - return bankId; - } - public void setBankCode(String bankCode) - { - this.bankCode = bankCode; - } - - public String getBankCode() - { - return bankCode; - } - public void setBankName(String bankName) - { - this.bankName = bankName; - } - - public String getBankName() - { - return bankName; - } - public void setBankDescribe(String bankDescribe) - { - this.bankDescribe = bankDescribe; - } - - public String getBankDescribe() - { - return bankDescribe; - } - public void setBankVersion(String bankVersion) - { - this.bankVersion = bankVersion; - } - - public String getBankVersion() - { - return bankVersion; - } - public void setExamType(Long examType) - { - this.examType = examType; - } - - public Long getExamType() - { - return examType; - } - public void setOnlineDate(Date onlineDate) - { - this.onlineDate = onlineDate; - } - - public Date getOnlineDate() - { - return onlineDate; - } - public void setPictureUrl(String pictureUrl) - { - this.pictureUrl = pictureUrl; - } - - public String getPictureUrl() - { - return pictureUrl; - } - public void setRadioScore(Long radioScore) - { - this.radioScore = radioScore; - } - - public int getRadioNumber() { - return radioNumber; - } - - public void setRadioNumber(int radioNumber) { - this.radioNumber = radioNumber; - } - - public int getChoiceNumber() { - return choiceNumber; - } - - public void setChoiceNumber(int choiceNumber) { - this.choiceNumber = choiceNumber; - } - - public int getJudgeNumber() { - return judgeNumber; - } - - public void setJudgeNumber(int judgeNumber) { - this.judgeNumber = judgeNumber; - } - - public double getRadioScore() - { - return radioScore; - } - public void setChoiceScore(Long choiceScore) - { - this.choiceScore = choiceScore; - } - - public double getChoiceScore() - { - return choiceScore; - } - public void setJudgeScore(Long judgeScore) - { - this.judgeScore = judgeScore; - } - - public double getJudgeScore() - { - return judgeScore; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setCreateDept(Long createDept) - { - this.createDept = createDept; - } - - public Long getCreateDept() - { - return createDept; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("bankId", getBankId()) - .append("bankCode", getBankCode()) - .append("bankName", getBankName()) - .append("bankDescribe", getBankDescribe()) - .append("bankVersion", getBankVersion()) - .append("examType", getExamType()) - .append("typeName", getTypeName()) - .append("onlineDate", getOnlineDate()) - .append("pictureUrl", getPictureUrl()) - .append("radioNumber", getRadioNumber()) - .append("choiceNumber", getChoiceNumber()) - .append("judgeNumber", getJudgeNumber()) - .append("radioScore", getRadioScore()) - .append("choiceScore", getChoiceScore()) - .append("judgeScore", getJudgeScore()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createDept", getCreateDept()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsContent.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsContent.java deleted file mode 100644 index 254ea82..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsContent.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hig.questions.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 题目内容表对象 exam_questions_content - * - * @author qnsdt - * @date 2022-12-28 - */ -public class ExamQuestionsContent extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 试题代码 */ - @Excel(name = "试题代码") - private String questionsCode; - - /** 试题题目 */ - @Excel(name = "试题题目") - private String questionsContent; - - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setQuestionsContent(String questionsContent) - { - this.questionsContent = questionsContent; - } - - public String getQuestionsContent() - { - return questionsContent; - } - - - public ExamQuestionsContent(String questionsCode, String questionsContent) { - super(); - this.questionsCode = questionsCode; - this.questionsContent = questionsContent; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("questionsCode", getQuestionsCode()) - .append("questionsContent", getQuestionsContent()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsList.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsList.java deleted file mode 100644 index 34841e0..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsList.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.hig.questions.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 题目属性对象 exam_questions_property - * - * @author qnsdt - * @date 2022-12-28 - */ -public class ExamQuestionsList extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - private int rownum; - - public int getRownum() { - return rownum; - } - - public void setRownum(int rownum) { - this.rownum = rownum; - } - - /** 题库代码 */ - @Excel(name = "题库代码") - private String bankCode; - - private String[] bankCodes; - - public String[] getBankCodes() { - return bankCodes; - } - - public void setBankCodes(String[] bankCodes) { - this.bankCodes = bankCodes; - } - - /** 题库名称 */ - @Excel(name = "题库名称") - private String bankName; - - public String getBankName() { - return bankName; - } - - public void setBankName(String bankName) { - this.bankName = bankName; - } - - /** 试题id */ - @Excel(name = "试题id") - private Long questionsId; - - /** 试题代码 */ - private String questionsCode; - - /** 试题题目 */ - @Excel(name = "试题题目") - private String questionsTitle; - - /** 试题类型 */ - @Excel(name = "试题类型") - private Integer questionsType; - - /** 题目分数 */ - @Excel(name = "题目分数") - private Integer questionsScore; - - /** 复杂度 */ - @Excel(name = "复杂度") - private Integer rateNumber; - - /** 正确答案 */ - @Excel(name = "正确答案") - private String rightAnswer; - - /** 答案分析 */ - @Excel(name = "答案分析") - private String answerAnalyse; - - /** 状态 */ - @Excel(name = "状态") - private Integer status; - - private String createBy; - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - /** 创建部门 */ - private Long createDept; - - public void setBankCode(String bankCode) - { - this.bankCode = bankCode; - } - - public String getBankCode() - { - return bankCode; - } - public void setQuestionsId(Long questionsId) - { - this.questionsId = questionsId; - } - - public Long getQuestionsId() - { - return questionsId; - } - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setQuestionsTitle(String questionsTitle) - { - this.questionsTitle = questionsTitle; - } - - public String getQuestionsTitle() - { - return questionsTitle; - } - public void setQuestionsType(Integer questionsType) - { - this.questionsType = questionsType; - } - - public Integer getQuestionsType() - { - return questionsType; - } - public void setQuestionsScore(Integer questionsScore) - { - this.questionsScore = questionsScore; - } - - public Integer getQuestionsScore() - { - return questionsScore; - } - public void setRateNumber(Integer rateNumber) - { - this.rateNumber = rateNumber; - } - - public Integer getRateNumber() - { - return rateNumber; - } - public void setRightAnswer(String rightAnswer) - { - this.rightAnswer = rightAnswer; - } - - public String getRightAnswer() - { - return rightAnswer; - } - public void setAnswerAnalyse(String answerAnalyse) - { - this.answerAnalyse = answerAnalyse; - } - - public String getAnswerAnalyse() - { - return answerAnalyse; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - public void setCreateDept(Long createDept) - { - this.createDept = createDept; - } - - public Long getCreateDept() - { - return createDept; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("bankCode", getBankCode()) - .append("bankCodes", getBankCodes()) - .append("bankName", getBankName()) - .append("questionsId", getQuestionsId()) - .append("questionsCode", getQuestionsCode()) - .append("questionsTitle", getQuestionsTitle()) - .append("questionsType", getQuestionsType()) - .append("questionsScore", getQuestionsScore()) - .append("rateNumber", getRateNumber()) - .append("rightAnswer", getRightAnswer()) - .append("answerAnalyse", getAnswerAnalyse()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createDept", getCreateDept()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsProperty.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsProperty.java deleted file mode 100644 index 0df31c6..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamQuestionsProperty.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.hig.questions.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 题目属性对象 exam_questions_property - * - * @author qnsdt - * @date 2022-12-28 - */ -public class ExamQuestionsProperty extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - private int rownum; - - public int getRownum() { - return rownum; - } - - public void setRownum(int rownum) { - this.rownum = rownum; - } - - /** 题库代码 */ - @Excel(name = "题库代码") - private String bankCode; - - /** 试题id */ - @Excel(name = "试题id") - private Long questionsId; - - /** 试题代码 */ - private String questionsCode; - - /** 试题题目 */ - @Excel(name = "试题题目") - private String questionsTitle; - - /** 试题类型 */ - @Excel(name = "试题类型") - private Integer questionsType; - - /** 题目分数 */ - @Excel(name = "题目分数") - private Integer questionsScore; - - /** 复杂度 */ - @Excel(name = "复杂度") - private Integer rateNumber; - - /** 正确答案 */ - @Excel(name = "正确答案") - private String rightAnswer; - - /** 答案分析 */ - @Excel(name = "答案分析") - private String answerAnalyse; - - /** 状态 */ - @Excel(name = "状态") - private Integer status; - - private String createBy; - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - /** 创建部门 */ - private Long createDept; - - public void setBankCode(String bankCode) - { - this.bankCode = bankCode; - } - - public String getBankCode() - { - return bankCode; - } - public void setQuestionsId(Long questionsId) - { - this.questionsId = questionsId; - } - - public Long getQuestionsId() - { - return questionsId; - } - public void setQuestionsCode(String questionsCode) - { - this.questionsCode = questionsCode; - } - - public String getQuestionsCode() - { - return questionsCode; - } - public void setQuestionsTitle(String questionsTitle) - { - this.questionsTitle = questionsTitle; - } - - public String getQuestionsTitle() - { - return questionsTitle; - } - public void setQuestionsType(Integer questionsType) - { - this.questionsType = questionsType; - } - - public Integer getQuestionsType() - { - return questionsType; - } - public void setQuestionsScore(Integer questionsScore) - { - this.questionsScore = questionsScore; - } - - public Integer getQuestionsScore() - { - return questionsScore; - } - public void setRateNumber(Integer rateNumber) - { - this.rateNumber = rateNumber; - } - - public Integer getRateNumber() - { - return rateNumber; - } - public void setRightAnswer(String rightAnswer) - { - this.rightAnswer = rightAnswer; - } - - public String getRightAnswer() - { - return rightAnswer; - } - public void setAnswerAnalyse(String answerAnalyse) - { - this.answerAnalyse = answerAnalyse; - } - - public String getAnswerAnalyse() - { - return answerAnalyse; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - public void setCreateDept(Long createDept) - { - this.createDept = createDept; - } - - public Long getCreateDept() - { - return createDept; - } - - - - public ExamQuestionsProperty() { - super(); - } - - public ExamQuestionsProperty(int rownum, String bankCode, Long questionsId, String questionsCode, - String questionsTitle, Integer questionsType, Integer questionsScore, Integer rateNumber, - String rightAnswer, String answerAnalyse, Integer status, String createBy, Long createDept) { - super(); - this.rownum = rownum; - this.bankCode = bankCode; - this.questionsId = questionsId; - this.questionsCode = questionsCode; - this.questionsTitle = questionsTitle; - this.questionsType = questionsType; - this.questionsScore = questionsScore; - this.rateNumber = rateNumber; - this.rightAnswer = rightAnswer; - this.answerAnalyse = answerAnalyse; - this.status = status; - this.createBy = createBy; - this.createDept = createDept; - } - - public ExamQuestionsProperty(String bankCode, Long questionsId, String questionsCode, String questionsTitle, - Integer questionsType, Integer questionsScore, Integer rateNumber, String rightAnswer, String answerAnalyse, - Integer status, String createBy, Long createDept) { - super(); - this.bankCode = bankCode; - this.questionsId = questionsId; - this.questionsCode = questionsCode; - this.questionsTitle = questionsTitle; - this.questionsType = questionsType; - this.questionsScore = questionsScore; - this.rateNumber = rateNumber; - this.rightAnswer = rightAnswer; - this.answerAnalyse = answerAnalyse; - this.status = status; - this.createBy = createBy; - this.createDept = createDept; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("bankCode", getBankCode()) - .append("questionsId", getQuestionsId()) - .append("questionsCode", getQuestionsCode()) - .append("questionsTitle", getQuestionsTitle()) - .append("questionsType", getQuestionsType()) - .append("questionsScore", getQuestionsScore()) - .append("rateNumber", getRateNumber()) - .append("rightAnswer", getRightAnswer()) - .append("answerAnalyse", getAnswerAnalyse()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createDept", getCreateDept()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamType.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamType.java deleted file mode 100644 index 12d3e3d..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/ExamType.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.hig.questions.domain; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.TreeEntity; -import com.ruoyi.common.core.domain.entity.SysDept; - -/** - * 考试分类对象 exam_type - * - * @author qnsdt - * @date 2022-12-14 - */ -public class ExamType extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 类别id */ - private Long typeId; - - /** parentid */ - private Long parentId; - - public Long getParentId() { - return parentId; - } - - public void setParentId(Long parentId) { - this.parentId = parentId; - } - - /** 类别代码 */ - @Excel(name = "类别代码") - private String typeCode; - - /** 类别名称 */ - @Excel(name = "类别名称") - private String typeName; - - /** 顺序Id */ - @Excel(name = "顺序Id") - private Long orderId; - - /** 状态 */ - @Excel(name = "状态") - private Long status; - - /** 子类别 */ - private List children = new ArrayList(); - - public void setTypeId(Long typeId) - { - this.typeId = typeId; - } - - - - - public Long getTypeId() - { - return typeId; - } - public void setTypeCode(String typeCode) - { - this.typeCode = typeCode; - } - - public String getTypeCode() - { - return typeCode; - } - public void setTypeName(String typeName) - { - this.typeName = typeName; - } - - public String getTypeName() - { - return typeName; - } - public void setOrderId(Long orderId) - { - this.orderId = orderId; - } - - public Long getOrderId() - { - return orderId; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("typeId", getTypeId()) - .append("parentId", getParentId()) - .append("typeCode", getTypeCode()) - .append("typeName", getTypeName()) - .append("orderId", getOrderId()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/TypeTreeSelect.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/TypeTreeSelect.java deleted file mode 100644 index c5ebc77..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/domain/TypeTreeSelect.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hig.questions.domain; - -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysMenu; - -/** - * Treeselect树结构实体类 - * - * @author ruoyi - */ -public class TypeTreeSelect implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 节点ID */ - private Long id; - - /** 节点名称 */ - private String label; - - /** 子节点 */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; - - public TypeTreeSelect() - { - - } - - public TypeTreeSelect(ExamType examType) - { - this.id = examType.getTypeId(); - this.label = examType.getTypeName(); - - this.children = examType.getChildren().stream().map(TypeTreeSelect::new).collect(Collectors.toList()); - } - - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getLabel() - { - return label; - } - - public void setLabel(String label) - { - this.label = label; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamBankPictureMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamBankPictureMapper.java deleted file mode 100644 index 6d2faa8..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamBankPictureMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamBankPicture; - -/** - * 题库图片Mapper接口 - * - * @author qnsdt - * @date 2022-12-22 - */ -public interface ExamBankPictureMapper -{ - /** - * 查询题库图片 - * - * @param photoCode 题库图片ID - * @return 题库图片 - */ - public ExamBankPicture selectExamBankPictureById(String photoCode); - - /** - * 查询题库图片列表 - * - * @param examBankPicture 题库图片 - * @return 题库图片集合 - */ - public List selectExamBankPictureList(ExamBankPicture examBankPicture); - - /** - * 新增题库图片 - * - * @param examBankPicture 题库图片 - * @return 结果 - */ - public int insertExamBankPicture(ExamBankPicture examBankPicture); - - /** - * 修改题库图片 - * - * @param examBankPicture 题库图片 - * @return 结果 - */ - public int updateExamBankPicture(ExamBankPicture examBankPicture); - - /** - * 删除题库图片 - * - * @param photoCode 题库图片ID - * @return 结果 - */ - public int deleteExamBankPictureById(String photoCode); - - /** - * 批量删除题库图片 - * - * @param photoCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamBankPictureByIds(String[] photoCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsAnswerMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsAnswerMapper.java deleted file mode 100644 index 3b947a4..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsAnswerMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsAnswer; - -/** - * 考试题目答案Mapper接口 - * - * @author qnsdt - * @date 2022-12-29 - */ -public interface ExamQuestionsAnswerMapper -{ - /** - * 查询考试题目答案 - * - * @param questionsCode 考试题目答案ID - * @return 考试题目答案 - */ - public ExamQuestionsAnswer selectExamQuestionsAnswerById(String questionsCode); - - /** - * 查询考试题目答案列表 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 考试题目答案集合 - */ - public List selectExamQuestionsAnswerList(ExamQuestionsAnswer examQuestionsAnswer); - - /** - * 查询考试题目答案选项 - * - * @param questionsCode 题目代码 - * @return 考试题目答案集合 - */ - public List selectExamQuestionsOptionList(String questionsCode); - - /** - * 新增考试题目答案 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 结果 - */ - public int insertExamQuestionsAnswer(ExamQuestionsAnswer examQuestionsAnswer); - - /** - * 修改考试题目答案 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 结果 - */ - public int updateExamQuestionsAnswer(ExamQuestionsAnswer examQuestionsAnswer); - - /** - * 删除考试题目答案 - * - * @param questionsCode 考试题目答案ID - * @return 结果 - */ - public int deleteExamQuestionsAnswerById(String questionsCode); - - /** - * 批量删除考试题目答案 - * - * @param questionsCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionsAnswerByIds(String[] questionsCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsBankMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsBankMapper.java deleted file mode 100644 index 82d7cab..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsBankMapper.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsBank; - -/** - * 题库管理Mapper接口 - * - * @author qnsdt - * @date 2022-12-19 - */ -public interface ExamQuestionsBankMapper -{ - /** - * 查询题库管理 - * - * @param bankCode 题库管理ID - * @return 题库管理 - */ - public ExamQuestionsBank selectExamQuestionsBankById(String bankCode); - - /** - * 根据题库名称查询题库管理 - * - * @param bankName 题库名称 - * @return 题库管理 - */ - public ExamQuestionsBank selectExamQuestionsBankByName(String bankName); - - /** - * 查询题库管理列表 - * - * @param examQuestionsBank 题库管理 - * @return 题库管理集合 - */ - public List selectExamQuestionsBankList(ExamQuestionsBank examQuestionsBank); - - /** - * 查询题库管理列表 - * - * @param examQuestionsBank 题库管理 - * @return 题库管理集合 - */ - public List selectExamQuestionsBankListByCode(String[] bankCodes); - - /** - * 新增题库管理 - * - * @param examQuestionsBank 题库管理 - * @return 结果 - */ - public int insertExamQuestionsBank(ExamQuestionsBank examQuestionsBank); - - /** - * 修改题库管理 - * - * @param examQuestionsBank 题库管理 - * @return 结果 - */ - public int updateExamQuestionsBank(ExamQuestionsBank examQuestionsBank); - - /** - * 删除题库管理 - * - * @param bankCode 题库管理ID - * @return 结果 - */ - public int deleteExamQuestionsBankById(String bankCode); - - /** - * 批量删除题库管理 - * - * @param bankCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionsBankByIds(String[] bankCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsContentMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsContentMapper.java deleted file mode 100644 index 86dfe96..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsContentMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsContent; - -/** - * 题目内容表Mapper接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface ExamQuestionsContentMapper -{ - /** - * 查询题目内容表 - * - * @param questionsCode 题目内容表ID - * @return 题目内容表 - */ - public ExamQuestionsContent selectExamQuestionsContentById(String questionsCode); - - /** - * 查询题目内容表列表 - * - * @param examQuestionsContent 题目内容表 - * @return 题目内容表集合 - */ - public List selectExamQuestionsContentList(ExamQuestionsContent examQuestionsContent); - - /** - * 新增题目内容表 - * - * @param examQuestionsContent 题目内容表 - * @return 结果 - */ - public int insertExamQuestionsContent(ExamQuestionsContent examQuestionsContent); - - /** - * 修改题目内容表 - * - * @param examQuestionsContent 题目内容表 - * @return 结果 - */ - public int updateExamQuestionsContent(ExamQuestionsContent examQuestionsContent); - - /** - * 删除题目内容表 - * - * @param questionsCode 题目内容表ID - * @return 结果 - */ - public int deleteExamQuestionsContentById(String questionsCode); - - /** - * 批量删除题目内容表 - * - * @param questionsCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionsContentByIds(String[] questionsCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsListMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsListMapper.java deleted file mode 100644 index 96f820a..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsListMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsProperty; - -/** - * 题目属性Mapper接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface ExamQuestionsListMapper -{ - - /** - * 查询题目属性列表 - * - * @param examQuestionsProperty 题目属性 - * @return 题目属性集合 - */ - public List selectExamQuestionsList(String[] bankCodes); - - public List selectChoiceExamQuestionsList(String examCode); - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsMapper.java deleted file mode 100644 index 05fb79e..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamQuestions; - -/** - * 考试题目Mapper接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface ExamQuestionsMapper -{ - /** - * 查询考试题目 - * - * @param questionsCode 考试题目ID - * @return 考试题目 - */ - public ExamQuestions selectExamQuestionsById(String questionsCode); - - /** - * 根据题目标题查询考试题目 - * - * @param questionsTitle 题目标题 - * @return 考试题目 - */ - public ExamQuestions selectExamQuestionsByTitle(String questionsTitle); - - /** - * 查询考试题目列表 - * - * @param examQuestions 考试题目 - * @return 考试题目集合 - */ - public List selectExamQuestionsList(ExamQuestions examQuestions); - - /** - * 新增考试题目 - * - * @param examQuestions 考试题目 - * @return 结果 - */ - public int insertExamQuestions(ExamQuestions examQuestions); - - /** - * 修改考试题目 - * - * @param examQuestions 考试题目 - * @return 结果 - */ - public int updateExamQuestions(ExamQuestions examQuestions); - - /** - * 删除考试题目 - * - * @param questionsCode 考试题目ID - * @return 结果 - */ - public int deleteExamQuestionsById(String questionsCode); - - /** - * 批量删除考试题目 - * - * @param questionsCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionsByIds(String[] questionsCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsPropertyMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsPropertyMapper.java deleted file mode 100644 index d4cb986..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamQuestionsPropertyMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsProperty; - -/** - * 题目属性Mapper接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface ExamQuestionsPropertyMapper -{ - /** - * 查询题目属性 - * - * @param questionsCode 题目属性ID - * @return 题目属性 - */ - public ExamQuestionsProperty selectExamQuestionsPropertyById(String questionsCode); - - /** - * 查询题目属性列表 - * - * @param examQuestionsProperty 题目属性 - * @return 题目属性集合 - */ - public List selectExamQuestionsPropertyList(ExamQuestionsProperty examQuestionsProperty); - - /** - * 新增题目属性 - * - * @param examQuestionsProperty 题目属性 - * @return 结果 - */ - public int insertExamQuestionsProperty(ExamQuestionsProperty examQuestionsProperty); - - /** - * 修改题目属性 - * - * @param examQuestionsProperty 题目属性 - * @return 结果 - */ - public int updateExamQuestionsProperty(ExamQuestionsProperty examQuestionsProperty); - - /** - * 删除题目属性 - * - * @param questionsCode 题目属性ID - * @return 结果 - */ - public int deleteExamQuestionsPropertyById(String questionsCode); - - /** - * 批量删除题目属性 - * - * @param questionsCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteExamQuestionsPropertyByIds(String[] questionsCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamTypeMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamTypeMapper.java deleted file mode 100644 index c9820b8..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/mapper/ExamTypeMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.questions.mapper; - -import java.util.List; -import com.hig.questions.domain.ExamType; - -/** - * 考试分类Mapper接口 - * - * @author qnsdt - * @date 2022-12-14 - */ -public interface ExamTypeMapper -{ - /** - * 查询考试分类 - * - * @param typeId 考试分类ID - * @return 考试分类 - */ - public ExamType selectExamTypeById(Long typeId); - - /** - * 查询考试分类列表 - * - * @param examType 考试分类 - * @return 考试分类集合 - */ - public List selectExamTypeList(ExamType examType); - - /** - * 新增考试分类 - * - * @param examType 考试分类 - * @return 结果 - */ - public int insertExamType(ExamType examType); - - /** - * 修改考试分类 - * - * @param examType 考试分类 - * @return 结果 - */ - public int updateExamType(ExamType examType); - - /** - * 删除考试分类 - * - * @param typeId 考试分类ID - * @return 结果 - */ - public int deleteExamTypeById(Long typeId); - - /** - * 批量删除考试分类 - * - * @param typeIds 需要删除的数据ID - * @return 结果 - */ - public int deleteExamTypeByIds(Long[] typeIds); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamBankPictureService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamBankPictureService.java deleted file mode 100644 index 3179862..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamBankPictureService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamBankPicture; - -/** - * 题库图片Service接口 - * - * @author qnsdt - * @date 2022-12-22 - */ -public interface IExamBankPictureService -{ - /** - * 查询题库图片 - * - * @param photoCode 题库图片ID - * @return 题库图片 - */ - public ExamBankPicture selectExamBankPictureById(String photoCode); - - /** - * 查询题库图片列表 - * - * @param examBankPicture 题库图片 - * @return 题库图片集合 - */ - public List selectExamBankPictureList(ExamBankPicture examBankPicture); - - /** - * 新增题库图片 - * - * @param examBankPicture 题库图片 - * @return 结果 - */ - public int insertExamBankPicture(ExamBankPicture examBankPicture); - - /** - * 修改题库图片 - * - * @param examBankPicture 题库图片 - * @return 结果 - */ - public int updateExamBankPicture(ExamBankPicture examBankPicture); - - /** - * 批量删除题库图片 - * - * @param photoCodes 需要删除的题库图片ID - * @return 结果 - */ - public int deleteExamBankPictureByIds(String[] photoCodes); - - /** - * 删除题库图片信息 - * - * @param photoCode 题库图片ID - * @return 结果 - */ - public int deleteExamBankPictureById(String photoCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsAnswerService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsAnswerService.java deleted file mode 100644 index 7a7c6c7..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsAnswerService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsAnswer; - -/** - * 考试题目答案Service接口 - * - * @author qnsdt - * @date 2022-12-29 - */ -public interface IExamQuestionsAnswerService -{ - /** - * 查询考试题目答案 - * - * @param questionsCode 考试题目答案ID - * @return 考试题目答案 - */ - public ExamQuestionsAnswer selectExamQuestionsAnswerById(String questionsCode); - - /** - * 查询考试题目答案列表 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 考试题目答案集合 - */ - public List selectExamQuestionsAnswerList(ExamQuestionsAnswer examQuestionsAnswer); - - /** - * 查询考试题目答案选项 - * - * @param questionsCode 题目代码 - * @return 考试题目答案集合 - */ - public List selectExamQuestionsOptionList(String questionsCode); - - /** - * 新增考试题目答案 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 结果 - */ - public int insertExamQuestionsAnswer(ExamQuestionsAnswer examQuestionsAnswer); - - /** - * 修改考试题目答案 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 结果 - */ - public int updateExamQuestionsAnswer(ExamQuestionsAnswer examQuestionsAnswer); - - /** - * 批量删除考试题目答案 - * - * @param questionsCodes 需要删除的考试题目答案ID - * @return 结果 - */ - public int deleteExamQuestionsAnswerByIds(String[] questionsCodes); - - /** - * 删除考试题目答案信息 - * - * @param questionsCode 考试题目答案ID - * @return 结果 - */ - public int deleteExamQuestionsAnswerById(String questionsCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsBankService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsBankService.java deleted file mode 100644 index d07a88f..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsBankService.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsBank; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; - -/** - * 题库管理Service接口 - * - * @author qnsdt - * @date 2022-12-19 - */ -public interface IExamQuestionsBankService -{ - /** - * 查询题库管理 - * - * @param bankCode 题库管理ID - * @return 题库管理 - */ - public ExamQuestionsBank selectExamQuestionsBankById(String bankCode); - - /** - * 查询题库管理列表 - * - * @param examQuestionsBank 题库管理 - * @return 题库管理集合 - */ - public List selectExamQuestionsBankList(ExamQuestionsBank examQuestionsBank); - - - /** - * 查询题库管理列表 - * - * @param examQuestionsBank 题库管理 - * @return 题库管理集合 - */ - public List selectExamQuestionsBankListByCode(String[] bankCodes); - - /** - * 新增题库管理 - * - * @param examQuestionsBank 题库管理 - * @return 结果 - */ - public int insertExamQuestionsBank(ExamQuestionsBank examQuestionsBank); - - /** - * 修改题库管理 - * - * @param examQuestionsBank 题库管理 - * @return 结果 - */ - public int updateExamQuestionsBank(ExamQuestionsBank examQuestionsBank); - - /** - * 批量删除题库管理 - * - * @param bankCodes 需要删除的题库管理ID - * @return 结果 - */ - public int deleteExamQuestionsBankByIds(String[] bankCodes); - - /** - * 删除题库管理信息 - * - * @param bankCode 题库管理ID - * @return 结果 - */ - public int deleteExamQuestionsBankById(String bankCode); - - /** - * 导入题库数据 - * - * @param examQuestionsBankList 题库数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - public String importExamQuestionsBank(List examQuestionsBankList, Boolean isUpdateSupport, String operName); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsContentService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsContentService.java deleted file mode 100644 index 0d296fb..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsContentService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsContent; - -/** - * 题目内容表Service接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface IExamQuestionsContentService -{ - /** - * 查询题目内容表 - * - * @param questionsCode 题目内容表ID - * @return 题目内容表 - */ - public ExamQuestionsContent selectExamQuestionsContentById(String questionsCode); - - /** - * 查询题目内容表列表 - * - * @param examQuestionsContent 题目内容表 - * @return 题目内容表集合 - */ - public List selectExamQuestionsContentList(ExamQuestionsContent examQuestionsContent); - - /** - * 新增题目内容表 - * - * @param examQuestionsContent 题目内容表 - * @return 结果 - */ - public int insertExamQuestionsContent(ExamQuestionsContent examQuestionsContent); - - /** - * 修改题目内容表 - * - * @param examQuestionsContent 题目内容表 - * @return 结果 - */ - public int updateExamQuestionsContent(ExamQuestionsContent examQuestionsContent); - - /** - * 批量删除题目内容表 - * - * @param questionsCodes 需要删除的题目内容表ID - * @return 结果 - */ - public int deleteExamQuestionsContentByIds(String[] questionsCodes); - - /** - * 删除题目内容表信息 - * - * @param questionsCode 题目内容表ID - * @return 结果 - */ - public int deleteExamQuestionsContentById(String questionsCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsListService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsListService.java deleted file mode 100644 index 44191a3..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsListService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsProperty; - -/** - * 题目属性Service接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface IExamQuestionsListService -{ - - /** - * 查询题目属性列表 - * - * @param examQuestionsProperty 题目属性 - * @return 题目属性集合 - */ - public List selectExamQuestionsList(String[] bankCodes); - - public List selectChoiceExamQuestionsList(String examCode); - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsPropertyService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsPropertyService.java deleted file mode 100644 index 29ba8dd..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsPropertyService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamQuestionsProperty; - -/** - * 题目属性Service接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface IExamQuestionsPropertyService -{ - /** - * 查询题目属性 - * - * @param questionsCode 题目属性ID - * @return 题目属性 - */ - public ExamQuestionsProperty selectExamQuestionsPropertyById(String questionsCode); - - /** - * 查询题目属性列表 - * - * @param examQuestionsProperty 题目属性 - * @return 题目属性集合 - */ - public List selectExamQuestionsPropertyList(ExamQuestionsProperty examQuestionsProperty); - - /** - * 新增题目属性 - * - * @param examQuestionsProperty 题目属性 - * @return 结果 - */ - public int insertExamQuestionsProperty(ExamQuestionsProperty examQuestionsProperty); - - /** - * 修改题目属性 - * - * @param examQuestionsProperty 题目属性 - * @return 结果 - */ - public int updateExamQuestionsProperty(ExamQuestionsProperty examQuestionsProperty); - - /** - * 批量删除题目属性 - * - * @param questionsCodes 需要删除的题目属性ID - * @return 结果 - */ - public int deleteExamQuestionsPropertyByIds(String[] questionsCodes); - - /** - * 删除题目属性信息 - * - * @param questionsCode 题目属性ID - * @return 结果 - */ - public int deleteExamQuestionsPropertyById(String questionsCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsService.java deleted file mode 100644 index 87b6b73..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamQuestionsService.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamQuestions; - -/** - * 考试题目Service接口 - * - * @author qnsdt - * @date 2022-12-28 - */ -public interface IExamQuestionsService -{ - /** - * 查询考试题目 - * - * @param questionsCode 考试题目ID - * @return 考试题目 - */ - public ExamQuestions selectExamQuestionsById(String questionsCode); - - /** - * 查询考试题目列表 - * - * @param examQuestions 考试题目 - * @return 考试题目集合 - */ - public List selectExamQuestionsList(ExamQuestions examQuestions); - - /** - * 新增考试题目 - * - * @param examQuestions 考试题目 - * @return 结果 - */ - public int insertExamQuestions(ExamQuestions examQuestions); - - /** - * 修改考试题目 - * - * @param examQuestions 考试题目 - * @return 结果 - */ - public int updateExamQuestions(ExamQuestions examQuestions); - - /** - * 批量删除考试题目 - * - * @param questionsCodes 需要删除的考试题目ID - * @return 结果 - */ - public int deleteExamQuestionsByIds(String[] questionsCodes); - - /** - * 删除考试题目信息 - * - * @param questionsCode 考试题目ID - * @return 结果 - */ - public int deleteExamQuestionsById(String questionsCode); - - /** - * 导入考试题目数据 - * - * @param examQuestionsList 考试题目数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - public String importExamQuestions(List examQuestionsList, Boolean isUpdateSupport, String operName); - - /** - * 根据题目标题查询考试题目 - * - * @param questionsTitle 题目标题 - * @return 考试题目 - */ - public ExamQuestions selectExamQuestionsByTitle(String questionsTitle); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamTypeService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamTypeService.java deleted file mode 100644 index 2e5cbf6..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/IExamTypeService.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hig.questions.service; - -import java.util.List; -import com.hig.questions.domain.ExamType; -import com.hig.questions.domain.TypeTreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; - -/** - * 考试分类Service接口 - * - * @author qnsdt - * @date 2022-12-14 - */ -public interface IExamTypeService -{ - /** - * 查询考试分类 - * - * @param typeId 考试分类ID - * @return 考试分类 - */ - public ExamType selectExamTypeById(Long typeId); - - /** - * 查询考试分类列表 - * - * @param examType 考试分类 - * @return 考试分类集合 - */ - public List selectExamTypeList(ExamType examType); - - /** - * 构建前端所需要树结构 - * - * @param depts 部门列表 - * @return 树结构列表 - */ - public List buildTypeTree(List examTypeList); - - /** - * 构建前端所需要下拉树结构 - * - * @param depts 部门列表 - * @return 下拉树结构列表 - */ - public List buildTypeTreeSelect(List examTypeList); - - /** - * 新增考试分类 - * - * @param examType 考试分类 - * @return 结果 - */ - public int insertExamType(ExamType examType); - - /** - * 修改考试分类 - * - * @param examType 考试分类 - * @return 结果 - */ - public int updateExamType(ExamType examType); - - /** - * 批量删除考试分类 - * - * @param typeIds 需要删除的考试分类ID - * @return 结果 - */ - public int deleteExamTypeByIds(Long[] typeIds); - - /** - * 删除考试分类信息 - * - * @param typeId 考试分类ID - * @return 结果 - */ - public int deleteExamTypeById(Long typeId); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamBankPictureServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamBankPictureServiceImpl.java deleted file mode 100644 index 0a47cd8..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamBankPictureServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.questions.mapper.ExamBankPictureMapper; -import com.hig.questions.domain.ExamBankPicture; -import com.hig.questions.service.IExamBankPictureService; - -/** - * 题库图片Service业务层处理 - * - * @author qnsdt - * @date 2022-12-22 - */ -@Service -public class ExamBankPictureServiceImpl implements IExamBankPictureService -{ - @Autowired - private ExamBankPictureMapper examBankPictureMapper; - - /** - * 查询题库图片 - * - * @param photoCode 题库图片ID - * @return 题库图片 - */ - @Override - public ExamBankPicture selectExamBankPictureById(String photoCode) - { - return examBankPictureMapper.selectExamBankPictureById(photoCode); - } - - /** - * 查询题库图片列表 - * - * @param examBankPicture 题库图片 - * @return 题库图片 - */ - @Override - public List selectExamBankPictureList(ExamBankPicture examBankPicture) - { - return examBankPictureMapper.selectExamBankPictureList(examBankPicture); - } - - /** - * 新增题库图片 - * - * @param examBankPicture 题库图片 - * @return 结果 - */ - @Override - public int insertExamBankPicture(ExamBankPicture examBankPicture) - { - examBankPicture.setCreateTime(DateUtils.getNowDate()); - return examBankPictureMapper.insertExamBankPicture(examBankPicture); - } - - /** - * 修改题库图片 - * - * @param examBankPicture 题库图片 - * @return 结果 - */ - @Override - public int updateExamBankPicture(ExamBankPicture examBankPicture) - { - return examBankPictureMapper.updateExamBankPicture(examBankPicture); - } - - /** - * 批量删除题库图片 - * - * @param photoCodes 需要删除的题库图片ID - * @return 结果 - */ - @Override - public int deleteExamBankPictureByIds(String[] photoCodes) - { - return examBankPictureMapper.deleteExamBankPictureByIds(photoCodes); - } - - /** - * 删除题库图片信息 - * - * @param photoCode 题库图片ID - * @return 结果 - */ - @Override - public int deleteExamBankPictureById(String photoCode) - { - return examBankPictureMapper.deleteExamBankPictureById(photoCode); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsAnswerServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsAnswerServiceImpl.java deleted file mode 100644 index d389d08..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsAnswerServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.questions.mapper.ExamQuestionsAnswerMapper; -import com.hig.questions.domain.ExamQuestionsAnswer; -import com.hig.questions.service.IExamQuestionsAnswerService; - -/** - * 考试题目答案Service业务层处理 - * - * @author qnsdt - * @date 2022-12-29 - */ -@Service -public class ExamQuestionsAnswerServiceImpl implements IExamQuestionsAnswerService -{ - @Autowired - private ExamQuestionsAnswerMapper examQuestionsAnswerMapper; - - /** - * 查询考试题目答案 - * - * @param questionsCode 考试题目答案ID - * @return 考试题目答案 - */ - @Override - public ExamQuestionsAnswer selectExamQuestionsAnswerById(String questionsCode) - { - return examQuestionsAnswerMapper.selectExamQuestionsAnswerById(questionsCode); - } - - /** - * 查询考试题目答案列表 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 考试题目答案 - */ - @Override - public List selectExamQuestionsAnswerList(ExamQuestionsAnswer examQuestionsAnswer) - { - return examQuestionsAnswerMapper.selectExamQuestionsAnswerList(examQuestionsAnswer); - } - - /** - * 新增考试题目答案 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 结果 - */ - @Override - public int insertExamQuestionsAnswer(ExamQuestionsAnswer examQuestionsAnswer) - { - return examQuestionsAnswerMapper.insertExamQuestionsAnswer(examQuestionsAnswer); - } - - /** - * 修改考试题目答案 - * - * @param examQuestionsAnswer 考试题目答案 - * @return 结果 - */ - @Override - public int updateExamQuestionsAnswer(ExamQuestionsAnswer examQuestionsAnswer) - { - return examQuestionsAnswerMapper.updateExamQuestionsAnswer(examQuestionsAnswer); - } - - /** - * 批量删除考试题目答案 - * - * @param questionsCodes 需要删除的考试题目答案ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsAnswerByIds(String[] questionsCodes) - { - return examQuestionsAnswerMapper.deleteExamQuestionsAnswerByIds(questionsCodes); - } - - /** - * 删除考试题目答案信息 - * - * @param questionsCode 考试题目答案ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsAnswerById(String questionsCode) - { - return examQuestionsAnswerMapper.deleteExamQuestionsAnswerById(questionsCode); - } - - @Override - public List selectExamQuestionsOptionList(String questionsCode) { - // TODO Auto-generated method stub - return examQuestionsAnswerMapper.selectExamQuestionsOptionList(questionsCode); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsBankServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsBankServiceImpl.java deleted file mode 100644 index 5171913..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsBankServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; - -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.hig.utils.UUIDGenerator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.questions.mapper.ExamQuestionsBankMapper; -import com.hig.questions.domain.ExamQuestionsBank; -import com.hig.questions.service.IExamQuestionsBankService; - -/** - * 题库管理Service业务层处理 - * - * @author qnsdt - * @date 2022-12-19 - */ -@Service -public class ExamQuestionsBankServiceImpl implements IExamQuestionsBankService -{ - @Autowired - private ExamQuestionsBankMapper examQuestionsBankMapper; - - /** - * 查询题库管理 - * - * @param bankCode 题库管理ID - * @return 题库管理 - */ - @Override - public ExamQuestionsBank selectExamQuestionsBankById(String bankCode) - { - return examQuestionsBankMapper.selectExamQuestionsBankById(bankCode); - } - - /** - * 查询题库管理列表 - * - * @param examQuestionsBank 题库管理 - * @return 题库管理 - */ - @Override - public List selectExamQuestionsBankList(ExamQuestionsBank examQuestionsBank) - { - return examQuestionsBankMapper.selectExamQuestionsBankList(examQuestionsBank); - } - - /** - * 新增题库管理 - * - * @param examQuestionsBank 题库管理 - * @return 结果 - */ - @Override - public int insertExamQuestionsBank(ExamQuestionsBank examQuestionsBank) - { - examQuestionsBank.setCreateTime(DateUtils.getNowDate()); - return examQuestionsBankMapper.insertExamQuestionsBank(examQuestionsBank); - } - - /** - * 修改题库管理 - * - * @param examQuestionsBank 题库管理 - * @return 结果 - */ - @Override - public int updateExamQuestionsBank(ExamQuestionsBank examQuestionsBank) - { - return examQuestionsBankMapper.updateExamQuestionsBank(examQuestionsBank); - } - - /** - * 批量删除题库管理 - * - * @param bankCodes 需要删除的题库管理ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsBankByIds(String[] bankCodes) - { - return examQuestionsBankMapper.deleteExamQuestionsBankByIds(bankCodes); - } - - /** - * 删除题库管理信息 - * - * @param bankCode 题库管理ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsBankById(String bankCode) - { - return examQuestionsBankMapper.deleteExamQuestionsBankById(bankCode); - } - - @Override - public List selectExamQuestionsBankListByCode(String[] bankCodes) { - // TODO Auto-generated method stub - return examQuestionsBankMapper.selectExamQuestionsBankListByCode(bankCodes); - } - - /** - * 导入题库数据 - * - * @param examQuestionsBankList 题库数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - @Override - public String importExamQuestionsBank(List examQuestionsBankList, Boolean isUpdateSupport, String operName) - { - if (StringUtils.isNull(examQuestionsBankList) || examQuestionsBankList.size() == 0) - { - throw new CustomException("导入题库数据不能为空！"); - } - int successNum = 0; - int failureNum = 0; - StringBuilder successMsg = new StringBuilder(); - StringBuilder failureMsg = new StringBuilder(); - for (ExamQuestionsBank examQuestionsBank : examQuestionsBankList) - { - try - { - // 验证是否存在这个题库 - ExamQuestionsBank b = examQuestionsBankMapper.selectExamQuestionsBankByName(examQuestionsBank.getBankName()); - if (StringUtils.isNull(b)) - { - examQuestionsBank.setBankCode(UUIDGenerator.generate()); - examQuestionsBank.setCreateBy(operName); - examQuestionsBank.setCreateTime(DateUtils.getNowDate()); - this.insertExamQuestionsBank(examQuestionsBank); - successNum++; - successMsg.append("
" + successNum + "、题库 " + examQuestionsBank.getBankName() + " 导入成功"); - } - else if (isUpdateSupport) - { - examQuestionsBank.setBankCode(b.getBankCode()); - examQuestionsBank.setUpdateBy(operName); - this.updateExamQuestionsBank(examQuestionsBank); - successNum++; - successMsg.append("
" + successNum + "、题库 " + examQuestionsBank.getBankName() + " 更新成功"); - } - else - { - failureNum++; - failureMsg.append("
" + failureNum + "、题库 " + examQuestionsBank.getBankName() + " 已存在"); - } - } - catch (Exception e) - { - failureNum++; - String msg = "
" + failureNum + "、题库 " + examQuestionsBank.getBankName() + " 导入失败："; - failureMsg.append(msg + e.getMessage()); - } - } - if (failureNum > 0) - { - failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); - throw new CustomException(failureMsg.toString()); - } - else - { - successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); - } - return successMsg.toString(); - } - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsContentServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsContentServiceImpl.java deleted file mode 100644 index 0df0de4..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsContentServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.questions.mapper.ExamQuestionsContentMapper; -import com.hig.questions.domain.ExamQuestionsContent; -import com.hig.questions.service.IExamQuestionsContentService; - -/** - * 题目内容表Service业务层处理 - * - * @author qnsdt - * @date 2022-12-28 - */ -@Service -public class ExamQuestionsContentServiceImpl implements IExamQuestionsContentService -{ - @Autowired - private ExamQuestionsContentMapper examQuestionsContentMapper; - - /** - * 查询题目内容表 - * - * @param questionsCode 题目内容表ID - * @return 题目内容表 - */ - @Override - public ExamQuestionsContent selectExamQuestionsContentById(String questionsCode) - { - return examQuestionsContentMapper.selectExamQuestionsContentById(questionsCode); - } - - /** - * 查询题目内容表列表 - * - * @param examQuestionsContent 题目内容表 - * @return 题目内容表 - */ - @Override - public List selectExamQuestionsContentList(ExamQuestionsContent examQuestionsContent) - { - return examQuestionsContentMapper.selectExamQuestionsContentList(examQuestionsContent); - } - - /** - * 新增题目内容表 - * - * @param examQuestionsContent 题目内容表 - * @return 结果 - */ - @Override - public int insertExamQuestionsContent(ExamQuestionsContent examQuestionsContent) - { - return examQuestionsContentMapper.insertExamQuestionsContent(examQuestionsContent); - } - - /** - * 修改题目内容表 - * - * @param examQuestionsContent 题目内容表 - * @return 结果 - */ - @Override - public int updateExamQuestionsContent(ExamQuestionsContent examQuestionsContent) - { - return examQuestionsContentMapper.updateExamQuestionsContent(examQuestionsContent); - } - - /** - * 批量删除题目内容表 - * - * @param questionsCodes 需要删除的题目内容表ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsContentByIds(String[] questionsCodes) - { - return examQuestionsContentMapper.deleteExamQuestionsContentByIds(questionsCodes); - } - - /** - * 删除题目内容表信息 - * - * @param questionsCode 题目内容表ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsContentById(String questionsCode) - { - return examQuestionsContentMapper.deleteExamQuestionsContentById(questionsCode); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsListServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsListServiceImpl.java deleted file mode 100644 index 55fef08..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsListServiceImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.hig.questions.mapper.ExamQuestionsListMapper; -import com.hig.questions.mapper.ExamQuestionsPropertyMapper; -import com.hig.questions.domain.ExamQuestionsProperty; -import com.hig.questions.service.IExamQuestionsListService; -import com.hig.questions.service.IExamQuestionsPropertyService; - -/** - * 题目属性Service业务层处理 - * - * @author qnsdt - * @date 2022-12-28 - */ -@Service -public class ExamQuestionsListServiceImpl implements IExamQuestionsListService -{ - @Autowired - private ExamQuestionsListMapper examQuestionsListMapper; - - - /** - * 查询题目属性列表 - * - * @param examQuestionsProperty 题目属性 - * @return 题目属性 - */ - @Override - public List selectExamQuestionsList(String[] bankCodes) - { - return examQuestionsListMapper.selectExamQuestionsList(bankCodes); - } - - - @Override - public List selectChoiceExamQuestionsList(String examCode) { - // TODO Auto-generated method stub - return examQuestionsListMapper.selectChoiceExamQuestionsList(examCode); - } - - - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsPropertyServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsPropertyServiceImpl.java deleted file mode 100644 index fd656f1..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsPropertyServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.questions.mapper.ExamQuestionsPropertyMapper; -import com.hig.questions.domain.ExamQuestionsProperty; -import com.hig.questions.service.IExamQuestionsPropertyService; - -/** - * 题目属性Service业务层处理 - * - * @author qnsdt - * @date 2022-12-28 - */ -@Service -public class ExamQuestionsPropertyServiceImpl implements IExamQuestionsPropertyService -{ - @Autowired - private ExamQuestionsPropertyMapper examQuestionsPropertyMapper; - - /** - * 查询题目属性 - * - * @param questionsCode 题目属性ID - * @return 题目属性 - */ - @Override - public ExamQuestionsProperty selectExamQuestionsPropertyById(String questionsCode) - { - return examQuestionsPropertyMapper.selectExamQuestionsPropertyById(questionsCode); - } - - /** - * 查询题目属性列表 - * - * @param examQuestionsProperty 题目属性 - * @return 题目属性 - */ - @Override - public List selectExamQuestionsPropertyList(ExamQuestionsProperty examQuestionsProperty) - { - return examQuestionsPropertyMapper.selectExamQuestionsPropertyList(examQuestionsProperty); - } - - /** - * 新增题目属性 - * - * @param examQuestionsProperty 题目属性 - * @return 结果 - */ - @Override - public int insertExamQuestionsProperty(ExamQuestionsProperty examQuestionsProperty) - { - examQuestionsProperty.setCreateTime(DateUtils.getNowDate()); - return examQuestionsPropertyMapper.insertExamQuestionsProperty(examQuestionsProperty); - } - - /** - * 修改题目属性 - * - * @param examQuestionsProperty 题目属性 - * @return 结果 - */ - @Override - public int updateExamQuestionsProperty(ExamQuestionsProperty examQuestionsProperty) - { - return examQuestionsPropertyMapper.updateExamQuestionsProperty(examQuestionsProperty); - } - - /** - * 批量删除题目属性 - * - * @param questionsCodes 需要删除的题目属性ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsPropertyByIds(String[] questionsCodes) - { - return examQuestionsPropertyMapper.deleteExamQuestionsPropertyByIds(questionsCodes); - } - - /** - * 删除题目属性信息 - * - * @param questionsCode 题目属性ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsPropertyById(String questionsCode) - { - return examQuestionsPropertyMapper.deleteExamQuestionsPropertyById(questionsCode); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsServiceImpl.java deleted file mode 100644 index 23b6660..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamQuestionsServiceImpl.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.List; -import java.util.UUID; - -import com.hig.questions.domain.ExamQuestionsAnswer; -import com.hig.questions.domain.ExamQuestionsContent; -import com.hig.questions.domain.ExamQuestionsProperty; -import com.hig.questions.mapper.ExamQuestionsAnswerMapper; -import com.hig.questions.mapper.ExamQuestionsContentMapper; -import com.hig.questions.mapper.ExamQuestionsPropertyMapper; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.hig.utils.UUIDGenerator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.questions.mapper.ExamQuestionsMapper; -import com.hig.questions.domain.ExamQuestions; -import com.hig.questions.service.IExamQuestionsService; - -/** - * 考试题目Service业务层处理 - * - * @author qnsdt - * @date 2022-12-28 - */ -@Service -public class ExamQuestionsServiceImpl implements IExamQuestionsService -{ - @Autowired - private ExamQuestionsMapper examQuestionsMapper; - - @Autowired - private ExamQuestionsPropertyMapper examQuestionsPropertyMapper; - - @Autowired - private ExamQuestionsContentMapper examQuestionsContentMapper; - - @Autowired - private ExamQuestionsAnswerMapper examQuestionsAnswerMapper; - /** - * 查询考试题目 - * - * @param questionsCode 考试题目ID - * @return 考试题目 - */ - @Override - public ExamQuestions selectExamQuestionsById(String questionsCode) - { - return examQuestionsMapper.selectExamQuestionsById(questionsCode); - } - - /** - * 查询考试题目列表 - * - * @param examQuestions 考试题目 - * @return 考试题目 - */ - @Override - public List selectExamQuestionsList(ExamQuestions examQuestions) - { - return examQuestionsMapper.selectExamQuestionsList(examQuestions); - } - - /** - * 新增考试题目 - * - * @param examQuestions 考试题目 - * @return 结果 - */ - @Override - public int insertExamQuestions(ExamQuestions examQuestions) - { - examQuestions.setCreateTime(DateUtils.getNowDate()); - return examQuestionsMapper.insertExamQuestions(examQuestions); - } - - /** - * 修改考试题目 - * - * @param examQuestions 考试题目 - * @return 结果 - */ - @Override - public int updateExamQuestions(ExamQuestions examQuestions) - { - return examQuestionsMapper.updateExamQuestions(examQuestions); - } - - /** - * 批量删除考试题目 - * - * @param questionsCodes 需要删除的考试题目ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsByIds(String[] questionsCodes) - { - return examQuestionsMapper.deleteExamQuestionsByIds(questionsCodes); - } - - /** - * 删除考试题目信息 - * - * @param questionsCode 考试题目ID - * @return 结果 - */ - @Override - public int deleteExamQuestionsById(String questionsCode) - { - return examQuestionsMapper.deleteExamQuestionsById(questionsCode); - } - - /** - * 根据题目标题查询考试题目 - * - * @param questionsTitle 题目标题 - * @return 考试题目 - */ - @Override - public ExamQuestions selectExamQuestionsByTitle(String questionsTitle) - { - return examQuestionsMapper.selectExamQuestionsByTitle(questionsTitle); - } - - /** - * 导入考试题目数据 - * - * @param examQuestionsList 考试题目数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - @Override - public String importExamQuestions(List examQuestionsList, Boolean isUpdateSupport, String operName) { - if (StringUtils.isNull(examQuestionsList) || examQuestionsList.size() == 0) { - throw new CustomException("导入考试题目数据不能为空！"); - } - int successNum = 0; - int failureNum = 0; - StringBuilder successMsg = new StringBuilder(); - StringBuilder failureMsg = new StringBuilder(); - for (ExamQuestions examQuestions : examQuestionsList) { - - try { - ExamQuestionsProperty examProperty = new ExamQuestionsProperty(); - examProperty.setBankCode(examQuestions.getBankCode()); - examProperty.setQuestionsCode(examQuestions.getQuestionsCode()); - examProperty.setQuestionsTitle(examQuestions.getQuestionsTitle()); - examProperty.setQuestionsScore(examQuestions.getQuestionsScore()); - examProperty.setQuestionsType(examQuestions.getQuestionsType()); - examProperty.setRateNumber(examQuestions.getRateNumber()); - examProperty.setAnswerAnalyse(examQuestions.getAnswerAnalyse()); - examProperty.setRightAnswer(examQuestions.getRightAnswer()); - examProperty.setStatus(0); - examProperty.setCreateTime(DateUtils.getNowDate()); - examProperty.setCreateBy(examQuestions.getCreateBy()); - examQuestionsPropertyMapper.insertExamQuestionsProperty(examProperty); - ExamQuestionsContent examContent = new ExamQuestionsContent( - examQuestions.getQuestionsCode(), examQuestions.getQuestionsContent() - ); - examQuestionsContentMapper.insertExamQuestionsContent(examContent); - - ExamQuestionsAnswer answer = new ExamQuestionsAnswer(); - answer.setQuestionsCode(examQuestions.getQuestionsCode()); - int idx = -1; - String opt = "ABCDEFGHIJKLMN"; - - String code = ""; - String rightAnswer = examQuestions.getRightAnswer(); - if (StringUtils.isEmpty(rightAnswer)) { - rightAnswer = ""; - } - String[] tmps = new String[]{ - examQuestions.getAnswerA(), - examQuestions.getAnswerB(), - examQuestions.getAnswerC(), - examQuestions.getAnswerD(), - examQuestions.getAnswerE(), - examQuestions.getAnswerF(), - examQuestions.getAnswerG(), - examQuestions.getAnswerH() - }; - for (String tmp : tmps) { - if (StringUtils.isNotEmpty(tmp)) { - idx++; - code = "" + opt.charAt(idx); - answer.setOptionCode(code); - answer.setOptionDescribe(tmp); - answer.setIsRight(rightAnswer.contains(code) ? 0 : 1); - examQuestionsAnswerMapper.insertExamQuestionsAnswer(answer); - } - } - successNum++; - }catch (Exception e){ - failureNum++; - } - - } - if (failureNum > 0) { - failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); - throw new CustomException(failureMsg.toString()); - } else { - successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); - } - return successMsg.toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamTypeServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamTypeServiceImpl.java deleted file mode 100644 index def9a81..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/questions/service/impl/ExamTypeServiceImpl.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.hig.questions.service.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; - -import java.util.Iterator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.questions.mapper.ExamTypeMapper; -import com.hig.questions.domain.ExamType; -import com.hig.questions.domain.TypeTreeSelect; -import com.hig.questions.service.IExamTypeService; - -/** - * 考试分类Service业务层处理 - * - * @author qnsdt - * @date 2022-12-14 - */ -@Service -public class ExamTypeServiceImpl implements IExamTypeService -{ - @Autowired - private ExamTypeMapper examTypeMapper; - - /** - * 查询考试分类 - * - * @param typeId 考试分类ID - * @return 考试分类 - */ - @Override - public ExamType selectExamTypeById(Long typeId) - { - return examTypeMapper.selectExamTypeById(typeId); - } - - /** - * 查询考试分类列表 - * - * @param examType 考试分类 - * @return 考试分类 - */ - @Override - public List selectExamTypeList(ExamType examType) - { - return examTypeMapper.selectExamTypeList(examType); - } - - /** - * 新增考试分类 - * - * @param examType 考试分类 - * @return 结果 - */ - @Override - public int insertExamType(ExamType examType) - { - examType.setCreateTime(DateUtils.getNowDate()); - return examTypeMapper.insertExamType(examType); - } - - /** - * 修改考试分类 - * - * @param examType 考试分类 - * @return 结果 - */ - @Override - public int updateExamType(ExamType examType) - { - return examTypeMapper.updateExamType(examType); - } - - /** - * 批量删除考试分类 - * - * @param typeIds 需要删除的考试分类ID - * @return 结果 - */ - @Override - public int deleteExamTypeByIds(Long[] typeIds) - { - return examTypeMapper.deleteExamTypeByIds(typeIds); - } - - /** - * 删除考试分类信息 - * - * @param typeId 考试分类ID - * @return 结果 - */ - @Override - public int deleteExamTypeById(Long typeId) - { - return examTypeMapper.deleteExamTypeById(typeId); - } - - /** - * 递归列表 - */ - private void recursionFn(List list, ExamType t) - { - // 得到子节点列表 - List childList = getChildList(list, t); - t.setChildren(childList); - for (ExamType tChild : childList) - { - if (hasChild(list, tChild)) - { - recursionFn(list, tChild); - } - } - } - - /** - * 得到子节点列表 - */ - private List getChildList(List list, ExamType t) - { - List tlist = new ArrayList(); - Iterator it = list.iterator(); - while (it.hasNext()) - { - ExamType n = (ExamType) it.next(); - if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getTypeId().longValue()) - { - tlist.add(n); - } - } - return tlist; - } - - /** - * 判断是否有子节点 - */ - private boolean hasChild(List list, ExamType t) - { - return getChildList(list, t).size() > 0 ? true : false; - } - - - @Override - public List buildTypeTree(List examTypeList) { - // TODO Auto-generated method stub - List returnList = new ArrayList(); - List tempList = new ArrayList(); - for (ExamType examtype : examTypeList) - { - tempList.add(examtype.getTypeId()); - } - for (Iterator iterator = examTypeList.iterator(); iterator.hasNext();) - { - ExamType examtype = (ExamType) iterator.next(); - // 如果是顶级节点, 遍历该父节点的所有子节点 - if (!tempList.contains(examtype.getParentId())) - { - recursionFn(examTypeList, examtype); - returnList.add(examtype); - } - } - if (returnList.isEmpty()) - { - returnList = examTypeList; - } - return returnList; - } - - @Override - public List buildTypeTreeSelect(List examTypeList) { - // TODO Auto-generated method stub - List typeTrees = buildTypeTree(examTypeList); - return typeTrees.stream().map(TypeTreeSelect::new).collect(Collectors.toList()); - } - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysGroupController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysGroupController.java deleted file mode 100644 index 615a59b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysGroupController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.hig.system.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.hig.system.domain.SysGroup; -import com.hig.system.service.ISysGroupService; -import com.hig.utils.UUIDGenerator; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 人员分组Controller - * - * @author qnsdt - * @date 2023-01-28 - */ -@RestController -@RequestMapping("/system/group") -public class SysGroupController extends BaseController -{ - @Autowired - private ISysGroupService sysGroupService; - - @Autowired - private TokenService tokenService; - - /** - * 查询人员分组列表 - */ - @PreAuthorize("@ss.hasPermi('system:group:list')") - @GetMapping("/list") - public TableDataInfo list(SysGroup sysGroup) - { - startPage(); - List list = sysGroupService.selectSysGroupList(sysGroup); - return getDataTable(list); - } - - @GetMapping("/choicelist/{examCode}") - public TableDataInfo selectChoiceSysGroupList(@PathVariable String examCode) { - // TODO Auto-generated method stub - startPage(); - List list = sysGroupService.selectChoiceSysGroupList(examCode); - return getDataTable(list); - } - /** - * 导出人员分组列表 - */ - @PreAuthorize("@ss.hasPermi('system:group:export')") - @Log(title = "人员分组", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(SysGroup sysGroup) - { - List list = sysGroupService.selectSysGroupList(sysGroup); - ExcelUtil util = new ExcelUtil(SysGroup.class); - return util.exportExcel(list, "人员分组数据"); - } - - /** - * 获取人员分组详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:group:query')") - @GetMapping(value = "/{groupId}") - public AjaxResult getInfo(@PathVariable("groupId") Long groupId) - { - return AjaxResult.success(sysGroupService.selectSysGroupById(groupId)); - } - - /** - * 新增人员分组 - */ - @PreAuthorize("@ss.hasPermi('system:group:add')") - @Log(title = "人员分组", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SysGroup sysGroup) - { - sysGroup.setGroupCode(UUIDGenerator.generate()); - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - sysGroup.setCreateBy(loginUser.getUser().getUserName()); - - return toAjax(sysGroupService.insertSysGroup(sysGroup)); - } - - /** - * 修改人员分组 - */ - @PreAuthorize("@ss.hasPermi('system:group:edit')") - @Log(title = "人员分组", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SysGroup sysGroup) - { - return toAjax(sysGroupService.updateSysGroup(sysGroup)); - } - - /** - * 删除人员分组 - */ - @PreAuthorize("@ss.hasPermi('system:group:remove')") - @Log(title = "人员分组", businessType = BusinessType.DELETE) - @DeleteMapping("/{groupIds}") - public AjaxResult remove(@PathVariable Long[] groupIds) - { - return toAjax(sysGroupService.deleteSysGroupByIds(groupIds)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysGroupPersonController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysGroupPersonController.java deleted file mode 100644 index 4ab3925..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysGroupPersonController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hig.system.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.system.domain.SysGroupPerson; -import com.hig.system.service.ISysGroupPersonService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 分组用户Controller - * - * @author qnsdt - * @date 2023-02-06 - */ -@RestController -@RequestMapping("/system/groupperson") -public class SysGroupPersonController extends BaseController -{ - @Autowired - private ISysGroupPersonService sysGroupPersonService; - - /** - * 查询分组用户列表 - */ - @GetMapping("/list") - public TableDataInfo list(SysGroupPerson sysGroupPerson) - { - startPage(); - List list = sysGroupPersonService.selectSysGroupPersonList(sysGroupPerson); - return getDataTable(list); - } - - /** - * 导出分组用户列表 - */ - @GetMapping("/export") - public AjaxResult export(SysGroupPerson sysGroupPerson) - { - List list = sysGroupPersonService.selectSysGroupPersonList(sysGroupPerson); - ExcelUtil util = new ExcelUtil(SysGroupPerson.class); - return util.exportExcel(list, "分组用户数据"); - } - - /** - * 获取分组用户详细信息 - */ - @GetMapping(value = "/{groupCode}") - public AjaxResult getInfo(@PathVariable("groupCode") String groupCode) - { - return AjaxResult.success(sysGroupPersonService.selectSysGroupPersonById(groupCode)); - } - - /** - * 新增分组用户 - */ - @PostMapping - public AjaxResult add(@RequestBody List sysGroupPersonList) - { - return toAjax(sysGroupPersonService.insertSysGroupPerson(sysGroupPersonList)); - } - - /** - * 修改分组用户 - */ - @PostMapping("/update") - public AjaxResult edit(@RequestBody SysGroupPerson sysGroupPerson) - { - return toAjax(sysGroupPersonService.updateSysGroupPerson(sysGroupPerson)); - } - - /** - * 删除分组用户 - */ - @GetMapping("/delete/{groupCodes}") - public AjaxResult remove(@PathVariable String[] groupCodes) - { - return toAjax(sysGroupPersonService.deleteSysGroupPersonByIds(groupCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysUserChoiceController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysUserChoiceController.java deleted file mode 100644 index ec1eae6..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysUserChoiceController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.hig.system.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.system.domain.SysUserChoice; -import com.hig.system.domain.dto.SysUserCopy; -import com.hig.system.domain.dto.SysUserData; -import com.hig.system.service.ISysUserChoiceService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 选择用户Controller - * - * @author qnsdt - * @date 2023-02-02 - */ -@RestController -@RequestMapping("/system/sysuserchoice") -public class SysUserChoiceController extends BaseController -{ - @Autowired - private ISysUserChoiceService sysUserChoiceService; - - /** - * 查询选择用户列表 - */ - @GetMapping("/list") - public TableDataInfo list(SysUserChoice sysUserChoice) - { - startPage(); - List list = sysUserChoiceService.selectSysUserChoiceList(sysUserChoice); - return getDataTable(list); - } - - @GetMapping("/choiceuserlist") - public AjaxResult selectGroupUserList(SysUserData sysUser) - { - System.out.println("SysUserData:" + sysUser.toString()); - List list = sysUserChoiceService.selectGroupUserList(sysUser); - return AjaxResult.success(list); - - } - - /** - * 导出选择用户列表 - */ - @GetMapping("/export") - public AjaxResult export(SysUserChoice sysUserChoice) - { - List list = sysUserChoiceService.selectSysUserChoiceList(sysUserChoice); - ExcelUtil util = new ExcelUtil(SysUserChoice.class); - return util.exportExcel(list, "选择用户数据"); - } - - /** - * 获取选择用户详细信息 - */ - @GetMapping(value = "/{choiceCode}") - public AjaxResult getInfo(@PathVariable("choiceCode") String choiceCode) - { - return AjaxResult.success(sysUserChoiceService.selectSysUserChoiceById(choiceCode)); - } - - /** - * 新增选择用户 - */ - @PostMapping("/copysysuser") - public AjaxResult copySysUser(@RequestBody SysUserCopy sysUserCopy) - { - return toAjax(sysUserChoiceService.copySysUser(sysUserCopy)); - } - - @PostMapping("/copytempuser") - public AjaxResult copyTempUser(@RequestBody SysUserCopy sysUserCopy) - { - return toAjax(sysUserChoiceService.copyTempUser(sysUserCopy)); - } - /** - * 新增选择用户 - */ - @PostMapping - public AjaxResult add(@RequestBody SysUserChoice sysUserChoice) - { - return toAjax(sysUserChoiceService.insertSysUserChoice(sysUserChoice)); - } - - /** - * 修改选择用户 - */ - @PostMapping("/update") - public AjaxResult edit(@RequestBody SysUserChoice sysUserChoice) - { - return toAjax(sysUserChoiceService.updateSysUserChoice(sysUserChoice)); - } - - /** - * 删除选择用户 - */ - @GetMapping("/delete/{choiceCodes}") - public AjaxResult remove(@PathVariable String[] choiceCodes) - { - return toAjax(sysUserChoiceService.deleteSysUserChoiceByIds(choiceCodes)); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysUserDataController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysUserDataController.java deleted file mode 100644 index 410152b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/SysUserDataController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hig.system.controller; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.hig.system.domain.TempUserChoice; -import com.hig.system.domain.dto.SysUserData; -import com.hig.system.mapper.SysUserDataMapper; -import com.hig.system.service.ISysUserDataService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.page.TableDataInfo; - -@RestController -@RequestMapping("/system/userdata") -public class SysUserDataController extends BaseController{ - @Autowired - ISysUserDataService sysUserDataService; - - /** - * 查询用户选择列表 - */ - @GetMapping("/list") - public TableDataInfo list(SysUserData sysUser) - { - startPage(); - List list = sysUserDataService.selectUserList(sysUser); - return getDataTable(list); - } - - @GetMapping("/choicelist") - public TableDataInfo choiceList(SysUserData sysUser) - { - startPage(); - List list = sysUserDataService.selectChoiceUserList(sysUser); - return getDataTable(list); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/TempUserChoiceController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/TempUserChoiceController.java deleted file mode 100644 index 9da060b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/controller/TempUserChoiceController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hig.system.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.hig.system.domain.TempUserChoice; -import com.hig.system.service.ITempUserChoiceService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 用户选择Controller - * - * @author qnsdt - * @date 2023-01-31 - */ -@RestController -@RequestMapping("/system/userchoice") -public class TempUserChoiceController extends BaseController -{ - @Autowired - private ITempUserChoiceService tempUserChoiceService; - - /** - * 查询用户选择列表 - */ - @GetMapping("/list") - public TableDataInfo list(TempUserChoice tempUserChoice) - { - startPage(); - List list = tempUserChoiceService.selectTempUserChoiceList(tempUserChoice); - return getDataTable(list); - } - - /** - * 导出用户选择列表 - */ - @GetMapping("/export") - public AjaxResult export(TempUserChoice tempUserChoice) - { - List list = tempUserChoiceService.selectTempUserChoiceList(tempUserChoice); - ExcelUtil util = new ExcelUtil(TempUserChoice.class); - return util.exportExcel(list, "用户选择数据"); - } - - /** - * 获取用户选择详细信息 - */ - @GetMapping(value = "/{choiceCode}") - public AjaxResult getInfo(@PathVariable("choiceCode") String choiceCode) - { - return AjaxResult.success(tempUserChoiceService.selectTempUserChoiceById(choiceCode)); - } - - /** - * 新增用户选择 - */ - @PostMapping - public AjaxResult add(@RequestBody TempUserChoice tempUserChoice) - { - return toAjax(tempUserChoiceService.insertTempUserChoice(tempUserChoice)); - } - - /** - * 新增用户选择 - */ - @PostMapping("/batch") - public AjaxResult batchAdd(@RequestBody List userList) - { - return toAjax(tempUserChoiceService.batchInsertTempUser(userList)); - } - - /** - * 修改用户选择 - */ - @PostMapping("/update") - public AjaxResult edit(@RequestBody TempUserChoice tempUserChoice) - { - return toAjax(tempUserChoiceService.updateTempUserChoice(tempUserChoice)); - } - - @PostMapping("/remove") - public AjaxResult remove(@RequestBody List userList) - { - return toAjax(tempUserChoiceService.deleteTempUserChoice(userList)); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysGroup.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysGroup.java deleted file mode 100644 index da8053f..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysGroup.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.hig.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 人员分组对象 sys_group - * - * @author qnsdt - * @date 2023-01-28 - */ -public class SysGroup extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 分组序号 */ - private Long groupId; - - /** 分组代码 */ - @Excel(name = "分组代码") - private String groupCode; - - /** 分组名称 */ - @Excel(name = "分组名称") - private String groupName; - - private int personNumber; - - public int getPersonNumber() { - return personNumber; - } - - public void setPersonNumber(int personNumber) { - this.personNumber = personNumber; - } - - /** 分组描述 */ - @Excel(name = "分组描述") - private String groupDescribe; - - /** 状态 */ - @Excel(name = "状态") - private String status; - - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - public Long getGroupId() - { - return groupId; - } - public void setGroupCode(String groupCode) - { - this.groupCode = groupCode; - } - - public String getGroupCode() - { - return groupCode; - } - public void setGroupName(String groupName) - { - this.groupName = groupName; - } - - public String getGroupName() - { - return groupName; - } - public void setGroupDescribe(String groupDescribe) - { - this.groupDescribe = groupDescribe; - } - - public String getGroupDescribe() - { - return groupDescribe; - } - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("groupId", getGroupId()) - .append("groupCode", getGroupCode()) - .append("groupName", getGroupName()) - .append("personNumber",getPersonNumber()) - .append("groupDescribe", getGroupDescribe()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysGroupPerson.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysGroupPerson.java deleted file mode 100644 index aa317ee..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysGroupPerson.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hig.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 分组用户对象 sys_group_person - * - * @author qnsdt - * @date 2023-02-06 - */ -public class SysGroupPerson extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 分组代码 */ - @Excel(name = "分组代码") - private String groupCode; - - /** 人员代码 */ - @Excel(name = "人员代码") - private String personCode; - - /** 组内排序 */ - @Excel(name = "组内排序") - private Long orderId; - - public void setGroupCode(String groupCode) - { - this.groupCode = groupCode; - } - - public String getGroupCode() - { - return groupCode; - } - public void setPersonCode(String personCode) - { - this.personCode = personCode; - } - - public String getPersonCode() - { - return personCode; - } - public void setOrderId(Long orderId) - { - this.orderId = orderId; - } - - public Long getOrderId() - { - return orderId; - } - - - public SysGroupPerson() { - super(); - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("groupCode", getGroupCode()) - .append("personCode", getPersonCode()) - .append("orderId", getOrderId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysUserChoice.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysUserChoice.java deleted file mode 100644 index d4afa35..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/SysUserChoice.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hig.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 选择用户对象 sys_user_choice - * - * @author qnsdt - * @date 2023-02-02 - */ -public class SysUserChoice extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 选择代码 */ - @Excel(name = "选择代码") - private String choiceCode; - - /** 用户代码 */ - @Excel(name = "用户代码") - private String userCode; - - /** 内部排序 */ - @Excel(name = "内部排序") - private Integer orderId; - - public void setChoiceCode(String choiceCode) - { - this.choiceCode = choiceCode; - } - - public String getChoiceCode() - { - return choiceCode; - } - public void setUserCode(String userCode) - { - this.userCode = userCode; - } - - public String getUserCode() - { - return userCode; - } - public void setOrderId(Integer orderId) - { - this.orderId = orderId; - } - - public Integer getOrderId() - { - return orderId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("choiceCode", getChoiceCode()) - .append("userCode", getUserCode()) - .append("orderId", getOrderId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/TempUserChoice.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/TempUserChoice.java deleted file mode 100644 index ff9fd01..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/TempUserChoice.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hig.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 用户选择对象 temp_user_choice - * - * @author qnsdt - * @date 2023-01-31 - */ -public class TempUserChoice extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 选择代码 */ - @Excel(name = "选择代码") - private String choiceCode; - - /** 用户代码 */ - @Excel(name = "用户代码") - private String userCode; - - /** 内部排序 */ - @Excel(name = "内部排序") - private Long orderId; - - public void setChoiceCode(String choiceCode) - { - this.choiceCode = choiceCode; - } - - public String getChoiceCode() - { - return choiceCode; - } - public void setUserCode(String userCode) - { - this.userCode = userCode; - } - - public String getUserCode() - { - return userCode; - } - public void setOrderId(Long orderId) - { - this.orderId = orderId; - } - - public Long getOrderId() - { - return orderId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("choiceCode", getChoiceCode()) - .append("userCode", getUserCode()) - .append("orderId", getOrderId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/dto/SysUserCopy.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/dto/SysUserCopy.java deleted file mode 100644 index c6fc876..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/dto/SysUserCopy.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hig.system.domain.dto; - -import lombok.Data; - -@Data -public class SysUserCopy { - - private String conditionCode; - private String choiceCode; - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/dto/SysUserData.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/dto/SysUserData.java deleted file mode 100644 index ea2cd86..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/domain/dto/SysUserData.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hig.system.domain.dto; - -import lombok.Data; - -@Data -public class SysUserData { - private int userId; - private String userCode; - private String userName; - private String nickName; - private int deptId; - private String deptName; - private String email; - private String phonenumber; - private String sex; - private String avatar; - private int status; - private String remark; - private String choiceCode; - private int orderId; - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysGroupMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysGroupMapper.java deleted file mode 100644 index 6002cd7..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysGroupMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.system.mapper; - -import java.util.List; -import com.hig.system.domain.SysGroup; - -/** - * 人员分组Mapper接口 - * - * @author qnsdt - * @date 2023-01-28 - */ -public interface SysGroupMapper -{ - /** - * 查询人员分组 - * - * @param groupId 人员分组ID - * @return 人员分组 - */ - public SysGroup selectSysGroupById(Long groupId); - - /** - * 查询人员分组列表 - * - * @param sysGroup 人员分组 - * @return 人员分组集合 - */ - public List selectSysGroupList(SysGroup sysGroup); - - /** - * 查询人员分组列表 - * - * @param sysGroup 人员分组 - * @return 人员分组集合 - */ - public List selectChoiceSysGroupList(String examCode); - - /** - * 新增人员分组 - * - * @param sysGroup 人员分组 - * @return 结果 - */ - public int insertSysGroup(SysGroup sysGroup); - - /** - * 修改人员分组 - * - * @param sysGroup 人员分组 - * @return 结果 - */ - public int updateSysGroup(SysGroup sysGroup); - - /** - * 删除人员分组 - * - * @param groupId 人员分组ID - * @return 结果 - */ - public int deleteSysGroupById(Long groupId); - - /** - * 批量删除人员分组 - * - * @param groupIds 需要删除的数据ID - * @return 结果 - */ - public int deleteSysGroupByIds(Long[] groupIds); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysGroupPersonMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysGroupPersonMapper.java deleted file mode 100644 index bcdf954..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysGroupPersonMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.system.mapper; - -import java.util.List; -import com.hig.system.domain.SysGroupPerson; - -/** - * 分组用户Mapper接口 - * - * @author qnsdt - * @date 2023-02-06 - */ -public interface SysGroupPersonMapper -{ - /** - * 查询分组用户 - * - * @param groupCode 分组用户ID - * @return 分组用户 - */ - public SysGroupPerson selectSysGroupPersonById(String groupCode); - - /** - * 查询分组用户列表 - * - * @param sysGroupPerson 分组用户 - * @return 分组用户集合 - */ - public List selectSysGroupPersonList(SysGroupPerson sysGroupPerson); - - /** - * 新增分组用户 - * - * @param sysGroupPerson 分组用户 - * @return 结果 - */ - public int insertSysGroupPerson(SysGroupPerson sysGroupPerson); - - /** - * 修改分组用户 - * - * @param sysGroupPerson 分组用户 - * @return 结果 - */ - public int updateSysGroupPerson(SysGroupPerson sysGroupPerson); - - /** - * 删除分组用户 - * - * @param groupCode 分组用户ID - * @return 结果 - */ - public int deleteSysGroupPersonById(String groupCode); - - /** - * 批量删除分组用户 - * - * @param groupCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteSysGroupPersonByIds(String[] groupCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysUserChoiceMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysUserChoiceMapper.java deleted file mode 100644 index 8a9f5bf..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysUserChoiceMapper.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hig.system.mapper; - -import java.util.List; -import com.hig.system.domain.SysUserChoice; -import com.hig.system.domain.dto.SysUserCopy; -import com.hig.system.domain.dto.SysUserData; - -/** - * 选择用户Mapper接口 - * - * @author qnsdt - * @date 2023-02-02 - */ -public interface SysUserChoiceMapper -{ - /** - * 查询选择用户 - * - * @param choiceCode 选择用户ID - * @return 选择用户 - */ - public SysUserChoice selectSysUserChoiceById(String choiceCode); - - /** - * 查询选择用户列表 - * - * @param sysUserChoice 选择用户 - * @return 选择用户集合 - */ - public List selectSysUserChoiceList(SysUserChoice sysUserChoice); - - /** - * 查询选择用户列表 - * - * @param sysUserChoice 选择用户 - * @return 选择用户集合 - */ - public List selectGroupUserList(SysUserData sysUser); - - - public int copySysUser(SysUserCopy sysUserCopy); - - public int copyTempUser(SysUserCopy sysUserCopy); - /** - * 新增选择用户 - * - * @param sysUserChoice 选择用户 - * @return 结果 - */ - public int insertSysUserChoice(SysUserChoice sysUserChoice); - - /** - * 修改选择用户 - * - * @param sysUserChoice 选择用户 - * @return 结果 - */ - public int updateSysUserChoice(SysUserChoice sysUserChoice); - - /** - * 删除选择用户 - * - * @param choiceCode 选择用户ID - * @return 结果 - */ - public int deleteSysUserChoiceById(String choiceCode); - - /** - * 批量删除选择用户 - * - * @param choiceCodes 需要删除的数据ID - * @return 结果 - */ - public int deleteSysUserChoiceByIds(String[] choiceCodes); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysUserDataMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysUserDataMapper.java deleted file mode 100644 index f9a183b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/SysUserDataMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hig.system.mapper; - -import java.util.List; - -import com.hig.system.domain.dto.SysUserData; - -public interface SysUserDataMapper { - public List selectUserList(SysUserData sysUser); - - public List selectChoiceUserList(SysUserData sysUser); - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/TempUserChoiceMapper.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/TempUserChoiceMapper.java deleted file mode 100644 index 6496159..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/mapper/TempUserChoiceMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.system.mapper; - -import java.util.List; -import com.hig.system.domain.TempUserChoice; - -/** - * 用户选择Mapper接口 - * - * @author qnsdt - * @date 2023-01-31 - */ -public interface TempUserChoiceMapper -{ - /** - * 查询用户选择 - * - * @param choiceCode 用户选择ID - * @return 用户选择 - */ - public TempUserChoice selectTempUserChoiceById(String choiceCode); - - /** - * 查询用户选择列表 - * - * @param tempUserChoice 用户选择 - * @return 用户选择集合 - */ - public List selectTempUserChoiceList(TempUserChoice tempUserChoice); - - /** - * 新增用户选择 - * - * @param tempUserChoice 用户选择 - * @return 结果 - */ - public int insertTempUserChoice(TempUserChoice tempUserChoice); - - /** - * 修改用户选择 - * - * @param tempUserChoice 用户选择 - * @return 结果 - */ - public int updateTempUserChoice(TempUserChoice tempUserChoice); - - /** - * 删除用户选择 - * - * @param choiceCode 用户选择ID - * @return 结果 - */ - - public int deleteTempUserChoice(TempUserChoice tempUserChoice); - - /** - * 批量删除用户选择 - * - * @param choiceCodes 需要删除的数据ID - * @return 结果 - */ -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysGroupPersonService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysGroupPersonService.java deleted file mode 100644 index 8e4c810..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysGroupPersonService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.system.service; - -import java.util.List; -import com.hig.system.domain.SysGroupPerson; - -/** - * 分组用户Service接口 - * - * @author qnsdt - * @date 2023-02-06 - */ -public interface ISysGroupPersonService -{ - /** - * 查询分组用户 - * - * @param groupCode 分组用户ID - * @return 分组用户 - */ - public SysGroupPerson selectSysGroupPersonById(String groupCode); - - /** - * 查询分组用户列表 - * - * @param sysGroupPerson 分组用户 - * @return 分组用户集合 - */ - public List selectSysGroupPersonList(SysGroupPerson sysGroupPerson); - - /** - * 新增分组用户 - * - * @param sysGroupPerson 分组用户 - * @return 结果 - */ - public int insertSysGroupPerson(List sysGroupPersonList); - - /** - * 修改分组用户 - * - * @param sysGroupPerson 分组用户 - * @return 结果 - */ - public int updateSysGroupPerson(SysGroupPerson sysGroupPerson); - - /** - * 批量删除分组用户 - * - * @param groupCodes 需要删除的分组用户ID - * @return 结果 - */ - public int deleteSysGroupPersonByIds(String[] groupCodes); - - /** - * 删除分组用户信息 - * - * @param groupCode 分组用户ID - * @return 结果 - */ - public int deleteSysGroupPersonById(String groupCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysGroupService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysGroupService.java deleted file mode 100644 index 5138828..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysGroupService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hig.system.service; - -import java.util.List; -import com.hig.system.domain.SysGroup; - -/** - * 人员分组Service接口 - * - * @author qnsdt - * @date 2023-01-28 - */ -public interface ISysGroupService -{ - /** - * 查询人员分组 - * - * @param groupId 人员分组ID - * @return 人员分组 - */ - public SysGroup selectSysGroupById(Long groupId); - - /** - * 查询人员分组列表 - * - * @param sysGroup 人员分组 - * @return 人员分组集合 - */ - public List selectSysGroupList(SysGroup sysGroup); - - /** - * 查询人员分组列表 - * - * @param sysGroup 人员分组 - * @return 人员分组集合 - */ - public List selectChoiceSysGroupList(String examCode); - - /** - * 新增人员分组 - * - * @param sysGroup 人员分组 - * @return 结果 - */ - public int insertSysGroup(SysGroup sysGroup); - - /** - * 修改人员分组 - * - * @param sysGroup 人员分组 - * @return 结果 - */ - public int updateSysGroup(SysGroup sysGroup); - - /** - * 批量删除人员分组 - * - * @param groupIds 需要删除的人员分组ID - * @return 结果 - */ - public int deleteSysGroupByIds(Long[] groupIds); - - /** - * 删除人员分组信息 - * - * @param groupId 人员分组ID - * @return 结果 - */ - public int deleteSysGroupById(Long groupId); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysUserChoiceService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysUserChoiceService.java deleted file mode 100644 index 1440ee4..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysUserChoiceService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hig.system.service; - -import java.util.List; -import com.hig.system.domain.SysUserChoice; -import com.hig.system.domain.dto.SysUserCopy; -import com.hig.system.domain.dto.SysUserData; - -/** - * 选择用户Service接口 - * - * @author qnsdt - * @date 2023-02-02 - */ -public interface ISysUserChoiceService -{ - /** - * 查询选择用户 - * - * @param choiceCode 选择用户ID - * @return 选择用户 - */ - public SysUserChoice selectSysUserChoiceById(String choiceCode); - - /** - * 查询选择用户列表 - * - * @param sysUserChoice 选择用户 - * @return 选择用户集合 - */ - public List selectSysUserChoiceList(SysUserChoice sysUserChoice); - - /** - * 查询选择用户列表 - * - * @param sysUserChoice 选择用户 - * @return 选择用户集合 - */ - public List selectGroupUserList(SysUserData sysUser); - - /** - * 新增选择用户 - * - * @param sysUserChoice 选择用户 - * @return 结果 - */ - public int insertSysUserChoice(SysUserChoice sysUserChoice); - - public int copySysUser(SysUserCopy sysUserCopy); - - public int copyTempUser(SysUserCopy sysUserCopy); - - /** - * 修改选择用户 - * - * @param sysUserChoice 选择用户 - * @return 结果 - */ - public int updateSysUserChoice(SysUserChoice sysUserChoice); - - /** - * 批量删除选择用户 - * - * @param choiceCodes 需要删除的选择用户ID - * @return 结果 - */ - public int deleteSysUserChoiceByIds(String[] choiceCodes); - - /** - * 删除选择用户信息 - * - * @param choiceCode 选择用户ID - * @return 结果 - */ - public int deleteSysUserChoiceById(String choiceCode); -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysUserDataService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysUserDataService.java deleted file mode 100644 index ee1ede5..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ISysUserDataService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hig.system.service; - -import java.util.List; - -import com.hig.system.domain.dto.SysUserData; - -public interface ISysUserDataService { - public List selectUserList(SysUserData sysUser); - - public List selectChoiceUserList(SysUserData sysUser); - - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ITempUserChoiceService.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ITempUserChoiceService.java deleted file mode 100644 index 5e1e325..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/ITempUserChoiceService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hig.system.service; - -import java.util.List; -import com.hig.system.domain.TempUserChoice; - -/** - * 用户选择Service接口 - * - * @author qnsdt - * @date 2023-01-31 - */ -public interface ITempUserChoiceService -{ - /** - * 查询用户选择 - * - * @param choiceCode 用户选择ID - * @return 用户选择 - */ - public TempUserChoice selectTempUserChoiceById(String choiceCode); - - /** - * 查询用户选择列表 - * - * @param tempUserChoice 用户选择 - * @return 用户选择集合 - */ - public List selectTempUserChoiceList(TempUserChoice tempUserChoice); - - /** - * 新增用户选择 - * - * @param tempUserChoice 用户选择 - * @return 结果 - */ - public int insertTempUserChoice(TempUserChoice tempUserChoice); - - public int batchInsertTempUser(List userList); - - /** - * 修改用户选择 - * - * @param tempUserChoice 用户选择 - * @return 结果 - */ - public int updateTempUserChoice(TempUserChoice tempUserChoice); - - /** - * 批量删除用户选择 - * - * @param choiceCodes 需要删除的用户选择ID - * @return 结果 - */ - public int deleteTempUserChoice(List userList); - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysGroupPersonServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysGroupPersonServiceImpl.java deleted file mode 100644 index 4b1e58c..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysGroupPersonServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hig.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.system.mapper.SysGroupPersonMapper; -import com.hig.system.domain.SysGroupPerson; -import com.hig.system.service.ISysGroupPersonService; - -/** - * 分组用户Service业务层处理 - * - * @author qnsdt - * @date 2023-02-06 - */ -@Service -public class SysGroupPersonServiceImpl implements ISysGroupPersonService -{ - @Autowired - private SysGroupPersonMapper sysGroupPersonMapper; - - /** - * 查询分组用户 - * - * @param groupCode 分组用户ID - * @return 分组用户 - */ - @Override - public SysGroupPerson selectSysGroupPersonById(String groupCode) - { - return sysGroupPersonMapper.selectSysGroupPersonById(groupCode); - } - - /** - * 查询分组用户列表 - * - * @param sysGroupPerson 分组用户 - * @return 分组用户 - */ - @Override - public List selectSysGroupPersonList(SysGroupPerson sysGroupPerson) - { - return sysGroupPersonMapper.selectSysGroupPersonList(sysGroupPerson); - } - - /** - * 新增分组用户 - * - * @param sysGroupPerson 分组用户 - * @return 结果 - */ - @Override - public int insertSysGroupPerson(List sysGroupPersonList) - { - sysGroupPersonMapper.deleteSysGroupPersonById(sysGroupPersonList.get(0).getGroupCode()); - int count = 0; - - for (SysGroupPerson sysGroupPerson: sysGroupPersonList) { - count += sysGroupPersonMapper.insertSysGroupPerson(sysGroupPerson); - } - - return count; - } - - /** - * 修改分组用户 - * - * @param sysGroupPerson 分组用户 - * @return 结果 - */ - @Override - public int updateSysGroupPerson(SysGroupPerson sysGroupPerson) - { - return sysGroupPersonMapper.updateSysGroupPerson(sysGroupPerson); - } - - /** - * 批量删除分组用户 - * - * @param groupCodes 需要删除的分组用户ID - * @return 结果 - */ - @Override - public int deleteSysGroupPersonByIds(String[] groupCodes) - { - return sysGroupPersonMapper.deleteSysGroupPersonByIds(groupCodes); - } - - /** - * 删除分组用户信息 - * - * @param groupCode 分组用户ID - * @return 结果 - */ - @Override - public int deleteSysGroupPersonById(String groupCode) - { - return sysGroupPersonMapper.deleteSysGroupPersonById(groupCode); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysGroupServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysGroupServiceImpl.java deleted file mode 100644 index 4adfff7..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysGroupServiceImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.hig.system.service.impl; - -import java.util.List; -import com.ruoyi.common.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.system.mapper.SysGroupMapper; -import com.hig.system.domain.SysGroup; -import com.hig.system.service.ISysGroupService; - -/** - * 人员分组Service业务层处理 - * - * @author qnsdt - * @date 2023-01-28 - */ -@Service -public class SysGroupServiceImpl implements ISysGroupService -{ - @Autowired - private SysGroupMapper sysGroupMapper; - - /** - * 查询人员分组 - * - * @param groupId 人员分组ID - * @return 人员分组 - */ - @Override - public SysGroup selectSysGroupById(Long groupId) - { - return sysGroupMapper.selectSysGroupById(groupId); - } - - /** - * 查询人员分组列表 - * - * @param sysGroup 人员分组 - * @return 人员分组 - */ - @Override - public List selectSysGroupList(SysGroup sysGroup) - { - return sysGroupMapper.selectSysGroupList(sysGroup); - } - - /** - * 新增人员分组 - * - * @param sysGroup 人员分组 - * @return 结果 - */ - @Override - public int insertSysGroup(SysGroup sysGroup) - { - sysGroup.setCreateTime(DateUtils.getNowDate()); - return sysGroupMapper.insertSysGroup(sysGroup); - } - - /** - * 修改人员分组 - * - * @param sysGroup 人员分组 - * @return 结果 - */ - @Override - public int updateSysGroup(SysGroup sysGroup) - { - return sysGroupMapper.updateSysGroup(sysGroup); - } - - /** - * 批量删除人员分组 - * - * @param groupIds 需要删除的人员分组ID - * @return 结果 - */ - @Override - public int deleteSysGroupByIds(Long[] groupIds) - { - return sysGroupMapper.deleteSysGroupByIds(groupIds); - } - - /** - * 删除人员分组信息 - * - * @param groupId 人员分组ID - * @return 结果 - */ - @Override - public int deleteSysGroupById(Long groupId) - { - return sysGroupMapper.deleteSysGroupById(groupId); - } - - @Override - public List selectChoiceSysGroupList(String examCode) { - // TODO Auto-generated method stub - return sysGroupMapper.selectChoiceSysGroupList(examCode); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysUserChoiceServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysUserChoiceServiceImpl.java deleted file mode 100644 index 5e08e7c..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysUserChoiceServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hig.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.system.mapper.SysUserChoiceMapper; -import com.hig.system.domain.SysUserChoice; -import com.hig.system.domain.dto.SysUserCopy; -import com.hig.system.domain.dto.SysUserData; -import com.hig.system.service.ISysUserChoiceService; - -/** - * 选择用户Service业务层处理 - * - * @author qnsdt - * @date 2023-02-02 - */ -@Service -public class SysUserChoiceServiceImpl implements ISysUserChoiceService -{ - @Autowired - private SysUserChoiceMapper sysUserChoiceMapper; - - /** - * 查询选择用户 - * - * @param choiceCode 选择用户ID - * @return 选择用户 - */ - @Override - public SysUserChoice selectSysUserChoiceById(String choiceCode) - { - return sysUserChoiceMapper.selectSysUserChoiceById(choiceCode); - } - - /** - * 查询选择用户列表 - * - * @param sysUserChoice 选择用户 - * @return 选择用户 - */ - @Override - public List selectSysUserChoiceList(SysUserChoice sysUserChoice) - { - return sysUserChoiceMapper.selectSysUserChoiceList(sysUserChoice); - } - - /** - * 新增选择用户 - * - * @param sysUserChoice 选择用户 - * @return 结果 - */ - @Override - public int insertSysUserChoice(SysUserChoice sysUserChoice) - { - return sysUserChoiceMapper.insertSysUserChoice(sysUserChoice); - } - - /** - * 修改选择用户 - * - * @param sysUserChoice 选择用户 - * @return 结果 - */ - @Override - public int updateSysUserChoice(SysUserChoice sysUserChoice) - { - return sysUserChoiceMapper.updateSysUserChoice(sysUserChoice); - } - - /** - * 批量删除选择用户 - * - * @param choiceCodes 需要删除的选择用户ID - * @return 结果 - */ - @Override - public int deleteSysUserChoiceByIds(String[] choiceCodes) - { - return sysUserChoiceMapper.deleteSysUserChoiceByIds(choiceCodes); - } - - /** - * 删除选择用户信息 - * - * @param choiceCode 选择用户ID - * @return 结果 - */ - @Override - public int deleteSysUserChoiceById(String choiceCode) - { - return sysUserChoiceMapper.deleteSysUserChoiceById(choiceCode); - } - - @Override - public int copySysUser(SysUserCopy sysUserCopy) { - // TODO Auto-generated method stub - return sysUserChoiceMapper.copySysUser(sysUserCopy); - } - - @Override - public int copyTempUser(SysUserCopy sysUserCopy) { - // TODO Auto-generated method stub - return sysUserChoiceMapper.copyTempUser(sysUserCopy); - } - - @Override - public List selectGroupUserList(SysUserData sysUser) { - // TODO Auto-generated method stub - return sysUserChoiceMapper.selectGroupUserList(sysUser); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysUserDataServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysUserDataServiceImpl.java deleted file mode 100644 index c9635fe..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/SysUserDataServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hig.system.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.hig.system.domain.dto.SysUserData; -import com.hig.system.mapper.SysUserDataMapper; -import com.hig.system.service.ISysUserDataService; - -@Service -public class SysUserDataServiceImpl implements ISysUserDataService { - @Autowired - SysUserDataMapper sysUserDataMapper; - - @Override - public List selectUserList(SysUserData sysUser) { - // TODO Auto-generated method stub - return sysUserDataMapper.selectUserList(sysUser); - } - - @Override - public List selectChoiceUserList(SysUserData sysUser) { - // TODO Auto-generated method stub - return sysUserDataMapper.selectChoiceUserList(sysUser); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/TempUserChoiceServiceImpl.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/TempUserChoiceServiceImpl.java deleted file mode 100644 index 8be7031..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/system/service/impl/TempUserChoiceServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hig.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.hig.system.mapper.TempUserChoiceMapper; -import com.hig.system.domain.TempUserChoice; -import com.hig.system.service.ITempUserChoiceService; - -/** - * 用户选择Service业务层处理 - * - * @author qnsdt - * @date 2023-01-31 - */ -@Service -public class TempUserChoiceServiceImpl implements ITempUserChoiceService -{ - @Autowired - private TempUserChoiceMapper tempUserChoiceMapper; - - /** - * 查询用户选择 - * - * @param choiceCode 用户选择ID - * @return 用户选择 - */ - @Override - public TempUserChoice selectTempUserChoiceById(String choiceCode) - { - return tempUserChoiceMapper.selectTempUserChoiceById(choiceCode); - } - - /** - * 查询用户选择列表 - * - * @param tempUserChoice 用户选择 - * @return 用户选择 - */ - @Override - public List selectTempUserChoiceList(TempUserChoice tempUserChoice) - { - return tempUserChoiceMapper.selectTempUserChoiceList(tempUserChoice); - } - - /** - * 新增用户选择 - * - * @param tempUserChoice 用户选择 - * @return 结果 - */ - @Override - public int insertTempUserChoice(TempUserChoice tempUserChoice) - { - return tempUserChoiceMapper.insertTempUserChoice(tempUserChoice); - } - - /** - * 修改用户选择 - * - * @param tempUserChoice 用户选择 - * @return 结果 - */ - @Override - public int updateTempUserChoice(TempUserChoice tempUserChoice) - { - return tempUserChoiceMapper.updateTempUserChoice(tempUserChoice); - } - - @Override - public int deleteTempUserChoice(List userList) { - // TODO Auto-generated method stub - int count = 0; - for(TempUserChoice tempUser: userList) { - count += tempUserChoiceMapper.deleteTempUserChoice(tempUser); - } - return count; - } - - @Override - public int batchInsertTempUser(List userList) { - // TODO Auto-generated method stub - int count = 0; - for(TempUserChoice tempUser: userList) { - count += tempUserChoiceMapper.insertTempUserChoice(tempUser); - } - return count; - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/ActionEnter.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/ActionEnter.java deleted file mode 100644 index 92b3f44..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/ActionEnter.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.hig.ueditor; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import com.hig.ueditor.define.ActionMap; -import com.hig.ueditor.define.AppInfo; -import com.hig.ueditor.define.BaseState; -import com.hig.ueditor.define.State; -import com.hig.ueditor.hunter.FileManager; -import com.hig.ueditor.hunter.ImageHunter; -import com.hig.ueditor.upload.Uploader; - -public class ActionEnter { - - private HttpServletRequest request = null; - - private String rootPath = null; - private String contextPath = null; - - private String actionType = null; - - private ConfigManager configManager = null; - - public ActionEnter ( HttpServletRequest request, String rootPath ) { - - this.request = request; - this.rootPath = rootPath; - this.actionType = request.getParameter( "action" ); - this.contextPath = request.getContextPath(); - this.configManager = ConfigManager.getInstance( this.rootPath, this.contextPath, request.getRequestURI() ); - - } - - public String exec () { - - String callbackName = this.request.getParameter("callback"); - - if ( callbackName != null ) { - - if ( !validCallbackName( callbackName ) ) { - return new BaseState( false, AppInfo.ILLEGAL ).toJSONString(); - } - - return callbackName+"("+this.invoke()+");"; - - } else { - return this.invoke(); - } - - } - - public String invoke() { - - if ( actionType == null || !ActionMap.mapping.containsKey( actionType ) ) { - return new BaseState( false, AppInfo.INVALID_ACTION ).toJSONString(); - } - - if ( this.configManager == null || !this.configManager.valid() ) { - return new BaseState( false, AppInfo.CONFIG_ERROR ).toJSONString(); - } - - State state = null; - - int actionCode = ActionMap.getType( this.actionType ); - - Map conf = null; - - switch ( actionCode ) { - - case ActionMap.CONFIG: - return this.configManager.getAllConfig().toString(); - - case ActionMap.UPLOAD_IMAGE: - case ActionMap.UPLOAD_SCRAWL: - case ActionMap.UPLOAD_VIDEO: - case ActionMap.UPLOAD_FILE: - conf = this.configManager.getConfig( actionCode ); - state = new Uploader( request, conf ).doExec(); - break; - - case ActionMap.CATCH_IMAGE: - conf = configManager.getConfig( actionCode ); - String[] list = this.request.getParameterValues( (String)conf.get( "fieldName" ) ); - state = new ImageHunter( conf ).capture( list ); - break; - - case ActionMap.LIST_IMAGE: - case ActionMap.LIST_FILE: - conf = configManager.getConfig( actionCode ); - int start = this.getStartIndex(); - state = new FileManager( conf ).listFile( start ); - break; - - } - - return state.toJSONString(); - - } - - public int getStartIndex () { - - String start = this.request.getParameter( "start" ); - - try { - return Integer.parseInt( start ); - } catch ( Exception e ) { - return 0; - } - - } - - /** - * callback参数验证 - */ - public boolean validCallbackName ( String name ) { - - if ( name.matches( "^[a-zA-Z_]+[\\w0-9_]*$" ) ) { - return true; - } - - return false; - - } - -} \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/ConfigManager.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/ConfigManager.java deleted file mode 100644 index 56da0af..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/ConfigManager.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.hig.ueditor; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.URISyntaxException; -import java.util.HashMap; -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONObject; - -import com.hig.ueditor.define.ActionMap; - -/** - * 配置管理器 - * @author hancong03@baidu.com - * - */ -public final class ConfigManager { - - private final String rootPath; - private final String originalPath; - private final String contextPath; - private static final String configFileName = "config.json"; - private String parentPath = null; - private JSONObject jsonConfig = null; - // 涂鸦上传filename定义 - private final static String SCRAWL_FILE_NAME = "scrawl"; - // 远程图片抓取filename定义 - private final static String REMOTE_FILE_NAME = "remote"; - - /* - * 通过一个给定的路径构建一个配置管理器， 该管理器要求地址路径所在目录下必须存在config.properties文件 - */ - private ConfigManager ( String rootPath, String contextPath, String uri ) throws FileNotFoundException, IOException { - - rootPath = rootPath.replace( "\\", "/" ); - - this.rootPath = rootPath; - this.contextPath = contextPath; - - if ( contextPath.length() > 0 ) { - this.originalPath = this.rootPath + uri.substring( contextPath.length() ); - } else { - this.originalPath = this.rootPath + uri; - } - - this.initEnv(); - - } - - /** - * 配置管理器构造工厂 - * @param rootPath 服务器根路径 - * @param contextPath 服务器所在项目路径 - * @param uri 当前访问的uri - * @return 配置管理器实例或者null - */ - public static ConfigManager getInstance ( String rootPath, String contextPath, String uri ) { - - try { - return new ConfigManager(rootPath, contextPath, uri); - } catch ( Exception e ) { - return null; - } - - } - - // 验证配置文件加载是否正确 - public boolean valid () { - return this.jsonConfig != null; - } - - public JSONObject getAllConfig () { - - return this.jsonConfig; - - } - - public Map getConfig ( int type ) { - - Map conf = new HashMap(); - String savePath = null; - - switch ( type ) { - - case ActionMap.UPLOAD_FILE: - conf.put( "isBase64", "false" ); - conf.put( "maxSize", this.jsonConfig.getLong( "fileMaxSize" ) ); - conf.put( "allowFiles", this.getArray( "fileAllowFiles" ) ); - conf.put( "fieldName", this.jsonConfig.getString( "fileFieldName" ) ); - savePath = this.jsonConfig.getString( "filePathFormat" ); - break; - - case ActionMap.UPLOAD_IMAGE: - conf.put( "isBase64", "false" ); - conf.put( "maxSize", this.jsonConfig.getLong( "imageMaxSize" ) ); - conf.put( "allowFiles", this.getArray( "imageAllowFiles" ) ); - conf.put( "fieldName", this.jsonConfig.getString( "imageFieldName" ) ); - conf.put("basePath", this.jsonConfig.getString( "basePath" ) ); - savePath = this.jsonConfig.getString( "imagePathFormat" ); - break; - - case ActionMap.UPLOAD_VIDEO: - conf.put( "maxSize", this.jsonConfig.getLong( "videoMaxSize" ) ); - conf.put( "allowFiles", this.getArray( "videoAllowFiles" ) ); - conf.put( "fieldName", this.jsonConfig.getString( "videoFieldName" ) ); - conf.put("basePath", this.jsonConfig.getString( "basePath" ) ); - savePath = this.jsonConfig.getString( "videoPathFormat" ); - break; - - case ActionMap.UPLOAD_SCRAWL: - conf.put( "filename", ConfigManager.SCRAWL_FILE_NAME ); - conf.put( "maxSize", this.jsonConfig.getLong( "scrawlMaxSize" ) ); - conf.put( "fieldName", this.jsonConfig.getString( "scrawlFieldName" ) ); - conf.put( "isBase64", "true" ); - savePath = this.jsonConfig.getString( "scrawlPathFormat" ); - break; - - case ActionMap.CATCH_IMAGE: - conf.put( "filename", ConfigManager.REMOTE_FILE_NAME ); - conf.put( "filter", this.getArray( "catcherLocalDomain" ) ); - conf.put( "maxSize", this.jsonConfig.getLong( "catcherMaxSize" ) ); - conf.put( "allowFiles", this.getArray( "catcherAllowFiles" ) ); - conf.put( "fieldName", this.jsonConfig.getString( "catcherFieldName" ) + "[]" ); - savePath = this.jsonConfig.getString( "catcherPathFormat" ); - break; - - case ActionMap.LIST_IMAGE: - conf.put( "allowFiles", this.getArray( "imageManagerAllowFiles" ) ); - conf.put( "dir", this.jsonConfig.getString( "imageManagerListPath" ) ); - conf.put( "count", this.jsonConfig.getInt( "imageManagerListSize" ) ); - break; - - case ActionMap.LIST_FILE: - conf.put( "allowFiles", this.getArray( "fileManagerAllowFiles" ) ); - conf.put( "dir", this.jsonConfig.getString( "fileManagerListPath" ) ); - conf.put( "count", this.jsonConfig.getInt( "fileManagerListSize" ) ); - break; - - } - - conf.put( "savePath", savePath ); - conf.put( "rootPath", this.rootPath ); - - return conf; - - } - - private void initEnv () throws FileNotFoundException, IOException { - - File file = new File( this.originalPath ); - - if ( !file.isAbsolute() ) { - file = new File( file.getAbsolutePath() ); - } - - this.parentPath = file.getParent(); - - String configContent = this.readFile( this.getConfigPath() ); - - try{ - JSONObject jsonConfig = new JSONObject( configContent ); - this.jsonConfig = jsonConfig; - } catch ( Exception e ) { - this.jsonConfig = null; - } - - } - - private String getConfigPath () { -// return this.parentPath + File.separator + ConfigManager.configFileName; - // 修改源码 - try{ - return this.getClass().getClassLoader().getResource("config.json").toURI().getPath(); - } catch (URISyntaxException e) { - e.printStackTrace(); - return null; - } - } - - - private String[] getArray ( String key ) { - - JSONArray jsonArray = this.jsonConfig.getJSONArray( key ); - String[] result = new String[ jsonArray.length() ]; - - for ( int i = 0, len = jsonArray.length(); i < len; i++ ) { - result[i] = jsonArray.getString( i ); - } - - return result; - - } - - private String readFile ( String path ) throws IOException { - - StringBuilder builder = new StringBuilder(); - - try { - - InputStreamReader reader = new InputStreamReader( new FileInputStream( path ), "UTF-8" ); - BufferedReader bfReader = new BufferedReader( reader ); - - String tmpContent = null; - - while ( ( tmpContent = bfReader.readLine() ) != null ) { - builder.append( tmpContent ); - } - - bfReader.close(); - - } catch ( UnsupportedEncodingException e ) { - // 忽略 - } - - return this.filter( builder.toString() ); - - } - - // 过滤输入字符串, 剔除多行注释以及替换掉反斜杠 - private String filter ( String input ) { - - return input.replaceAll( "/\\*[\\s\\S]*?\\*/", "" ); - - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/Encoder.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/Encoder.java deleted file mode 100644 index 1faca59..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/Encoder.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hig.ueditor; - -public class Encoder { - - public static String toUnicode ( String input ) { - - StringBuilder builder = new StringBuilder(); - char[] chars = input.toCharArray(); - - for ( char ch : chars ) { - - if ( ch < 256 ) { - builder.append( ch ); - } else { - builder.append( "\\u" + Integer.toHexString( ch& 0xffff ) ); - } - - } - - return builder.toString(); - - } - -} \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/PathFormat.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/PathFormat.java deleted file mode 100644 index 53d4100..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/PathFormat.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.hig.ueditor; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class PathFormat { - - private static final String TIME = "time"; - private static final String FULL_YEAR = "yyyy"; - private static final String YEAR = "yy"; - private static final String MONTH = "mm"; - private static final String DAY = "dd"; - private static final String HOUR = "hh"; - private static final String MINUTE = "ii"; - private static final String SECOND = "ss"; - private static final String RAND = "rand"; - - private static Date currentDate = null; - - public static String parse ( String input ) { - - Pattern pattern = Pattern.compile( "\\{([^\\}]+)\\}", Pattern.CASE_INSENSITIVE ); - Matcher matcher = pattern.matcher(input); - - PathFormat.currentDate = new Date(); - - StringBuffer sb = new StringBuffer(); - - while ( matcher.find() ) { - - matcher.appendReplacement(sb, PathFormat.getString( matcher.group( 1 ) ) ); - - } - - matcher.appendTail(sb); - - return sb.toString(); - } - - /** - * 格式化路径, 把windows路径替换成标准路径 - * @param input 待格式化的路径 - * @return 格式化后的路径 - */ - public static String format ( String input ) { - - return input.replace( "\\", "/" ); - - } - - public static String parse ( String input, String filename ) { - - Pattern pattern = Pattern.compile( "\\{([^\\}]+)\\}", Pattern.CASE_INSENSITIVE ); - Matcher matcher = pattern.matcher(input); - String matchStr = null; - - PathFormat.currentDate = new Date(); - - StringBuffer sb = new StringBuffer(); - - while ( matcher.find() ) { - - matchStr = matcher.group( 1 ); - if ( matchStr.indexOf( "filename" ) != -1 ) { - filename = filename.replace( "$", "\\$" ).replaceAll( "[\\/:*?\"<>|]", "" ); - matcher.appendReplacement(sb, filename ); - } else { - matcher.appendReplacement(sb, PathFormat.getString( matchStr ) ); - } - - } - - matcher.appendTail(sb); - - return sb.toString(); - } - - private static String getString ( String pattern ) { - - pattern = pattern.toLowerCase(); - - // time 处理 - if ( pattern.indexOf( PathFormat.TIME ) != -1 ) { - return PathFormat.getTimestamp(); - } else if ( pattern.indexOf( PathFormat.FULL_YEAR ) != -1 ) { - return PathFormat.getFullYear(); - } else if ( pattern.indexOf( PathFormat.YEAR ) != -1 ) { - return PathFormat.getYear(); - } else if ( pattern.indexOf( PathFormat.MONTH ) != -1 ) { - return PathFormat.getMonth(); - } else if ( pattern.indexOf( PathFormat.DAY ) != -1 ) { - return PathFormat.getDay(); - } else if ( pattern.indexOf( PathFormat.HOUR ) != -1 ) { - return PathFormat.getHour(); - } else if ( pattern.indexOf( PathFormat.MINUTE ) != -1 ) { - return PathFormat.getMinute(); - } else if ( pattern.indexOf( PathFormat.SECOND ) != -1 ) { - return PathFormat.getSecond(); - } else if ( pattern.indexOf( PathFormat.RAND ) != -1 ) { - return PathFormat.getRandom( pattern ); - } - - return pattern; - - } - - private static String getTimestamp () { - return System.currentTimeMillis() + ""; - } - - private static String getFullYear () { - return new SimpleDateFormat( "yyyy" ).format( PathFormat.currentDate ); - } - - private static String getYear () { - return new SimpleDateFormat( "yy" ).format( PathFormat.currentDate ); - } - - private static String getMonth () { - return new SimpleDateFormat( "MM" ).format( PathFormat.currentDate ); - } - - private static String getDay () { - return new SimpleDateFormat( "dd" ).format( PathFormat.currentDate ); - } - - private static String getHour () { - return new SimpleDateFormat( "HH" ).format( PathFormat.currentDate ); - } - - private static String getMinute () { - return new SimpleDateFormat( "mm" ).format( PathFormat.currentDate ); - } - - private static String getSecond () { - return new SimpleDateFormat( "ss" ).format( PathFormat.currentDate ); - } - - private static String getRandom ( String pattern ) { - - int length = 0; - pattern = pattern.split( ":" )[ 1 ].trim(); - - length = Integer.parseInt( pattern ); - - return ( Math.random() + "" ).replace( ".", "" ).substring( 0, length ); - - } - - public static void main(String[] args) { - // TODO Auto-generated method stub - - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/common/UEditorFile.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/common/UEditorFile.java deleted file mode 100644 index 02e8154..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/common/UEditorFile.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hig.ueditor.common; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -@Data -@NoArgsConstructor -@Accessors(chain = true) -public class UEditorFile { - - private static final long serialVersionUID=1L; - - private String state; - - private String url; - - private String title; - - private String original; - - @Override - public String toString() { - return "{" + - "state='" + state + '\'' + - ", url='" + url + '\'' + - ", title='" + title + '\'' + - ", original='" + original + '\'' + - '}'; - } -} - diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/common/UEditorUpload.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/common/UEditorUpload.java deleted file mode 100644 index 81f6ca4..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/common/UEditorUpload.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.hig.ueditor.common; - -import com.hig.ueditor.PathFormat; -import com.hig.ueditor.define.AppInfo; -import com.hig.ueditor.define.BaseState; -import com.hig.ueditor.define.FileType; -import com.hig.ueditor.define.State; -import com.hig.ueditor.upload.StorageManager; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -@Component -public class UEditorUpload { - public final State uploadImage(HttpServletRequest request, Map conf) throws IOException { - - if (!ServletFileUpload.isMultipartContent(request)) { - return new BaseState(false, AppInfo.NOT_MULTIPART_CONTENT); - } - - - try { - - /*========== 添加的内容 ==========*/ - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - MultipartFile multipartFile = multipartRequest.getFile(conf.get("fieldName").toString()); - if (multipartFile == null) { - return new BaseState(false, AppInfo.NOTFOUND_UPLOAD_DATA); - } - // 添加结束 - - String savePath = (String) conf.get("savePath"); - String originFileName = multipartFile.getOriginalFilename(); //　修改的 - String suffix = FileType.getSuffixByFilename(originFileName); // 此处取文件扩展名 - - originFileName = originFileName.substring(0, - originFileName.length() - suffix.length()); - - long maxSize = ((Long) conf.get("maxSize")).longValue(); - - if (!validType(suffix, (String[]) conf.get("allowFiles"))) { - return new BaseState(false, AppInfo.NOT_ALLOW_FILE_TYPE); - } - - savePath = PathFormat.parse(savePath, ""); - - savePath += suffix; - String physicalPath = (String) conf.get("basePath") + savePath; - InputStream is = multipartFile.getInputStream(); - State storageState = StorageManager.saveFileByInputStream(is, - physicalPath, maxSize); - is.close(); - - if (storageState.isSuccess()) { - storageState.putInfo("url", PathFormat.format(savePath)); - storageState.putInfo("type", suffix); - storageState.putInfo("original", originFileName + suffix); - } - - return storageState; - } catch (IOException e) { - } - return new BaseState(false, AppInfo.IO_ERROR); - - } - - public final State uploadMovie(HttpServletRequest request, Map conf) throws IOException { - - - if (!ServletFileUpload.isMultipartContent(request)) { - return new BaseState(false, AppInfo.NOT_MULTIPART_CONTENT); - } - - - try { - - /*========== 添加的内容 ==========*/ - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - MultipartFile multipartFile = multipartRequest.getFile(conf.get("fieldName").toString()); - if (multipartFile == null) { - return new BaseState(false, AppInfo.NOTFOUND_UPLOAD_DATA); - } - // 添加结束 - - String savePath = (String) conf.get("savePath"); - String originFileName = multipartFile.getOriginalFilename(); //　修改的 - String suffix = FileType.getSuffixByFilename(originFileName); // 此处取文件扩展名 - - // 这里重新生成文件名 - - originFileName = "movie"; - - long maxSize = ((Long) conf.get("maxSize")).longValue(); - - if (!validType(suffix, (String[]) conf.get("allowFiles"))) { - return new BaseState(false, AppInfo.NOT_ALLOW_FILE_TYPE); - } - - savePath = PathFormat.parse(savePath, ""); - - savePath += suffix; - String physicalPath = (String) conf.get("basePath") + savePath; - InputStream is = multipartFile.getInputStream(); - State storageState = StorageManager.saveFileByInputStream(is, - physicalPath, maxSize); - is.close(); - - if (storageState.isSuccess()) { - storageState.putInfo("url", PathFormat.format(savePath)); - storageState.putInfo("type", suffix); - storageState.putInfo("original", originFileName + suffix); - } - - return storageState; - } catch (IOException e) { - } - return new BaseState(false, AppInfo.IO_ERROR); - - } - - private static boolean validType(String type, String[] allowTypes) { - List list = Arrays.asList(allowTypes); - - return list.contains(type); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/controller/UEditorController.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/controller/UEditorController.java deleted file mode 100644 index b524846..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/controller/UEditorController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hig.ueditor.controller; - - -import java.io.FileInputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.Map; - -import javax.imageio.stream.FileImageInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.json.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.hig.ueditor.ActionEnter; -import com.hig.ueditor.ConfigManager; -import com.hig.ueditor.common.UEditorFile; -import com.hig.ueditor.common.UEditorUpload; -import com.hig.ueditor.define.ActionMap; -import com.hig.ueditor.define.State; - - -@RestController -@RequestMapping("/ueditor") -@CrossOrigin(allowCredentials = "true", originPatterns = "*") -public class UEditorController { - @Autowired - private UEditorUpload uEditorUpload; - - - @RequestMapping("/test") - public String getTest() { - return "ok"; - } - - - @RequestMapping("/config") - public String exec(HttpServletRequest request, - HttpServletResponse response, - @RequestParam(value = "action") String action, - @RequestParam(value = "upfile", required = false) MultipartFile upfile) throws Exception { - if (action.equals("config")) { - request.setCharacterEncoding("utf-8"); - response.setContentType("text/html"); - String rootPath = request.getSession().getServletContext().getRealPath("/"); - return new ActionEnter(request, rootPath).exec(); - } else if (action.equals("uploadimage")) { - request.setCharacterEncoding("utf-8"); - response.setContentType("text/html"); - String rootPath = request.getSession().getServletContext().getRealPath("/"); - String contextPath = request.getContextPath(); - ConfigManager configManager = ConfigManager.getInstance( rootPath, contextPath, request.getRequestURI() ); - Map conf = new HashMap(); - conf = configManager.getConfig(ActionMap.UPLOAD_IMAGE); - - - State uploadState = uEditorUpload.uploadImage(request, conf); - - return uploadState.toJSONString(); - } else if (action.equals("uploadvideo")) { - request.setCharacterEncoding("utf-8"); - response.setContentType("text/html"); - String rootPath = request.getSession().getServletContext().getRealPath("/"); - String contextPath = request.getContextPath(); - ConfigManager configManager = ConfigManager.getInstance( rootPath, contextPath, request.getRequestURI() ); - Map conf = new HashMap(); - conf = configManager.getConfig(ActionMap.UPLOAD_VIDEO); - - - State uploadState = uEditorUpload.uploadMovie(request, conf); - - return uploadState.toJSONString(); - - } else if (action.equals("configmanager")) { - - - return "Done|"; - } - - return "无效Action"; - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/ActionMap.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/ActionMap.java deleted file mode 100644 index 630ff06..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/ActionMap.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hig.ueditor.define; - -import java.util.Map; -import java.util.HashMap; - -/** - * 定义请求action类型 - * @author hancong03@baidu.com - * - */ -@SuppressWarnings("serial") -public final class ActionMap { - - public static final Map mapping; - // 获取配置请求 - public static final int CONFIG = 0; - public static final int UPLOAD_IMAGE = 1; - public static final int UPLOAD_SCRAWL = 2; - public static final int UPLOAD_VIDEO = 3; - public static final int UPLOAD_FILE = 4; - public static final int CATCH_IMAGE = 5; - public static final int LIST_FILE = 6; - public static final int LIST_IMAGE = 7; - - static { - mapping = new HashMap(){{ - put( "config", ActionMap.CONFIG ); - put( "uploadimage", ActionMap.UPLOAD_IMAGE ); - put( "uploadscrawl", ActionMap.UPLOAD_SCRAWL ); - put( "uploadvideo", ActionMap.UPLOAD_VIDEO ); - put( "uploadfile", ActionMap.UPLOAD_FILE ); - put( "catchimage", ActionMap.CATCH_IMAGE ); - put( "listfile", ActionMap.LIST_FILE ); - put( "listimage", ActionMap.LIST_IMAGE ); - }}; - } - - public static int getType ( String key ) { - return ActionMap.mapping.get( key ); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/ActionState.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/ActionState.java deleted file mode 100644 index 38ddc76..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/ActionState.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.hig.ueditor.define; - -public enum ActionState { - UNKNOW_ERROR -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/AppInfo.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/AppInfo.java deleted file mode 100644 index 2be72bf..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/AppInfo.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hig.ueditor.define; - -import java.util.HashMap; -import java.util.Map; - -public final class AppInfo { - - public static final int SUCCESS = 0; - public static final int MAX_SIZE = 1; - public static final int PERMISSION_DENIED = 2; - public static final int FAILED_CREATE_FILE = 3; - public static final int IO_ERROR = 4; - public static final int NOT_MULTIPART_CONTENT = 5; - public static final int PARSE_REQUEST_ERROR = 6; - public static final int NOTFOUND_UPLOAD_DATA = 7; - public static final int NOT_ALLOW_FILE_TYPE = 8; - - public static final int INVALID_ACTION = 101; - public static final int CONFIG_ERROR = 102; - - public static final int PREVENT_HOST = 201; - public static final int CONNECTION_ERROR = 202; - public static final int REMOTE_FAIL = 203; - - public static final int NOT_DIRECTORY = 301; - public static final int NOT_EXIST = 302; - - public static final int ILLEGAL = 401; - - public static Map info = new HashMap(){{ - - put( AppInfo.SUCCESS, "SUCCESS" ); - - // 无效的Action - put( AppInfo.INVALID_ACTION, "\u65E0\u6548\u7684Action" ); - // 配置文件初始化失败 - put( AppInfo.CONFIG_ERROR, "\u914D\u7F6E\u6587\u4EF6\u521D\u59CB\u5316\u5931\u8D25" ); - // 抓取远程图片失败 - put( AppInfo.REMOTE_FAIL, "\u6293\u53D6\u8FDC\u7A0B\u56FE\u7247\u5931\u8D25" ); - - // 被阻止的远程主机 - put( AppInfo.PREVENT_HOST, "\u88AB\u963B\u6B62\u7684\u8FDC\u7A0B\u4E3B\u673A" ); - // 远程连接出错 - put( AppInfo.CONNECTION_ERROR, "\u8FDC\u7A0B\u8FDE\u63A5\u51FA\u9519" ); - - // "文件大小超出限制" - put( AppInfo.MAX_SIZE, "\u6587\u4ef6\u5927\u5c0f\u8d85\u51fa\u9650\u5236" ); - // 权限不足， 多指写权限 - put( AppInfo.PERMISSION_DENIED, "\u6743\u9650\u4E0D\u8DB3" ); - // 创建文件失败 - put( AppInfo.FAILED_CREATE_FILE, "\u521B\u5EFA\u6587\u4EF6\u5931\u8D25" ); - // IO错误 - put( AppInfo.IO_ERROR, "IO\u9519\u8BEF" ); - // 上传表单不是multipart/form-data类型 - put( AppInfo.NOT_MULTIPART_CONTENT, "\u4E0A\u4F20\u8868\u5355\u4E0D\u662Fmultipart/form-data\u7C7B\u578B" ); - // 解析上传表单错误 - put( AppInfo.PARSE_REQUEST_ERROR, "\u89E3\u6790\u4E0A\u4F20\u8868\u5355\u9519\u8BEF" ); - // 未找到上传数据 - put( AppInfo.NOTFOUND_UPLOAD_DATA, "\u672A\u627E\u5230\u4E0A\u4F20\u6570\u636E" ); - // 不允许的文件类型 - put( AppInfo.NOT_ALLOW_FILE_TYPE, "\u4E0D\u5141\u8BB8\u7684\u6587\u4EF6\u7C7B\u578B" ); - - // 指定路径不是目录 - put( AppInfo.NOT_DIRECTORY, "\u6307\u5B9A\u8DEF\u5F84\u4E0D\u662F\u76EE\u5F55" ); - // 指定路径并不存在 - put( AppInfo.NOT_EXIST, "\u6307\u5B9A\u8DEF\u5F84\u5E76\u4E0D\u5B58\u5728" ); - - // callback参数名不合法 - put( AppInfo.ILLEGAL, "Callback\u53C2\u6570\u540D\u4E0D\u5408\u6CD5" ); - - }}; - - public static String getStateInfo ( int key ) { - return AppInfo.info.get( key ); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/BaseState.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/BaseState.java deleted file mode 100644 index 8abaafa..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/BaseState.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hig.ueditor.define; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import com.hig.ueditor.Encoder; - -public class BaseState implements State { - - private boolean state = false; - private String info = null; - - private Map infoMap = new HashMap(); - - public BaseState () { - this.state = true; - } - - public BaseState ( boolean state ) { - this.setState( state ); - } - - public BaseState ( boolean state, String info ) { - this.setState( state ); - this.info = info; - } - - public BaseState ( boolean state, int infoCode ) { - this.setState( state ); - this.info = AppInfo.getStateInfo( infoCode ); - } - - public boolean isSuccess () { - return this.state; - } - - public void setState ( boolean state ) { - this.state = state; - } - - public void setInfo ( String info ) { - this.info = info; - } - - public void setInfo ( int infoCode ) { - this.info = AppInfo.getStateInfo( infoCode ); - } - - @Override - public String toJSONString() { - return this.toString(); - } - - public String toString () { - - String key = null; - String stateVal = this.isSuccess() ? AppInfo.getStateInfo( AppInfo.SUCCESS ) : this.info; - - StringBuilder builder = new StringBuilder(); - - builder.append( "{\"state\": \"" + stateVal + "\"" ); - - Iterator iterator = this.infoMap.keySet().iterator(); - - while ( iterator.hasNext() ) { - - key = iterator.next(); - - builder.append( ",\"" + key + "\": \"" + this.infoMap.get(key) + "\"" ); - - } - - builder.append( "}" ); - - // return Encoder.toUnicode( builder.toString() ); - - return builder.toString(); - - } - - @Override - public void putInfo(String name, String val) { - this.infoMap.put(name, val); - } - - @Override - public void putInfo(String name, long val) { - this.putInfo(name, val+""); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/FileType.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/FileType.java deleted file mode 100644 index d62caca..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/FileType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hig.ueditor.define; - -import java.util.HashMap; -import java.util.Map; - -public class FileType { - - public static final String JPG = "JPG"; - - private static final Map types = new HashMap(){{ - - put( FileType.JPG, ".jpg" ); - - }}; - - public static String getSuffix ( String key ) { - return FileType.types.get( key ); - } - - /** - * 根据给定的文件名,获取其后缀信息 - * @param filename - * @return - */ - public static String getSuffixByFilename ( String filename ) { - - return filename.substring( filename.lastIndexOf( "." ) ).toLowerCase(); - - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/MIMEType.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/MIMEType.java deleted file mode 100644 index b6273cd..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/MIMEType.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hig.ueditor.define; - -import java.util.HashMap; -import java.util.Map; - -public class MIMEType { - - public static final Map types = new HashMap(){{ - put( "image/gif", ".gif" ); - put( "image/jpeg", ".jpg" ); - put( "image/jpg", ".jpg" ); - put( "image/png", ".png" ); - put( "image/bmp", ".bmp" ); - }}; - - public static String getSuffix ( String mime ) { - return MIMEType.types.get( mime ); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/MultiState.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/MultiState.java deleted file mode 100644 index 24e5cc5..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/MultiState.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.hig.ueditor.define; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import com.hig.ueditor.Encoder; - -/** - * 多状态集合状态 - * 其包含了多个状态的集合, 其本身自己也是一个状态 - * @author hancong03@baidu.com - * - */ -public class MultiState implements State { - - private boolean state = false; - private String info = null; - private Map intMap = new HashMap(); - private Map infoMap = new HashMap(); - private List stateList = new ArrayList(); - - public MultiState ( boolean state ) { - this.state = state; - } - - public MultiState ( boolean state, String info ) { - this.state = state; - this.info = info; - } - - public MultiState ( boolean state, int infoKey ) { - this.state = state; - this.info = AppInfo.getStateInfo( infoKey ); - } - - @Override - public boolean isSuccess() { - return this.state; - } - - public void addState ( State state ) { - stateList.add( state.toJSONString() ); - } - - /** - * 该方法调用无效果 - */ - @Override - public void putInfo(String name, String val) { - this.infoMap.put(name, val); - } - - @Override - public String toJSONString() { - - String stateVal = this.isSuccess() ? AppInfo.getStateInfo( AppInfo.SUCCESS ) : this.info; - - StringBuilder builder = new StringBuilder(); - - builder.append( "{\"state\": \"" + stateVal + "\"" ); - - // 数字转换 - Iterator iterator = this.intMap.keySet().iterator(); - - while ( iterator.hasNext() ) { - - stateVal = iterator.next(); - - builder.append( ",\""+ stateVal +"\": " + this.intMap.get( stateVal ) ); - - } - - iterator = this.infoMap.keySet().iterator(); - - while ( iterator.hasNext() ) { - - stateVal = iterator.next(); - - builder.append( ",\""+ stateVal +"\": \"" + this.infoMap.get( stateVal ) + "\"" ); - - } - - builder.append( ", list: [" ); - - - iterator = this.stateList.iterator(); - - while ( iterator.hasNext() ) { - - builder.append( iterator.next() + "," ); - - } - - if ( this.stateList.size() > 0 ) { - builder.deleteCharAt( builder.length() - 1 ); - } - - builder.append( " ]}" ); - - return Encoder.toUnicode( builder.toString() ); - - } - - @Override - public void putInfo(String name, long val) { - this.intMap.put( name, val ); - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/State.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/State.java deleted file mode 100644 index 16a9dc1..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/define/State.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hig.ueditor.define; - -/** - * 处理状态接口 - * @author hancong03@baidu.com - * - */ -public interface State { - - public boolean isSuccess (); - - public void putInfo( String name, String val ); - - public void putInfo ( String name, long val ); - - public String toJSONString (); - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/hunter/FileManager.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/hunter/FileManager.java deleted file mode 100644 index c7ab833..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/hunter/FileManager.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.hig.ueditor.hunter; - -import java.io.File; -import java.util.Arrays; -import java.util.Collection; -import java.util.Map; - -import org.apache.commons.io.FileUtils; - -import com.hig.ueditor.PathFormat; -import com.hig.ueditor.define.AppInfo; -import com.hig.ueditor.define.BaseState; -import com.hig.ueditor.define.MultiState; -import com.hig.ueditor.define.State; - -public class FileManager { - - private String dir = null; - private String rootPath = null; - private String[] allowFiles = null; - private int count = 0; - - public FileManager ( Map conf ) { - - this.rootPath = (String)conf.get( "rootPath" ); - this.dir = this.rootPath + (String)conf.get( "dir" ); - this.allowFiles = this.getAllowFiles( conf.get("allowFiles") ); - this.count = (Integer)conf.get( "count" ); - - } - - public State listFile ( int index ) { - - File dir = new File( this.dir ); - State state = null; - - if ( !dir.exists() ) { - return new BaseState( false, AppInfo.NOT_EXIST ); - } - - if ( !dir.isDirectory() ) { - return new BaseState( false, AppInfo.NOT_DIRECTORY ); - } - - Collection list = FileUtils.listFiles( dir, this.allowFiles, true ); - - if ( index < 0 || index > list.size() ) { - state = new MultiState( true ); - } else { - Object[] fileList = Arrays.copyOfRange( list.toArray(), index, index + this.count ); - state = this.getState( fileList ); - } - - state.putInfo( "start", index ); - state.putInfo( "total", list.size() ); - - return state; - - } - - private State getState ( Object[] files ) { - - MultiState state = new MultiState( true ); - BaseState fileState = null; - - File file = null; - - for ( Object obj : files ) { - if ( obj == null ) { - break; - } - file = (File)obj; - fileState = new BaseState( true ); - fileState.putInfo( "url", PathFormat.format( this.getPath( file ) ) ); - state.addState( fileState ); - } - - return state; - - } - - private String getPath ( File file ) { - - String path = file.getAbsolutePath(); - - return path.replace( this.rootPath, "/" ); - - } - - private String[] getAllowFiles ( Object fileExt ) { - - String[] exts = null; - String ext = null; - - if ( fileExt == null ) { - return new String[ 0 ]; - } - - exts = (String[])fileExt; - - for ( int i = 0, len = exts.length; i < len; i++ ) { - - ext = exts[ i ]; - exts[ i ] = ext.replace( ".", "" ); - - } - - return exts; - - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/hunter/ImageHunter.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/hunter/ImageHunter.java deleted file mode 100644 index e81f0b2..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/hunter/ImageHunter.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.hig.ueditor.hunter; - -import java.net.HttpURLConnection; -import java.net.InetAddress; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import com.hig.ueditor.PathFormat; -import com.hig.ueditor.define.AppInfo; -import com.hig.ueditor.define.BaseState; -import com.hig.ueditor.define.MIMEType; -import com.hig.ueditor.define.MultiState; -import com.hig.ueditor.define.State; -import com.hig.ueditor.upload.StorageManager; - -/** - * 图片抓取器 - * @author hancong03@baidu.com - * - */ -public class ImageHunter { - - private String filename = null; - private String savePath = null; - private String rootPath = null; - private List allowTypes = null; - private long maxSize = -1; - - private List filters = null; - - public ImageHunter ( Map conf ) { - - this.filename = (String)conf.get( "filename" ); - this.savePath = (String)conf.get( "savePath" ); - this.rootPath = (String)conf.get( "rootPath" ); - this.maxSize = (Long)conf.get( "maxSize" ); - this.allowTypes = Arrays.asList( (String[])conf.get( "allowFiles" ) ); - this.filters = Arrays.asList( (String[])conf.get( "filter" ) ); - - } - - public State capture ( String[] list ) { - - MultiState state = new MultiState( true ); - - for ( String source : list ) { - state.addState( captureRemoteData( source ) ); - } - - return state; - - } - - public State captureRemoteData ( String urlStr ) { - - HttpURLConnection connection = null; - URL url = null; - String suffix = null; - - try { - url = new URL( urlStr ); - - if ( !validHost( url.getHost() ) ) { - return new BaseState( false, AppInfo.PREVENT_HOST ); - } - - connection = (HttpURLConnection) url.openConnection(); - - connection.setInstanceFollowRedirects( true ); - connection.setUseCaches( true ); - - if ( !validContentState( connection.getResponseCode() ) ) { - return new BaseState( false, AppInfo.CONNECTION_ERROR ); - } - - suffix = MIMEType.getSuffix( connection.getContentType() ); - - if ( !validFileType( suffix ) ) { - return new BaseState( false, AppInfo.NOT_ALLOW_FILE_TYPE ); - } - - if ( !validFileSize( connection.getContentLength() ) ) { - return new BaseState( false, AppInfo.MAX_SIZE ); - } - - String savePath = this.getPath( this.savePath, this.filename, suffix ); - String physicalPath = this.rootPath + savePath; - - State state = StorageManager.saveFileByInputStream( connection.getInputStream(), physicalPath ); - - if ( state.isSuccess() ) { - state.putInfo( "url", PathFormat.format( savePath ) ); - state.putInfo( "source", urlStr ); - } - - return state; - - } catch ( Exception e ) { - return new BaseState( false, AppInfo.REMOTE_FAIL ); - } - - } - - private String getPath ( String savePath, String filename, String suffix ) { - - return PathFormat.parse( savePath + suffix, filename ); - - } - - private boolean validHost ( String hostname ) { - try { - InetAddress ip = InetAddress.getByName(hostname); - - if (ip.isSiteLocalAddress()) { - return false; - } - } catch (UnknownHostException e) { - return false; - } - - return !filters.contains( hostname ); - - } - - private boolean validContentState ( int code ) { - - return HttpURLConnection.HTTP_OK == code; - - } - - private boolean validFileType ( String type ) { - - return this.allowTypes.contains( type ); - - } - - private boolean validFileSize ( int size ) { - return size < this.maxSize; - } - -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/Base64Uploader.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/Base64Uploader.java deleted file mode 100644 index 44cfb74..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/Base64Uploader.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hig.ueditor.upload; - -import com.hig.ueditor.PathFormat; -import com.hig.ueditor.define.AppInfo; -import com.hig.ueditor.define.BaseState; -import com.hig.ueditor.define.FileType; -import com.hig.ueditor.define.State; - -import java.util.Map; - -import org.apache.commons.codec.binary.Base64; - -public final class Base64Uploader { - - public static State save(String content, Map conf) { - - byte[] data = decode(content); - - long maxSize = ((Long) conf.get("maxSize")).longValue(); - - if (!validSize(data, maxSize)) { - return new BaseState(false, AppInfo.MAX_SIZE); - } - - String suffix = FileType.getSuffix("JPG"); - - String savePath = PathFormat.parse((String) conf.get("savePath"), - (String) conf.get("filename")); - - savePath = savePath + suffix; - String physicalPath = (String) conf.get("rootPath") + savePath; - - State storageState = StorageManager.saveBinaryFile(data, physicalPath); - - if (storageState.isSuccess()) { - storageState.putInfo("url", PathFormat.format(savePath)); - storageState.putInfo("type", suffix); - storageState.putInfo("original", ""); - } - - return storageState; - } - - private static byte[] decode(String content) { - return Base64.decodeBase64(content); - } - - private static boolean validSize(byte[] data, long length) { - return data.length <= length; - } - -} \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/BinaryUploader.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/BinaryUploader.java deleted file mode 100644 index d3be62a..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/BinaryUploader.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.hig.ueditor.upload; - -import com.hig.ueditor.PathFormat; -import com.hig.ueditor.define.AppInfo; -import com.hig.ueditor.define.BaseState; -import com.hig.ueditor.define.FileType; -import com.hig.ueditor.define.State; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.fileupload.FileItemIterator; -import org.apache.commons.fileupload.FileItemStream; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; - -public class BinaryUploader { - - public static final State save(HttpServletRequest request, - Map conf) { - FileItemStream fileStream = null; - boolean isAjaxUpload = request.getHeader( "X_Requested_With" ) != null; - - if (!ServletFileUpload.isMultipartContent(request)) { - return new BaseState(false, AppInfo.NOT_MULTIPART_CONTENT); - } - - ServletFileUpload upload = new ServletFileUpload( - new DiskFileItemFactory()); - - if ( isAjaxUpload ) { - upload.setHeaderEncoding( "UTF-8" ); - } - - try { - FileItemIterator iterator = upload.getItemIterator(request); - - while (iterator.hasNext()) { - fileStream = iterator.next(); - - if (!fileStream.isFormField()) - break; - fileStream = null; - } - - if (fileStream == null) { - return new BaseState(false, AppInfo.NOTFOUND_UPLOAD_DATA); - } - - String savePath = (String) conf.get("savePath"); - String originFileName = fileStream.getName(); - String suffix = FileType.getSuffixByFilename(originFileName); - - originFileName = originFileName.substring(0, - originFileName.length() - suffix.length()); - savePath = savePath + suffix; - - long maxSize = ((Long) conf.get("maxSize")).longValue(); - - if (!validType(suffix, (String[]) conf.get("allowFiles"))) { - return new BaseState(false, AppInfo.NOT_ALLOW_FILE_TYPE); - } - - savePath = PathFormat.parse(savePath, originFileName); - - String physicalPath = (String) conf.get("rootPath") + savePath; - - InputStream is = fileStream.openStream(); - State storageState = StorageManager.saveFileByInputStream(is, - physicalPath, maxSize); - is.close(); - - if (storageState.isSuccess()) { - storageState.putInfo("url", PathFormat.format(savePath)); - storageState.putInfo("type", suffix); - storageState.putInfo("original", originFileName + suffix); - } - - return storageState; - } catch (FileUploadException e) { - return new BaseState(false, AppInfo.PARSE_REQUEST_ERROR); - } catch (IOException e) { - } - return new BaseState(false, AppInfo.IO_ERROR); - } - - private static boolean validType(String type, String[] allowTypes) { - List list = Arrays.asList(allowTypes); - - return list.contains(type); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/StorageManager.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/StorageManager.java deleted file mode 100644 index 4365813..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/StorageManager.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.hig.ueditor.upload; - -import com.hig.ueditor.define.AppInfo; -import com.hig.ueditor.define.BaseState; -import com.hig.ueditor.define.State; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.commons.io.FileUtils; - -public class StorageManager { - public static final int BUFFER_SIZE = 8192; - - public StorageManager() { - } - - public static State saveBinaryFile(byte[] data, String path) { - File file = new File(path); - - State state = valid(file); - - if (!state.isSuccess()) { - return state; - } - - try { - BufferedOutputStream bos = new BufferedOutputStream( - new FileOutputStream(file)); - bos.write(data); - bos.flush(); - bos.close(); - } catch (IOException ioe) { - return new BaseState(false, AppInfo.IO_ERROR); - } - - state = new BaseState(true, file.getAbsolutePath()); - state.putInfo( "size", data.length ); - state.putInfo( "title", file.getName() ); - return state; - } - - public static State saveFileByInputStream(InputStream is, String path, - long maxSize) { - State state = null; - - File tmpFile = getTmpFile(); - - byte[] dataBuf = new byte[ 2048 ]; - BufferedInputStream bis = new BufferedInputStream(is, StorageManager.BUFFER_SIZE); - - try { - BufferedOutputStream bos = new BufferedOutputStream( - new FileOutputStream(tmpFile), StorageManager.BUFFER_SIZE); - - int count = 0; - while ((count = bis.read(dataBuf)) != -1) { - bos.write(dataBuf, 0, count); - } - bos.flush(); - bos.close(); - - if (tmpFile.length() > maxSize) { - tmpFile.delete(); - return new BaseState(false, AppInfo.MAX_SIZE); - } - - state = saveTmpFile(tmpFile, path); - - if (!state.isSuccess()) { - tmpFile.delete(); - } - - return state; - - } catch (IOException e) { - } - return new BaseState(false, AppInfo.IO_ERROR); - } - - public static State saveFileByInputStream(InputStream is, String path) { - State state = null; - - File tmpFile = getTmpFile(); - - byte[] dataBuf = new byte[ 2048 ]; - BufferedInputStream bis = new BufferedInputStream(is, StorageManager.BUFFER_SIZE); - - try { - BufferedOutputStream bos = new BufferedOutputStream( - new FileOutputStream(tmpFile), StorageManager.BUFFER_SIZE); - - int count = 0; - while ((count = bis.read(dataBuf)) != -1) { - bos.write(dataBuf, 0, count); - } - bos.flush(); - bos.close(); - - state = saveTmpFile(tmpFile, path); - - if (!state.isSuccess()) { - tmpFile.delete(); - } - - return state; - } catch (IOException e) { - } - return new BaseState(false, AppInfo.IO_ERROR); - } - - private static File getTmpFile() { - File tmpDir = FileUtils.getTempDirectory(); - String tmpFileName = (Math.random() * 10000 + "").replace(".", ""); - return new File(tmpDir, tmpFileName); - } - - private static State saveTmpFile(File tmpFile, String path) { - State state = null; - File targetFile = new File(path); - - if (targetFile.canWrite()) { - return new BaseState(false, AppInfo.PERMISSION_DENIED); - } - try { - FileUtils.moveFile(tmpFile, targetFile); - } catch (IOException e) { - return new BaseState(false, AppInfo.IO_ERROR); - } - - state = new BaseState(true); - state.putInfo( "size", targetFile.length() ); - /*System.out.println(targetFile.getName()); - String filename = targetFile.getName().toString(); - System.out.println(filename);*/ - state.putInfo( "title", targetFile.getName()); - - return state; - } - - private static State valid(File file) { - File parentPath = file.getParentFile(); - - if ((!parentPath.exists()) && (!parentPath.mkdirs())) { - return new BaseState(false, AppInfo.FAILED_CREATE_FILE); - } - - if (!parentPath.canWrite()) { - return new BaseState(false, AppInfo.PERMISSION_DENIED); - } - - return new BaseState(true); - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/Uploader.java b/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/Uploader.java deleted file mode 100644 index 42dc330..0000000 --- a/exam-online-api-DEL/hig-application/src/main/java/com/hig/ueditor/upload/Uploader.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hig.ueditor.upload; - -import com.hig.ueditor.define.State; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -public class Uploader { - private HttpServletRequest request = null; - private Map conf = null; - - public Uploader(HttpServletRequest request, Map conf) { - this.request = request; - this.conf = conf; - } - - public final State doExec() { - String filedName = (String) this.conf.get("fieldName"); - State state = null; - - if ("true".equals(this.conf.get("isBase64"))) { - state = Base64Uploader.save(this.request.getParameter(filedName), - this.conf); - } else { - state = BinaryUploader.save(this.request, this.conf); - } - - return state; - } -} diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskGroupMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskGroupMapper.xml deleted file mode 100644 index 1e1ba94..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskGroupMapper.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - select exam_code, group_code, order_id from exam_task_group - - - - - - - - insert into exam_task_group - - exam_code, - group_code, - - - - #{examCode}, - #{groupCode}, - - - - - update exam_task_group - - group_code = #{groupCode}, - order_id = #{orderId}, - - where exam_code = #{examCode} - - - - delete from exam_task_group where exam_code = #{examCode} - - - - delete from exam_task_group where exam_code in - - #{examCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskManagerMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskManagerMapper.xml deleted file mode 100644 index b99dcf7..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskManagerMapper.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select exam_id, exam_code, exam_name,exam_type,exam_times, exam_describe, build_type, force_done, exam_bank, exam_bank_text, picture_url, start_time, end_time, exam_duration, status, create_by, create_dept, create_time from exam_task_manager - - - - - - - - insert into exam_task_manager - - exam_code, - exam_name, - exam_describe, - build_type, - exam_type, - exam_times, - force_done, - exam_bank, - exam_bank_text, - picture_url, - start_time, - end_time, - exam_duration, - status, - create_by, - create_dept, - create_time, - - - #{examCode}, - #{examName}, - #{examDescribe}, - #{buildType}, - #{examType}, - #{examTimes}, - #{forceDone}, - #{examBank}, - #{examBankText}, - #{pictureUrl}, - #{startTime}, - #{endTime}, - #{examDuration}, - 0, - #{createBy}, - #{createDept}, - now(), - - - - - update exam_task_manager - - exam_name = #{examName}, - exam_describe = #{examDescribe}, - build_type = #{buildType}, - exam_type = #{examType}, - exam_times = #{examTimes}, - force_done = #{forceDone}, - exam_bank = #{examBank}, - exam_bank_text = #{examBankText}, - picture_url = #{pictureUrl}, - start_time = #{startTime}, - end_time = #{endTime}, - exam_duration = #{examDuration}, - status = #{status}, - create_by = #{createBy}, - create_dept = #{createDept}, - create_time = #{createTime}, - - where exam_code = #{examCode} - - - - delete from exam_task_manager where exam_code = #{examCode} - - - - delete from exam_task_manager where exam_code in - - #{examCode} - - - - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskPersonMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskPersonMapper.xml deleted file mode 100644 index b566ae2..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskPersonMapper.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - select exam_code, user_code, task_code, start_time, end_time, status from exam_task_person - - - - - - - - - insert into exam_task_person - - exam_code, - user_code, - task_code, - start_time, - end_time, - status, - - - #{examCode}, - #{userCode}, - #{taskCode}, - #{startTime}, - #{endTime}, - #{status}, - - - - - INSERT INTO exam_task_person (exam_code, task_code, user_code, STATUS) - SELECT - #{examCode} AS exam_code, - UUID() AS task_code, - user_code, - 1 AS STATUS - FROM ( - SELECT DISTINCT person_code AS user_code - FROM sys_group_person - WHERE group_code IN ( - SELECT group_code - FROM exam_task_group - WHERE exam_code = #{examCode} - ) - ) AS subquery - - - - - - - update exam_task_person - - user_code = #{userCode}, - task_code = #{taskCode}, - start_time = #{startTime}, - end_time = #{endTime}, - status = #{status}, - - where exam_code = #{examCode} - - - - update exam_task_person set start_time = now() - where exam_code = #{examCode} and user_code = #{userCode} - - - - update exam_task_person set end_time = now(), status = 0 - where exam_code = #{examCode} and user_code = #{userCode} - - - - delete from exam_task_person where exam_code = #{examCode} - - - - delete from exam_task_person where exam_code in - - #{examCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskPictureMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskPictureMapper.xml deleted file mode 100644 index 67b614e..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskPictureMapper.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - select photo_id, photo_code, photo_path, photo_url, file_name, original_name, create_by, create_time, status from exam_task_picture - - - - - - - - insert into exam_task_picture - - - photo_path, - photo_code, - photo_url, - file_name, - original_name, - create_by, - create_time, - status, - - - #{photoPath}, - #{photoCode}, - #{photoUrl}, - #{fileName}, - #{originalName}, - #{createBy}, - now(), - 0, - - - - - update exam_task_picture - - photo_id = #{photoId}, - photo_path = #{photoPath}, - photo_url = #{photoUrl}, - file_name = #{fileName}, - original_name = #{originalName}, - create_by = #{createBy}, - create_time = #{createTime}, - status = #{status}, - - where photo_code = #{photoCode} - - - - delete from exam_task_picture where photo_code = #{photoCode} - - - - delete from exam_task_picture where photo_code in - - #{photoCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskQuestionsMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskQuestionsMapper.xml deleted file mode 100644 index 1ada1a1..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/exam/ExamTaskQuestionsMapper.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - select exam_code, questions_code, questions_number from exam_task_questions - - - - - - - - insert into exam_task_questions - - exam_code, - questions_code, - questions_number, - - - #{examCode}, - #{questionsCode}, - #{questionsNumber}, - - - - - update exam_task_questions - - questions_code = #{questionsCode}, - questions_number = #{questionsNumber}, - - where exam_code = #{examCode} - - - - delete from exam_task_questions where exam_code = #{examCode} - - - - delete from exam_task_questions where exam_code in - - #{examCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/fms/FmsFilesMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/fms/FmsFilesMapper.xml deleted file mode 100644 index 0842059..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/fms/FmsFilesMapper.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select file_id, file_title, file_describe, file_name, file_path, file_url, file_suffix, original_name, upload_name, upload_dept, upload_time, status from fms_files - - - - - - - - insert into fms_files - - file_title, - file_describe, - file_name, - file_path, - file_url, - file_suffix, - original_name, - upload_name, - upload_dept, - upload_time, - status, - - - #{fileTitle}, - #{fileDescribe}, - #{fileName}, - #{filePath}, - #{fileUrl}, - #{fileSuffix}, - #{originalName}, - #{uploadName}, - #{uploadDept}, - now(), - 0, - - - - - update fms_files - - file_title = #{fileTitle}, - file_describe = #{fileDescribe}, - upload_time = now(), - - where file_id = #{fileId} - - - - delete from fms_files where file_id = #{fileId} - - - - delete from fms_files where file_id in - - #{fileId} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/fms/FmsPhotoMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/fms/FmsPhotoMapper.xml deleted file mode 100644 index b4c61d1..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/fms/FmsPhotoMapper.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - select photo_id, file_name, photo_path, photo_url, original_name, upload_name, upload_dept, upload_time, status from fms_photo - - - - - - - - insert into fms_photo - - file_name, - photo_path, - photo_url, - original_name, - upload_name, - upload_dept, - upload_time, - status, - - - #{fileName}, - #{photoPath}, - #{photoUrl}, - #{originalName}, - #{uploadName}, - #{uploadDept}, - now(), - 0, - - - - - update fms_photo - - file_name = #{fileName}, - photo_path = #{photoPath}, - photo_url = #{photoUrl}, - original_name = #{originalName}, - upload_name = #{uploadName}, - upload_dept = #{uploadDept}, - upload_time = #{uploadTime}, - status = #{status}, - - where photo_id = #{photoId} - - - - delete from fms_photo where photo_id = #{photoId} - - - - delete from fms_photo where photo_id in - - #{photoId} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamFinishAnswerMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamFinishAnswerMapper.xml deleted file mode 100644 index 55b4a22..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamFinishAnswerMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - select exam_code, user_code, questions_code, right_answer, exam_score, questions_answer, questions_score from exam_finish_answer - - - - - - - - insert into exam_finish_answer - - exam_code, - user_code, - questions_code, - right_answer, - exam_score, - questions_answer, - questions_score, - - - #{examCode}, - #{userCode}, - #{questionsCode}, - #{rightAnswer}, - #{examScore}, - #{questionsAnswer}, - #{questionsScore}, - - - - - insert into exam_finish_answer - select exam_code,user_code,questions_code,case when right_answer = questions_answer then questions_score else 0 end exam_score,right_answer,questions_answer,questions_score from - ( - select a.exam_code, a.user_code, a.questions_code, REPLACE(b.right_answer, ',', '') as right_answer,a.questions_answer,b.questions_score from exam_task_answer a - left join exam_questions_property b on b.questions_code = a.questions_code - where a.exam_code = #{examCode} and a.user_code = #{userCode} and a.questions_answer is not null - order by a.questions_number - ) - - - - update exam_finish_answer - - #{examCode}, - user_code = #{userCode}, - questions_code = #{questionsCode}, - right_answer = #{rightAnswer}, - exam_score = #{examScore}, - questions_answer = #{questionsAnswer}, - questions_score = #{questionsScore}, - - where exam_code = #{examCode} - - - - delete from exam_finish_answer where exam_code = #{examCode} - - - - delete from exam_finish_answer where exam_code = #{examCode} and user_code = #{userCode} - - - - delete from exam_finish_answer where exam_code in - - #{examCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamQuestionsContentDataMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamQuestionsContentDataMapper.xml deleted file mode 100644 index eb0ab79..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamQuestionsContentDataMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamQuestionsListDataMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamQuestionsListDataMapper.xml deleted file mode 100644 index 7e51e22..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamQuestionsListDataMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamTaskAnswerMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamTaskAnswerMapper.xml deleted file mode 100644 index 620c548..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamTaskAnswerMapper.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - select exam_code, user_code,exam_times, questions_code, questions_number, questions_type, questions_answer, is_mark, is_current from exam_task_answer - - - - - - - - insert into exam_task_answer - - exam_code, - user_code, - exam_times, - questions_code, - questions_number, - questions_type, - questions_answer, - is_mark, - is_current, - - - #{examCode}, - #{userCode}, - #{examTimes}, - #{questionsCode}, - #{questionsNumber}, - #{questionsType}, - #{questionsAnswer}, - #{isMark}, - #{isCurrent}, - - - - - update exam_task_answer - - user_code = #{userCode}, - questions_code = #{questionsCode}, - questions_number = #{questionsNumber}, - questions_type = #{questionsType}, - questions_answer = #{questionsAnswer}, - is_mark = #{isMark}, - is_current = #{isCurrent}, - - where exam_code = #{examCode} - - - - delete from exam_task_answer where exam_code = #{examCode} and user_code = #{userCode} and questions_code = #{questionsCode} - - - - delete from exam_task_answer where exam_code = #{examCode} - - - - delete from exam_task_answer where exam_code in - - #{examCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamTitleDataMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamTitleDataMapper.xml deleted file mode 100644 index 89245de..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamTitleDataMapper.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamUserScoreMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamUserScoreMapper.xml deleted file mode 100644 index 9598f2a..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/onlineexam/ExamUserScoreMapper.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - select exam_code, user_code, start_time, end_time, exam_score, questions_score, exam_number, answered_number, not_answered, status from exam_user_score - - - - - - - - insert into exam_user_score - - exam_code, - user_code, - start_time, - end_time, - exam_score, - questions_score, - exam_number, - answered_number, - not_answered, - status, - - - #{examCode}, - #{userCode}, - #{startTime}, - #{endTime}, - #{examScore}, - #{questionsScore}, - #{examNumber}, - #{answeredNumber}, - #{notAnswered}, - #{status}, - - - - - insert into exam_user_score - select a.exam_code, a.user_code, b.start_time, now() as end_time, d.questions_score, a.exam_score,c.exam_number,a.answered_number,c.exam_number - a.answered_number as not_answered, 0 as status from - ( - select exam_code, user_code, sum(exam_score) as exam_score,count(questions_code) as answered_number from exam_finish_answer - where exam_code = #{examCode} and user_code = #{userCode} group by exam_code,user_code - ) a - left join exam_task_person b on b.exam_code = #{examCode} and b.user_code = #{userCode} - left join - ( - select count(questions_code) as exam_number from exam_task_questions where exam_code = #{examCode} - ) c on 1= 1 - left join - ( - select sum(questions_score) as questions_score from exam_questions_property where questions_code in - ( - select questions_code from exam_task_questions where exam_code = #{examCode} - ) - ) d on 1=1 - - - - update exam_user_score - - user_code = #{userCode}, - start_time = #{startTime}, - end_time = #{endTime}, - exam_score = #{examScore}, - questions_score = #{questionsScore}, - exam_number = #{examNumber}, - answered_number = #{answeredNumber}, - not_answered = #{notAnswered}, - status = #{status}, - - where exam_code = #{examCode} - - - - delete from exam_user_score where exam_code = #{examCode} and user_code = #{userCode} - - - - delete from exam_user_score where exam_code = #{examCode} - - - - delete from exam_user_score where exam_code in - - #{examCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamBankPictureMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamBankPictureMapper.xml deleted file mode 100644 index 17d84a8..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamBankPictureMapper.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - select photo_id, photo_code, photo_path, photo_url, file_name, original_name, create_by, create_time, status from exam_bank_picture - - - - - - - - insert into exam_bank_picture - - photo_code, - photo_path, - photo_url, - file_name, - original_name, - create_by, - create_time, - status, - - - #{photoCode}, - #{photoPath}, - #{photoUrl}, - #{fileName}, - #{originalName}, - #{createBy}, - now(), - 0, - - - - - update exam_bank_picture - - photo_id = #{photoId}, - photo_path = #{photoPath}, - photo_url = #{photoUrl}, - file_name = #{fileName}, - original_name = #{originalName}, - create_by = #{createBy}, - create_time = #{createTime}, - status = #{status}, - - where photo_code = #{photoCode} - - - - delete from exam_bank_picture where photo_code = #{photoCode} - - - - delete from exam_bank_picture where photo_code in - - #{photoCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsAnswerMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsAnswerMapper.xml deleted file mode 100644 index 6653cc7..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsAnswerMapper.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - select questions_code, option_code, option_describe, is_right, order_id from exam_questions_answer - - - - - - - - - - insert into exam_questions_answer - - questions_code, - option_code, - option_describe, - is_right, - order_id, - - - #{questionsCode}, - #{optionCode}, - #{optionDescribe}, - #{isRight}, - #{orderId}, - - - - - - - update exam_questions_answer - - option_code = #{optionCode}, - option_describe = #{optionDescribe}, - is_right = #{isRight}, - order_id = #{orderId}, - - where questions_code = #{questionsCode} - - - - delete from exam_questions_answer where questions_code = #{questionsCode} - - - - delete from exam_questions_answer where questions_code in - - #{questionsCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsBankMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsBankMapper.xml deleted file mode 100644 index 663b24b..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsBankMapper.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select a.bank_id, a.bank_code, a.bank_name, a.bank_describe, a.bank_version, a.exam_type, b.type_name,a.online_date, a.picture_url, - ifnull(c.judge_number,0) as judge_number,ifnull(d.radio_number,0) as radio_number,ifnull(e.choice_number,0) as choice_number,a.radio_score, - a.choice_score, a.judge_score, a.status, a.create_by, a.create_dept, a.create_time - from exam_questions_bank a - left join exam_type b on b.type_id = a.exam_type - left join - ( - select bank_code,count(questions_type) as judge_number from exam_questions_property where questions_type = 1 group by bank_code - ) c on c.bank_code = a.bank_code - left join - ( - select bank_code,count(questions_type) as radio_number from exam_questions_property where questions_type = 2 group by bank_code - ) d on d.bank_code = a.bank_code - left join - ( - select bank_code,count(questions_type) as choice_number from exam_questions_property where questions_type = 3 group by bank_code - ) e on e.bank_code = a.bank_code - - - - - - - - - - - - insert into exam_questions_bank - - bank_code, - bank_name, - bank_describe, - bank_version, - exam_type, - online_date, - picture_url, - radio_score, - choice_score, - judge_score, - status, - create_by, - create_dept, - create_time, - - - #{bankCode}, - #{bankName}, - #{bankDescribe}, - #{bankVersion}, - #{examType}, - #{onlineDate}, - #{pictureUrl}, - #{radioScore}, - #{choiceScore}, - #{judgeScore}, - 0, - #{createBy}, - #{createDept}, - now(), - - - - - update exam_questions_bank - - bank_id = #{bankId}, - bank_name = #{bankName}, - bank_describe = #{bankDescribe}, - bank_version = #{bankVersion}, - exam_type = #{examType}, - online_date = #{onlineDate}, - picture_url = #{pictureUrl}, - radio_score = #{radioScore}, - choice_score = #{choiceScore}, - judge_score = #{judgeScore}, - status = #{status}, - create_by = #{createBy}, - create_dept = #{createDept}, - create_time = #{createTime}, - - where bank_code = #{bankCode} - - - - delete from exam_questions_bank where bank_code = #{bankCode} - - - - delete from exam_questions_bank where bank_code in - - #{bankCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsContentMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsContentMapper.xml deleted file mode 100644 index 0e50007..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsContentMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - select questions_code, questions_content from exam_questions_content - - - - - - - - insert into exam_questions_content - - questions_code, - questions_content, - - - #{questionsCode}, - #{questionsContent}, - - - - - update exam_questions_content - - questions_content = #{questionsContent}, - - where questions_code = #{questionsCode} - - - - delete from exam_questions_content where questions_code = #{questionsCode} - - - - delete from exam_questions_content where questions_code in - - #{questionsCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsListMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsListMapper.xml deleted file mode 100644 index 97894c1..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsListMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select @rownum := @rownum + 1 as rownum, bank_code, bank_name, questions_id, questions_code, questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from - ( - select a.bank_code, b.bank_name, a.questions_id, a.questions_code, substring(a.questions_title,1,50) as questions_title, a.questions_type, a.questions_score, a.rate_number, a.right_answer, a.answer_analyse, a.status, a.create_by, a.create_dept, a.create_time from exam_questions_property a - left join exam_questions_bank b on b.bank_code = a.bank_code - order by a.questions_type, a.bank_code, a.questions_id - ) t, (select @rownum := 0) r - - - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsMapper.xml deleted file mode 100644 index 28e6e45..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsMapper.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select bank_code, questions_id, questions_code, questions_title, questions_content, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from exam_questions - - - - - - - - - - insert into exam_questions - - bank_code, - questions_code, - questions_title, - questions_content, - questions_type, - questions_score, - rate_number, - right_answer, - answer_analyse, - status, - create_by, - create_dept, - create_time, - - - #{bankCode}, - #{questionsCode}, - #{questionsTitle}, - #{questionsContent}, - #{questionsType}, - #{questionsScore}, - #{rateNumber}, - #{rightAnswer}, - #{answerAnalyse}, - 0, - #{createBy}, - #{createDept}, - now(), - - - - - update exam_questions - - bank_code = #{bankCode}, - questions_id = #{questionsId}, - questions_title = #{questionsTitle}, - questions_content = #{questionsContent}, - questions_type = #{questionsType}, - questions_score = #{questionsScore}, - rate_number = #{rateNumber}, - right_answer = #{rightAnswer}, - answer_analyse = #{answerAnalyse}, - status = #{status}, - create_by = #{createBy}, - create_dept = #{createDept}, - create_time = #{createTime}, - - where questions_code = #{questionsCode} - - - - delete from exam_questions where questions_code = #{questionsCode} - - - - delete from exam_questions where questions_code in - - #{questionsCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsPropertyMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsPropertyMapper.xml deleted file mode 100644 index 31ce7e4..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamQuestionsPropertyMapper.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select @rownum := @rownum + 1 as rownum, bank_code, questions_id, questions_code, questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from - ( - select bank_code, questions_id, questions_code, substring(questions_title,1,50) as questions_title, questions_type, questions_score, rate_number, right_answer, answer_analyse, status, create_by, create_dept, create_time from exam_questions_property - ) t, (select @rownum := 0) r - - - - - - - - insert into exam_questions_property - - bank_code, - questions_code, - questions_title, - questions_type, - questions_score, - rate_number, - right_answer, - answer_analyse, - status, - create_by, - create_dept, - create_time, - - - #{bankCode}, - #{questionsCode}, - #{questionsTitle}, - #{questionsType}, - #{questionsScore}, - #{rateNumber}, - #{rightAnswer}, - #{answerAnalyse}, - 0, - #{createBy}, - #{createDept}, - now(), - - - - - update exam_questions_property - - bank_code = #{bankCode}, - questions_id = #{questionsId}, - questions_title = #{questionsTitle}, - questions_type = #{questionsType}, - questions_score = #{questionsScore}, - rate_number = #{rateNumber}, - right_answer = #{rightAnswer}, - answer_analyse = #{answerAnalyse}, - status = #{status}, - create_by = #{createBy}, - create_dept = #{createDept}, - create_time = #{createTime}, - - where questions_code = #{questionsCode} - - - - delete from exam_questions_property where questions_code = #{questionsCode} - - - - delete from exam_questions_property where questions_code in - - #{questionsCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamTypeMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamTypeMapper.xml deleted file mode 100644 index e09d177..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/questions/ExamTypeMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - select type_id, parent_id, type_code, type_name, order_id, status, create_by, create_time from exam_type - - - - - - - - insert into exam_type - - parent_id, - type_code, - type_name, - order_id, - status, - create_by, - create_time, - - - #{parentId}, - #{typeCode}, - #{typeName}, - #{orderId}, - 0, - #{createBy}, - now(), - - - - - update exam_type - - parent_id = #{parentId}, - type_code = #{typeCode}, - type_name = #{typeName}, - order_id = #{orderId}, - status = #{status}, - create_by = #{createBy}, - create_time = #{createTime}, - - where type_id = #{typeId} - - - - delete from exam_type where type_id = #{typeId} - - - - delete from exam_type where type_id in - - #{typeId} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysGroupMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysGroupMapper.xml deleted file mode 100644 index 38b9b43..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysGroupMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - select a.group_id, a.group_code, a.group_name, b.person_number,a.group_describe, a.status, a.create_by, a.create_time from sys_group a - left join - inner join - ( - select group_code,count(group_code) as person_number from sys_group_person group by group_code - ) b on b.group_code = a.group_code - - - - - - - - - - insert into sys_group - - group_code, - group_name, - group_describe, - status, - create_by, - create_time, - - - #{groupCode}, - #{groupName}, - #{groupDescribe}, - 0, - #{createBy}, - now(), - - - - - update sys_group - - group_code = #{groupCode}, - group_name = #{groupName}, - group_describe = #{groupDescribe}, - status = #{status}, - create_by = #{createBy}, - create_time = #{createTime}, - - where group_id = #{groupId} - - - - delete from sys_group where group_id = #{groupId} - - - - delete from sys_group where group_id in - - #{groupId} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysGroupPersonMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysGroupPersonMapper.xml deleted file mode 100644 index 9fc9ab7..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysGroupPersonMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - select group_code, person_code, order_id from sys_group_person - - - - - - - - insert into sys_group_person - - group_code, - person_code, - - - #{groupCode}, - #{personCode}, - - - - - update sys_group_person - - person_code = #{personCode}, - order_id = #{orderId}, - - where group_code = #{groupCode} - - - - delete from sys_group_person where group_code = #{groupCode} - - - - delete from sys_group_person where group_code in - - #{groupCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysUserChoiceMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysUserChoiceMapper.xml deleted file mode 100644 index c1b632c..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysUserChoiceMapper.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select choice_code, user_code, order_id from sys_user_choice - - - - - - select a.user_id,a.user_code,a.user_name,a.nick_name,a.dept_id,dept_name,a.email,a.phonenumber,a.sex,a.avatar,a.status,a.remark from sys_user a - left join sys_dept b on b.dept_id = a.dept_id - where a.user_code in - ( - select person_code from sys_group_person where group_code = #{choiceCode} - ) - - - - - - - - - - insert into sys_user_choice - - choice_code, - user_code, - order_id, - - - #{choiceCode}, - #{userCode}, - #{orderId}, - - - - - insert into sys_user_choice select #{choiceCode},user_code,order_id from temp_user_choice where choice_code = #{conditionCode} - - - - insert into temp_user_choice select #{choiceCode},user_code,order_id from sys_user_choice where choice_code = #{conditionCode} - - - - update sys_user_choice - - user_code = #{userCode}, - order_id = #{orderId}, - - where choice_code = #{choiceCode} - - - - delete from sys_user_choice where choice_code = #{choiceCode} - - - - delete from sys_user_choice where choice_code in - - #{choiceCode} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysUserDataMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysUserDataMapper.xml deleted file mode 100644 index 7587f58..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/SysUserDataMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - select a.user_id,a.user_code,a.user_name,a.nick_name,a.dept_id,dept_name,a.email,a.phonenumber,a.sex,a.avatar,a.status,a.remark from sys_user a - left join sys_dept b on b.dept_id = a.dept_id - - - - - - select b.user_id,a.user_code,b.user_name,b.nick_name,b.dept_id,c.dept_name,b.email,b.phonenumber,b.sex,b.avatar,b.status,b.remark,a.order_id from temp_user_choice a - left join sys_user b on b.user_code = a.user_code - left join sys_dept c on c.dept_id = b.dept_id - where a.choice_code = #{choiceCode} - order by a.order_id desc - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/TempUserChoiceMapper.xml b/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/TempUserChoiceMapper.xml deleted file mode 100644 index 7cfa760..0000000 --- a/exam-online-api-DEL/hig-application/src/main/resources/mapper/system/TempUserChoiceMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - select choice_code, user_code, order_id from temp_user_choice - - - - - - - - insert into temp_user_choice - - choice_code, - user_code, - - - #{choiceCode}, - #{userCode}, - - - - - update temp_user_choice - - user_code = #{userCode}, - order_id = #{orderId}, - - where choice_code = #{choiceCode} - - - - - - delete from temp_user_choice where choice_code = #{choiceCode} and user_code = #{userCode} - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-common/pom.xml b/exam-online-api-DEL/hig-common/pom.xml deleted file mode 100644 index 8986a36..0000000 --- a/exam-online-api-DEL/hig-common/pom.xml +++ /dev/null @@ -1,125 +0,0 @@ - - 4.0.0 - - com.ruoyi - ruoyi - 3.8.6 - - hig-common - hig-common - 应用框架公用部分 - - 1.8 - 1.2.83 - 1.18.30 - 2.10.1 - 3.0.5 - 4.5.14 - 4.5.14 - 4.4.16 - 1.15 - 1.2 - 2.15.1 - 3.12.0 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - com.alibaba - fastjson - ${fastjson.version} - - - org.projectlombok - lombok - ${lombok.version} - - - com.google.code.gson - gson - ${gson.version} - - - com.github.ulisesbocchio - jasypt-spring-boot-starter - ${jasypt.version} - - - - org.springframework - spring-context-support - - - - org.springframework - spring-tx - - - org.springframework.boot - spring-boot-starter-data-redis - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - org.apache.httpcomponents - httpmime - ${httpmime.version} - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - - com.thoughtworks.xstream - xstream - 1.4.20 - - - - - commons-io - commons-io - ${commons-io.version} - - - - commons-codec - commons-codec - ${commons-codec.version} - - - - commons-logging - commons-logging - ${commons-logging.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/GsonUtil.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/GsonUtil.java deleted file mode 100644 index 65c9a32..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/GsonUtil.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.hig.component; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.TypeAdapter; -import com.google.gson.internal.LinkedTreeMap; -import com.google.gson.reflect.TypeToken; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; - -public class GsonUtil { - /** - * 实现格式化的时间字符串转时间对象 - */ - private static final String DATEFORMAT_default = "yyyy-MM-dd HH:mm:ss"; - - /** - * 使用默认的gson对象进行反序列化 - * - * @param json - * @param typeToken - * @return - */ - public static T fromJsonDefault(String json, TypeToken typeToken) { - Gson gson = new Gson(); - return gson.fromJson(json, typeToken.getType()); - } - - /** - * json字符串转list或者map - * - * @param json - * @param typeToken - * @return - */ - public static T fromJson(String json, TypeToken typeToken) { - - Gson gson = new GsonBuilder() - /** - * 重写map的反序列化 - */ - .registerTypeAdapter(new TypeToken>() { - }.getType(), new MapTypeAdapter()).create(); - - return gson.fromJson(json, typeToken.getType()); - - } - - /** - * json字符串转bean对象 - * - * @param json - * @param cls - * @return - */ - public static T fromJson(String json, Class cls) { - - Gson gson = new GsonBuilder().setDateFormat(DATEFORMAT_default) - .create(); - - return gson.fromJson(json, cls); - - } - - /** - * 对象转json - * - * @param obj - * @param format - * @return - */ - public static String toJson(Object obj, boolean format) { - - GsonBuilder gsonBuilder = new GsonBuilder(); - /** - * 设置默认时间格式 - */ - gsonBuilder.setDateFormat(DATEFORMAT_default); - - /** - * 添加格式化设置 - */ - if (format) { - gsonBuilder.setPrettyPrinting(); - } - - Gson gson = gsonBuilder.create(); - - return gson.toJson(obj); - } - - public static class MapTypeAdapter extends TypeAdapter { - - @Override - public Object read(JsonReader in) throws IOException { - JsonToken token = in.peek(); - switch (token) { - case BEGIN_ARRAY: - List list = new ArrayList(); - in.beginArray(); - while (in.hasNext()) { - list.add(read(in)); - } - in.endArray(); - return list; - - case BEGIN_OBJECT: - Map map = new LinkedTreeMap(); - in.beginObject(); - while (in.hasNext()) { - map.put(in.nextName(), read(in)); - } - in.endObject(); - return map; - - case STRING: - return in.nextString(); - - case NUMBER: - /** - * 改写数字的处理逻辑，将数字值分为整型与浮点型。 - */ - double dbNum = in.nextDouble(); - - // 数字超过long的最大值，返回浮点类型 - if (dbNum > Long.MAX_VALUE) { - return dbNum; - } - - // 判断数字是否为整数值 - long lngNum = (long) dbNum; - if (dbNum == lngNum) { - return lngNum; - } else { - return dbNum; - } - - case BOOLEAN: - return in.nextBoolean(); - - case NULL: - in.nextNull(); - return null; - - default: - throw new IllegalStateException(); - } - } - - @Override - public void write(JsonWriter out, Object value) throws IOException { - // 序列化无需实现 - } - - - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/HttpAPIService.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/HttpAPIService.java deleted file mode 100644 index 1051dcf..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/HttpAPIService.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.hig.component; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.http.Header; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import com.alibaba.fastjson.JSON; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.hig.dto.ResultPackage; - -@Component -public class HttpAPIService { - private static final Gson gson = new Gson(); - - @Autowired - private CloseableHttpClient httpClient; - - @Autowired - private RequestConfig config; - - /** - * 不带参数的get请求，如果状态码为200，则返回body，如果不为200，则返回null - * - * @param url - * @return - * @throws Exception - */ - // get方法 - public String doGet(String url) throws Exception { - Map map = new HashMap<>(); - - - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000) - .setConnectionRequestTimeout(30000) - .setSocketTimeout(30000) - .setRedirectsEnabled(true) - .build(); - - HttpGet httpGet = new HttpGet(url); - httpGet.setConfig(requestConfig); - - String result = null; - try { - HttpResponse httpResponse = httpClient.execute(httpGet); - if (httpResponse.getStatusLine().getStatusCode() == 200) { - result = EntityUtils.toString(httpResponse.getEntity()); - - } else if (httpResponse.getStatusLine().getStatusCode() == 404) { - throw new Exception("404错误，请求的资源不存在"); - } else if (httpResponse.getStatusLine().getStatusCode() == 500) { - throw new Exception("500错误,服务器内部错误"); - } else - throw new Exception("Http请求出错,返回Http状态码:" + httpResponse.getStatusLine().getStatusCode()); - } catch (Exception e) { - throw new Exception("处理httpGet操作出错,\r\n出错信息:" + e.getMessage()); - } - - return result; - } - - // get方法 - public Map doGetReturnMap(String url) throws Exception { - Map map = new HashMap<>(); - - - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000) - .setConnectionRequestTimeout(30000) - .setSocketTimeout(30000) - .setRedirectsEnabled(true) - .build(); - - HttpGet httpGet = new HttpGet(url); - httpGet.setConfig(requestConfig); - try { - HttpResponse httpResponse = httpClient.execute(httpGet); - // 这个地方调用的时侯有可能会出错，要做出错处理 - if (httpResponse.getStatusLine().getStatusCode() == 200) { - String jsonResult = EntityUtils.toString(httpResponse.getEntity()); - - map = GsonUtil.fromJson(jsonResult, - new TypeToken>() { - }); - } else if (httpResponse.getStatusLine().getStatusCode() == 404) { - throw new Exception("404错误，请求的资源不存在"); - } else if (httpResponse.getStatusLine().getStatusCode() == 500) { - throw new Exception("500错误,服务器内部错误"); - } else - throw new Exception("Http请求出错,返回Http状态码:" + httpResponse.getStatusLine().getStatusCode()); - - } catch (Exception e) { - throw new Exception("处理httpGet操作出错,\r\n出错信息:" + e.getMessage()); - } - return map; - } - - // post方式 - public Map doPost(String url, Map map) throws Exception { - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000) - .setConnectionRequestTimeout(30000) - .setSocketTimeout(30000) - .setRedirectsEnabled(true) - .build(); - HttpPost httpPost = new HttpPost(url); - httpPost.setConfig(requestConfig); - httpPost.addHeader("Content-Type", "application/json; chartset=UTF-8"); - if (map != null && map.size() > 0) { - StringEntity stringEntity; - try { - String data = new String(JSON.toJSONString(map).getBytes("utf-8"), "iso-8859-1"); - stringEntity = new StringEntity(data); - httpPost.setEntity(stringEntity); - - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - throw new Exception("转换字符集出错,\r\n出错信息:" + e.getMessage()); - } - - } - - Map resultmap = new HashMap<>(); - try { - HttpResponse httpResponse = httpClient.execute(httpPost); - HttpEntity httpEntity = httpResponse.getEntity(); - if (httpResponse.getStatusLine().getStatusCode() == 200) { - - String jsonResult = EntityUtils.toString(httpResponse.getEntity()); - resultmap = GsonUtil.fromJson(jsonResult, - new TypeToken>() { - }); - - } else if (httpResponse.getStatusLine().getStatusCode() == 404) { - throw new Exception("404错误，请求的资源不存在"); - } else if (httpResponse.getStatusLine().getStatusCode() == 500) { - throw new Exception("500错误,服务器内部错误"); - } else - throw new Exception("Http请求出错,返回Http状态码:" + httpResponse.getStatusLine().getStatusCode()); - } catch (Exception ex) { - throw new Exception("处理httpPost操作出错,\r\n出错信息:" + ex.getMessage()); - } - return resultmap; - } - - /** - * 不带参数post请求 - * - * @param url - * @return - * @throws Exception - */ - public Map doPost(String url) throws Exception { - return this.doPost(url, null); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/IdleConnectionEvictor.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/IdleConnectionEvictor.java deleted file mode 100644 index 4b897d8..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/IdleConnectionEvictor.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hig.component; - -import org.apache.http.conn.HttpClientConnectionManager; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class IdleConnectionEvictor extends Thread { - - @Autowired - private HttpClientConnectionManager connMgr; - - private volatile boolean shutdown; - - public IdleConnectionEvictor() { - super(); - super.start(); - } - - @Override - public void run() { - try { - while (!shutdown) { - synchronized (this) { - wait(30000); - // 关闭失效的连接 - connMgr.closeExpiredConnections(); - } - } - } catch (InterruptedException ex) { - // 结束 - } - } - - //关闭清理无效连接的线程 - public void shutdown() { - shutdown = true; - synchronized (this) { - notifyAll(); - } - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/StringUtil.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/StringUtil.java deleted file mode 100644 index bdf8ec3..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/component/StringUtil.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hig.component; - -public class StringUtil { - - public static String getFileName(String text) throws Exception { - int start = text.indexOf("\""); - - int end = text.lastIndexOf("\""); - - String result = null; - if (end > start) { - result = text.substring(start + 1,end); - } - else { - throw new Exception("不是有效的Http头"); - } - - return result; - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/config/HttpClient.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/config/HttpClient.java deleted file mode 100644 index 0cf9f03..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/config/HttpClient.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.hig.config; - -import org.apache.http.client.config.RequestConfig; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class HttpClient { - - @Value("${http.maxTotal}") - private Integer maxTotal; - - @Value("${http.defaultMaxPerRoute}") - private Integer defaultMaxPerRoute; - - @Value("${http.connectTimeout}") - private Integer connectTimeout; - - @Value("${http.connectionRequestTimeout}") - private Integer connectionRequestTimeout; - - @Value("${http.socketTimeout}") - private Integer socketTimeout; - - @Value("${http.staleConnectionCheckEnabled}") - private boolean staleConnectionCheckEnabled; - - /** - * 首先实例化一个连接池管理器，设置最大连接数、并发连接数 - * @return - */ - @Bean(name = "httpClientConnectionManager") - public PoolingHttpClientConnectionManager getHttpClientConnectionManager(){ - PoolingHttpClientConnectionManager httpClientConnectionManager = new PoolingHttpClientConnectionManager(); - //最大连接数 - httpClientConnectionManager.setMaxTotal(maxTotal); - //并发数 - httpClientConnectionManager.setDefaultMaxPerRoute(defaultMaxPerRoute); - return httpClientConnectionManager; - } - - /** - * 实例化连接池，设置连接池管理器。 - * 这里需要以参数形式注入上面实例化的连接池管理器 - * @param httpClientConnectionManager - * @return - */ - @Bean(name = "httpClientBuilder") - public HttpClientBuilder getHttpClientBuilder(@Qualifier("httpClientConnectionManager")PoolingHttpClientConnectionManager httpClientConnectionManager){ - - //HttpClientBuilder中的构造方法被protected修饰，所以这里不能直接使用new来实例化一个HttpClientBuilder，可以使用HttpClientBuilder提供的静态方法create()来获取HttpClientBuilder对象 - HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); - - httpClientBuilder.setConnectionManager(httpClientConnectionManager); - - return httpClientBuilder; - } - - /** - * 注入连接池，用于获取httpClient - * @param httpClientBuilder - * @return - */ - @Bean - public CloseableHttpClient getCloseableHttpClient(@Qualifier("httpClientBuilder") HttpClientBuilder httpClientBuilder){ - return httpClientBuilder.build(); - } - - /** - * Builder是RequestConfig的一个内部类 - * 通过RequestConfig的custom方法来获取到一个Builder对象 - * 设置builder的连接信息 - * 这里还可以设置proxy，cookieSpec等属性。有需要的话可以在此设置 - * @return - */ - @Bean(name = "builder") - public RequestConfig.Builder getBuilder(){ - RequestConfig.Builder builder = RequestConfig.custom(); - return builder.setConnectTimeout(connectTimeout) - .setConnectionRequestTimeout(connectionRequestTimeout) - .setSocketTimeout(socketTimeout) - .setStaleConnectionCheckEnabled(staleConnectionCheckEnabled); - } - - /** - * 使用builder构建一个RequestConfig对象 - * @param builder - * @return - */ - @Bean - public RequestConfig getRequestConfig(@Qualifier("builder") RequestConfig.Builder builder){ - return builder.build(); - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/dto/ResultPackage.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/dto/ResultPackage.java deleted file mode 100644 index 16ed231..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/dto/ResultPackage.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hig.dto; - -import java.util.Map; - -import lombok.Data; - -@Data -public class ResultPackage { - private int errcode; - private String errmsg; - private Object data; - - public ResultPackage( ) { - } - - public ResultPackage(int errcode, String errmsg, Object data) { - super(); - this.errcode = errcode; - this.errmsg = errmsg; - this.data = data; - } - - public ResultPackage (Map objmap) - { - String errcode = objmap.get("errcode").toString(); - - if (errcode.indexOf(".") > 0) - errcode = errcode.substring(0, errcode.indexOf(".")); - this.errcode = Integer.parseInt(errcode); - this.errmsg = objmap.get("errmsg").toString(); - this.data = objmap.get("data"); - } - - public ResultPackage Right(Object data) - { - return new ResultPackage(0,"",data); - } - - - -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/httpclient/HttpResult.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/httpclient/HttpResult.java deleted file mode 100644 index c835cb7..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/httpclient/HttpResult.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hig.httpclient; - -public class HttpResult { - - // 响应码 - private Integer code; - - // 响应体 - private String body; - - - public HttpResult() { - super(); - } - - public HttpResult(Integer code, String body) { - super(); - this.code = code; - this.body = body; - } - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/Base64Coder.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/Base64Coder.java deleted file mode 100644 index 3bc4a14..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/Base64Coder.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hig.utils; - -import java.util.Base64; - -public class Base64Coder { - public static String Encode(byte[] bytes) - { - return Base64.getEncoder().encodeToString(bytes); - } - - public static byte[] Decode(String basestr) throws Exception - { - try { - return Base64.getDecoder().decode(basestr); - } catch (IllegalArgumentException e) { - throw new Exception(e.getMessage()); - } - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/DateUtils.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/DateUtils.java deleted file mode 100644 index 5dcf0c8..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/DateUtils.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hig.utils; - -import java.text.SimpleDateFormat; -import java.util.Date; - -public class DateUtils { - - public static String toString(Date date) - { - SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - return dateformat.format(date); - - - } - - public static String toMonthDayString(Date date) - { - SimpleDateFormat dateformat = new SimpleDateFormat("MMdd"); - return dateformat.format(date); - - - } - - public static String toYearString(Date date) - { - SimpleDateFormat dateformat = new SimpleDateFormat("yyyy"); - return dateformat.format(date); - - } - - public static String toDateString() - { - SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMdd"); - return dateformat.format(new Date()); - - - } - - public static String toShortDateString(Date date) - { - SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); - return dateformat.format(date); - - - } - - public static String toMonthDayString() - { - SimpleDateFormat dateformat = new SimpleDateFormat("MMdd"); - return dateformat.format(new Date()); - - - } - - public static String toYearString() - { - SimpleDateFormat dateformat = new SimpleDateFormat("yyyy"); - return dateformat.format(new Date()); - - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/DigitUtils.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/DigitUtils.java deleted file mode 100644 index 7a1272e..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/DigitUtils.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hig.utils; - -public class DigitUtils { - - public static String toChinese(String str) { - //数字对应的汉字 - String[] num = {"一", "二", "三", "四", "五", "六", "七", "八", "九"}; - //单位 - String[] unit = {"", "十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千", "万亿"}; - //将输入数字转换为字符串 - //将该字符串分割为数组存放 - char[] ch = str.toCharArray(); - //结果 字符串 - String result = ""; - int length = ch.length; - for (int i = 0; i < length; i++) { - int c = (int) ch[i] - 48; - if (c != 0) { - result += num[c - 1] + unit[length - i - 1]; - } - } - return result; - } - - public static void main(String[] args) { - - // 将字符串数字转化为汉字 - - toChinese("30"); - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/EncryUtils.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/EncryUtils.java deleted file mode 100644 index e157371..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/EncryUtils.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hig.utils; - -import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; -import org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig; - -public class EncryUtils { - - private static String password = "Z1cZbNeiq75+w==3Y1p2ioY"; - - public static String EncryText(String text) { - StandardPBEStringEncryptor encryptOr = new StandardPBEStringEncryptor(); - EnvironmentStringPBEConfig config = new EnvironmentStringPBEConfig(); - config.setAlgorithm("PBEWithMD5AndDES"); - config.setPassword(password); - // 应用配置 - encryptOr.setConfig(config); - - return encryptOr.encrypt(text); - } - - public static String DecryText(String entext) { - if (entext == null || entext.equals("")) return null; - - StandardPBEStringEncryptor encryptOr = new StandardPBEStringEncryptor(); - EnvironmentStringPBEConfig config = new EnvironmentStringPBEConfig(); - config.setAlgorithm("PBEWithMD5AndDES"); - config.setPassword(password); - // 应用配置 - encryptOr.setConfig(config); - - return encryptOr.decrypt(entext); - - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/JsonUtils.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/JsonUtils.java deleted file mode 100644 index e32fa46..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/JsonUtils.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hig.utils; - -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; - -/** - * @author Binary Wang(https://github.com/binarywang) - */ -public class JsonUtils { - private static final ObjectMapper JSON = new ObjectMapper(); - - static { - JSON.setSerializationInclusion(Include.NON_NULL); - JSON.configure(SerializationFeature.INDENT_OUTPUT, Boolean.TRUE); - } - - public static String toJson(Object obj) { - try { - return JSON.writeValueAsString(obj); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - - return null; - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/NameBuilder.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/NameBuilder.java deleted file mode 100644 index 5b51635..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/NameBuilder.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.hig.utils; - -import java.util.Random; - -public class NameBuilder { - private static String xings = "赵 钱 孙 李 周 吴 郑 王 冯 陈 褚 卫 " + "蒋 沈 韩 杨 朱 秦 尤 许 何 吕 施 张 " + "孔 曹 严 华 金 魏 陶 姜 戚 谢 邹 喻 " - + "柏 水 窦 章 云 苏 潘 葛 奚 范 彭 郎 " + "万俟 司马 上官 欧阳 夏侯 诸葛 闻人 东方 赫连 皇甫 尉迟 公羊"; - private static String mings = "碧凡、夏菡、曼香、若烟、半梦、雅绿、冰蓝、灵槐、平安、书翠、翠风、香巧、代云、" + "友巧、听寒、梦柏、醉易、访旋、亦玉、凌萱、访卉、怀亦、笑蓝、春翠、靖柏、书雪、" - + "乐枫、念薇、靖雁、寻春、恨山、从寒、忆香、觅波、静曼、凡旋、新波、代真、新蕾、" + "雁玉、冷卉、紫山、千琴、恨天、傲芙、盼山、怀蝶、冰兰、问旋、从南、白易、问筠、" - + "如霜、半芹、寒雁、怜云、寻文、谷雪、乐萱、涵菡、海莲、傲蕾、青槐、冬儿、易梦、" + "惜雪、宛海、之柔、夏青"; - private static Random r = new Random(); - - /** - * 使用指定的姓氏，用xings里面的字，随机生成姓名 - * @param xing 指定姓氏 - * @param length 指定名字总长度 - * @return - */ - public static String build(String xing, int length) { - // 定义姓名 - String xingming = xing; - - //创建随机对象 - Random r = new Random(); - - while (xingming.length() < length) { - // 从名字符串中随机取出一个字符的编号 - int index = r.nextInt(mings.length()); - // 从名字字符串中取一个字 - String s = mings.substring(index, index + 1); - // 如果s是顿号，就重新再取一次（使用常量比变量，这是推荐的方式） - if ("、".equals(s)) { - continue; - } else { - //将名 加到 姓名中取 - xingming += s; - } - } - return xingming; - } - - /** - * 使用xings里面姓氏，用xings里面的字，随机生成姓名 - * @param length 指定名字总长度 - * @return - */ - public static String build(int length) { - // 判断姓名的长度必须大于 2 - if (length < 2) { - System.out.println("姓名不能少于2个字符"); - return null; - } - /** - * 因为有些姓氏不能拆分（如：复姓），因此选姓氏不能像选名字那样一个一个字选 - * 因此要将xings转成数组 - */ - // 先随机选姓氏 - Random r = new Random(); - String[] xingArr = xings.split(" "); - int index = r.nextInt(xingArr.length); - String xing = xingArr[index]; - - // 有了姓氏，再调用上面的选名字的方法，就OK了 - return build(xing, length); - } - - /** - * 随机生成2~3个字的名字 - * @return - */ - public static String build() { - int length = r.nextInt(2) + 2; - return build(length); - } - - public static void main(String[] args) { - System.out.println("\r\n指定姓氏造100个3个字的名字"); - for (int i = 0; i < 100; i++) { - System.out.print(build("廖", 3) + "，"); - if ((i + 1) % 10 == 0) { - System.out.println(); - } - } - - System.out.println("\r\n不指定姓氏造100个3个字的名字"); - for (int i = 0; i < 100; i++) { - System.out.print(build(3) + "，"); - if ((i + 1) % 10 == 0) { - System.out.println(); - } - } - - System.out.println("\r\n随机造100个名2~3个字的字"); - for (int i = 0; i < 100; i++) { - System.out.print(build() + "\t"); - if ((i + 1) % 10 == 0) { - System.out.println(); - } - } - - } - } - - diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/PackageWork.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/PackageWork.java deleted file mode 100644 index 2a480d5..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/PackageWork.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hig.utils; - -import java.util.HashMap; -import java.util.Map; - -import com.hig.dto.ResultPackage; - -public class PackageWork { - - public static Map ToMap(int errcode,String errmsg,Object data) - { - Map resultMap = new HashMap<>(); - - resultMap.put("errcode", errcode); - resultMap.put("errmsg", errmsg); - resultMap.put("data", data); - - return resultMap; - } - - public static Map Right(Object data) - { - Map resultMap = new HashMap<>(); - - resultMap.put("errcode", 0); - resultMap.put("errmsg", ""); - resultMap.put("data", data); - - return resultMap; - } - -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/RandomNameUtils.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/RandomNameUtils.java deleted file mode 100644 index d928e8d..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/RandomNameUtils.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hig.utils; - -import java.io.UnsupportedEncodingException; -import java.util.Random; - -public class RandomNameUtils { - //百家姓 - private static final String[] Surname= {"赵","钱","孙","李","周","吴","郑","王","冯","陈","褚","卫","蒋","沈","韩","杨","朱","秦","尤","许", - "何","吕","施","张","孔","曹","严","华","金","魏","陶","姜","戚","谢","邹","喻","柏","水","窦","章","云","苏","潘","葛","奚","范","彭","郎", - "鲁","韦","昌","马","苗","凤","花","方","俞","任","袁","柳","酆","鲍","史","唐","费","廉","岑","薛","雷","贺","倪","汤","滕","殷", - "罗","毕","郝","邬","安","常","乐","于","时","傅","皮","卞","齐","康","伍","余","元","卜","顾","孟","平","黄","和", - "穆","萧","尹","姚","邵","湛","汪","祁","毛","禹","狄","米","贝","明","臧","计","伏","成","戴","谈","宋","茅","庞","熊","纪","舒", - "屈","项","祝","董","梁","杜","阮","蓝","闵","席","季","麻","强","贾","路","娄","危","江","童","颜","郭","梅","盛","林","刁","钟", - "徐","邱","骆","高","夏","蔡","田","樊","胡","凌","霍","虞","万","支","柯","昝","管","卢","莫","经","房","裘","缪","干","解","应", - "宗","丁","宣","贲","邓","郁","单","杭","洪","包","诸","左","石","崔","吉","钮","龚","程","嵇","邢","滑","裴","陆","荣","翁","荀", - "羊","于","惠","甄","曲","家","封","芮","羿","储","靳","汲","邴","糜","松","井","段","富","巫","乌","焦","巴","弓","牧","隗","山", - "谷","车","侯","宓","蓬","全","郗","班","仰","秋","仲","伊","宫","宁","仇","栾","暴","甘","钭","厉","戎","祖","武","符","刘","景", - "詹","束","龙","叶","幸","司","韶","郜","黎","蓟","溥","印","宿","白","怀","蒲","邰","从","鄂","索","咸","籍","赖","卓","蔺","屠", - "蒙","池","乔","阴","郁","胥","能","苍","双","闻","莘","党","翟","谭","贡","劳","逄","姬","申","扶","堵","冉","宰","郦","雍","却", - "璩","桑","桂","濮","牛","寿","通","边","扈","燕","冀","浦","尚","农","温","别","庄","晏","柴","瞿","阎","充","慕","连","茹","习", - "宦","艾","鱼","容","向","古","易","慎","戈","廖","庾","终","暨","居","衡","步","都","耿","满","弘","匡","国","文","寇","广","禄", - "阙","东","欧","殳","沃","利","蔚","越","夔","隆","师","巩","厍","聂","晁","勾","敖","融","冷","訾","辛","阚","那","简","饶","空", - "曾","毋","沙","乜","养","鞠","须","丰","巢","关","蒯","相","查","后","荆","红","游","郏","竺","权","逯","盖","益","桓","公","仉", - "督","岳","帅","缑","亢","况","郈","有","琴","归","海","晋","楚","闫","法","汝","鄢","涂","钦","商","牟","佘","佴","伯","赏","墨", - "哈","谯","篁","年","爱","阳","佟","言","福","南","火","铁","迟","漆","官","冼","真","展","繁","檀","祭","密","敬","揭","舜","楼", - "疏","冒","浑","挚","胶","随","高","皋","原","种","练","弥","仓","眭","蹇","覃","阿","门","恽","来","綦","召","仪","风","介","巨", - "木","京","狐","郇","虎","枚","抗","达","杞","苌","折","麦","庆","过","竹","端","鲜","皇","亓","老","是","秘","畅","邝","还","宾", - "闾","辜","纵","侴","万俟","司马","上官","欧阳","夏侯","诸葛","闻人","东方","赫连","皇甫","羊舌","尉迟","公羊","澹台","公冶","宗正", - "濮阳","淳于","单于","太叔","申屠","公孙","仲孙","轩辕","令狐","钟离","宇文","长孙","慕容","鲜于","闾丘","司徒","司空","兀官","司寇", - "南门","呼延","子车","颛孙","端木","巫马","公西","漆雕","车正","壤驷","公良","拓跋","夹谷","宰父","谷梁","段干","百里","东郭","微生", - "梁丘","左丘","东门","西门","南宫","第五","公仪","公乘","太史","仲长","叔孙","屈突","尔朱","东乡","相里","胡母","司城","张廖","雍门", - "毋丘","贺兰","綦毋","屋庐","独孤","南郭","北宫","王孙"}; - - public static String getChineseName() { - String str = null; - String name = null; - int highPos, lowPos; - Random random = new Random(); - //区码，0xA0打头，从第16区开始，即0xB0=11*16=176,16~55一级汉字，56~87二级汉字 - highPos = (176 + Math.abs(random.nextInt(72))); - random=new Random(); - //位码，0xA0打头，范围第1~94列 - lowPos = 161 + Math.abs(random.nextInt(94)); - - byte[] bArr = new byte[2]; - bArr[0] = (new Integer(highPos)).byteValue(); - bArr[1] = (new Integer(lowPos)).byteValue(); - try { - //区位码组合成汉字 - str = new String(bArr, "GB2312"); - int index=random.nextInt(Surname.length-1); - //获得一个随机的姓氏 - name = Surname[index] +str; - - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return name; - } - - -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/RandomUtils.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/RandomUtils.java deleted file mode 100644 index b4014df..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/RandomUtils.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hig.utils; - -import java.util.Random; - -public class RandomUtils { - // 随机生成16位字符串 - public static String get16Str() { - String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - Random random = new Random(); - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < 16; i++) { - int number = random.nextInt(base.length()); - sb.append(base.charAt(number)); - } - return sb.toString(); - } -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/ResultUtils.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/ResultUtils.java deleted file mode 100644 index 6daebec..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/ResultUtils.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.hig.utils; - -public class ResultUtils { - -} diff --git a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/UUIDGenerator.java b/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/UUIDGenerator.java deleted file mode 100644 index 2652961..0000000 --- a/exam-online-api-DEL/hig-common/src/main/java/com/hig/utils/UUIDGenerator.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hig.utils; - - -import java.net.InetAddress; - -public class UUIDGenerator { - - - /** - * 产生一个32位的UUID - * - * @return - */ - - public static String generate() { - return new StringBuilder(32).append(format(getIP())).append( - format(getJVM())).append(format(getHiTime())).append( - format(getLoTime())).append(format(getCount())).toString(); - - } - - private static final int IP; - static { - int ipadd; - try { - ipadd = toInt(InetAddress.getLocalHost().getAddress()); - } catch (Exception e) { - ipadd = 0; - } - IP = ipadd; - } - - private static short counter = (short) 0; - - private static final int JVM = (int) (System.currentTimeMillis() >>> 8); - - private final static String format(int intval) { - String formatted = Integer.toHexString(intval); - StringBuilder buf = new StringBuilder("00000000"); - buf.replace(8 - formatted.length(), 8, formatted); - return buf.toString(); - } - - private final static String format(short shortval) { - String formatted = Integer.toHexString(shortval); - StringBuilder buf = new StringBuilder("0000"); - buf.replace(4 - formatted.length(), 4, formatted); - return buf.toString(); - } - - private final static int getJVM() { - return JVM; - } - - private final static short getCount() { - synchronized (UUIDGenerator.class) { - if (counter < 0) { - counter = 0; - } - return counter++; - } - } - - /** - * Unique in a local network - */ - private final static int getIP() { - return IP; - } - - /** - * Unique down to millisecond - */ - private final static short getHiTime() { - return (short) (System.currentTimeMillis() >>> 32); - } - - private final static int getLoTime() { - return (int) System.currentTimeMillis(); - } - - private final static int toInt(byte[] bytes) { - int result = 0; - for (int i = 0; i < 4; i++) { - result = (result << 8) - Byte.MIN_VALUE + (int) bytes[i]; - } - return result; - } - -} diff --git a/exam-online-api-DEL/package-lock.json b/exam-online-api-DEL/package-lock.json deleted file mode 100644 index 48e341a..0000000 --- a/exam-online-api-DEL/package-lock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lockfileVersion": 1 -} diff --git a/exam-online-api-DEL/pom.xml b/exam-online-api-DEL/pom.xml deleted file mode 100644 index 34ebb77..0000000 --- a/exam-online-api-DEL/pom.xml +++ /dev/null @@ -1,312 +0,0 @@ - - - 4.0.0 - - com.ruoyi - ruoyi - 3.8.6 - - ruoyi - http://www.ruoyi.vip - 新框架扩展应用 - - - 3.8.6 - UTF-8 - UTF-8 - 1.8 - 3.1.1 - 1.2.16 - 1.21 - 3.0.0 - 2.3.2 - 2.3.2 - - 1.4.7 - 1.2.83 - 6.4.6 - 5.13.0 - 2.15.1 - 1.5 - 3.2.2 - 5.2.4 - 2.3 - 0.9.1 - 8.0.33 - 4.5.0 - 3.0.1 - - - - - - - - - org.springframework.boot - spring-boot-dependencies - 2.5.15 - pom - import - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - eu.bitwalker - UserAgentUtils - ${bitwalker.version} - - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring-boot.version} - - - - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - - com.github.oshi - oshi-core - ${oshi.version} - - - - net.java.dev.jna - jna - ${jna.version} - - - - net.java.dev.jna - jna-platform - ${jna.version} - - - - - io.springfox - springfox-boot-starter - ${swagger.version} - - - io.swagger - swagger-models - - - - - - - commons-io - commons-io - ${commons.io.version} - - - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - - commons-collections - commons-collections - ${commons.collections.version} - - - - - com.alibaba - fastjson - ${fastjson.version} - - - - - com.mysql - mysql-connector-j - ${mysql.version} - - - - - io.jsonwebtoken - jjwt - ${jwt.version} - - - - - com.github.penggle - kaptcha - ${kaptcha.version} - - - - - com.github.binarywang - weixin-java-mp - ${weixin.version} - - - - - com.google.zxing - javase - 3.5.3 - - - - - com.ruoyi - ruoyi-quartz - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-generator - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-framework - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-system - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common - ${ruoyi.version} - - - - - - com.ruoyi - hig-application - ${ruoyi.version} - - - com.ruoyi - hig-common - ${ruoyi.version} - - - - - - - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator - ruoyi-common - - hig-application - hig-common - - pom - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - false - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/pom.xml b/exam-online-api-DEL/ruoyi-admin/pom.xml deleted file mode 100644 index 2ce124e..0000000 --- a/exam-online-api-DEL/ruoyi-admin/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.8.6 - - 4.0.0 - jar - ruoyi-admin - - - web服务入口 - - - - - - - org.springframework.boot - spring-boot-devtools - true - - - - - io.springfox - springfox-boot-starter - - - - - io.swagger - swagger-models - 1.6.2 - - - - - com.mysql - mysql-connector-j - - - - - - - - - - - com.ruoyi - ruoyi-framework - - - - - com.ruoyi - ruoyi-quartz - - - - - com.ruoyi - ruoyi-generator - - - - - com.ruoyi - hig-application - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.4.0 - - false - examapi - - - - examapi - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java deleted file mode 100644 index a7679d0..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.ruoyi; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.annotation.ComponentScan; - -/** - * 启动程序 - * - * @author ruoyi - */ -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -@ComponentScan(basePackages = {"com.ruoyi","com.hig"}) -public class RuoYiApplication -{ - public static void main(String[] args) - { - // System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java deleted file mode 100644 index 6de67dc..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -/** - * web容器中进行部署 - * - * @author ruoyi - */ -public class RuoYiServletInitializer extends SpringBootServletInitializer -{ - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) - { - return application.sources(RuoYiApplication.class); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java deleted file mode 100644 index cc409db..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.web.controller.common; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.util.FastByteArrayOutputStream; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import com.google.code.kaptcha.Producer; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.sign.Base64; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.system.service.ISysConfigService; - -/** - * 验证码操作处理 - * - * @author ruoyi - */ -@RestController -public class CaptchaController -{ - @Resource(name = "captchaProducer") - private Producer captchaProducer; - - @Resource(name = "captchaProducerMath") - private Producer captchaProducerMath; - - @Autowired - private RedisCache redisCache; - - // 验证码类型 - @Value("${ruoyi.captchaType}") - private String captchaType; - - @Autowired - private ISysConfigService configService; - /** - * 生成验证码 - */ - @GetMapping("/captchaImage") - public AjaxResult getCode(HttpServletResponse response) throws IOException - { - AjaxResult ajax = AjaxResult.success(); - boolean captchaOnOff = configService.selectCaptchaOnOff(); - ajax.put("captchaOnOff", captchaOnOff); - if (!captchaOnOff) - { - return ajax; - } - - // 保存验证码信息 - String uuid = IdUtils.simpleUuid(); - String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; - - String capStr = null, code = null; - BufferedImage image = null; - - // 生成验证码 - if ("math".equals(captchaType)) - { - String capText = captchaProducerMath.createText(); - capStr = capText.substring(0, capText.lastIndexOf("@")); - code = capText.substring(capText.lastIndexOf("@") + 1); - image = captchaProducerMath.createImage(capStr); - } - else if ("char".equals(captchaType)) - { - capStr = code = captchaProducer.createText(); - image = captchaProducer.createImage(capStr); - } - - redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); - // 转换流信息写出 - FastByteArrayOutputStream os = new FastByteArrayOutputStream(); - try - { - ImageIO.write(image, "jpg", os); - } - catch (IOException e) - { - return AjaxResult.error(e.getMessage()); - } - - ajax.put("uuid", uuid); - ajax.put("img", Base64.encode(os.toByteArray())); - return ajax; - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java deleted file mode 100644 index e0c728f..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.ruoyi.web.controller.common; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.framework.config.ServerConfig; - -/** - * 通用请求处理 - * - * @author ruoyi - */ -@RestController -public class CommonController -{ - private static final Logger log = LoggerFactory.getLogger(CommonController.class); - - @Autowired - private ServerConfig serverConfig; - - /** - * 通用下载请求 - * - * @param fileName 文件名称 - * @param delete 是否删除 - */ - @GetMapping("common/download") - public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) - { - try - { - if (!FileUtils.checkAllowDownload(fileName)) - { - throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); - } - String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; - - response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); - FileUtils.setAttachmentResponseHeader(response, realFileName); - FileUtils.writeBytes(filePath, response.getOutputStream()); - if (delete) - { - FileUtils.deleteFile(filePath); - } - } - catch (Exception e) - { - log.error("下载文件失败", e); - } - } - - /** - * 通用上传请求 - */ - @PostMapping("/common/upload") - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - String url = serverConfig.getUrl() + fileName; - AjaxResult ajax = AjaxResult.success(); - ajax.put("fileName", fileName); - ajax.put("url", url); - return ajax; - } - catch (Exception e) - { - return AjaxResult.error(e.getMessage()); - } - } - - /** - * 本地资源通用下载 - */ - @GetMapping("/common/download/resource") - public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) - throws Exception - { - try - { - if (!FileUtils.checkAllowDownload(resource)) - { - throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); - } - // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); - // 数据库资源地址 - String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); - // 下载名称 - String downloadName = StringUtils.substringAfterLast(downloadPath, "/"); - response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); - FileUtils.setAttachmentResponseHeader(response, downloadName); - FileUtils.writeBytes(downloadPath, response.getOutputStream()); - } - catch (Exception e) - { - log.error("下载文件失败", e); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java deleted file mode 100644 index 7b97de2..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.ruoyi.web.controller.monitor; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisCallback; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; - -/** - * 缓存监控 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/cache") -public class CacheController -{ - @Autowired - private RedisTemplate redisTemplate; - - @PreAuthorize("@ss.hasPermi('monitor:cache:list')") - @GetMapping() - public AjaxResult getInfo() throws Exception - { - Properties info = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info()); - Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); - Object dbSize = redisTemplate.execute((RedisCallback) connection -> connection.dbSize()); - - Map result = new HashMap<>(3); - result.put("info", info); - result.put("dbSize", dbSize); - - List> pieList = new ArrayList<>(); - commandStats.stringPropertyNames().forEach(key -> { - Map data = new HashMap<>(2); - String property = commandStats.getProperty(key); - data.put("name", StringUtils.removeStart(key, "cmdstat_")); - data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); - pieList.add(data); - }); - result.put("commandStats", pieList); - return AjaxResult.success(result); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java deleted file mode 100644 index cc805ad..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ruoyi.web.controller.monitor; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.framework.web.domain.Server; - -/** - * 服务器监控 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/server") -public class ServerController -{ - @PreAuthorize("@ss.hasPermi('monitor:server:list')") - @GetMapping() - public AjaxResult getInfo() throws Exception - { - Server server = new Server(); - server.copyTo(); - return AjaxResult.success(server); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java deleted file mode 100644 index 339f242..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ruoyi.web.controller.monitor; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; - -/** - * 系统访问记录 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/logininfor") -public class SysLogininforController extends BaseController -{ - @Autowired - private ISysLogininforService logininforService; - - @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") - @GetMapping("/list") - public TableDataInfo list(SysLogininfor logininfor) - { - startPage(); - List list = logininforService.selectLogininforList(logininfor); - return getDataTable(list); - } - - @Log(title = "登录日志", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") - @GetMapping("/export") - public AjaxResult export(SysLogininfor logininfor) - { - List list = logininforService.selectLogininforList(logininfor); - ExcelUtil util = new ExcelUtil(SysLogininfor.class); - return util.exportExcel(list, "登录日志"); - } - - @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") - @Log(title = "登录日志", businessType = BusinessType.DELETE) - @DeleteMapping("/{infoIds}") - public AjaxResult remove(@PathVariable Long[] infoIds) - { - return toAjax(logininforService.deleteLogininforByIds(infoIds)); - } - - @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") - @Log(title = "登录日志", businessType = BusinessType.CLEAN) - @DeleteMapping("/clean") - public AjaxResult clean() - { - logininforService.cleanLogininfor(); - return AjaxResult.success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java deleted file mode 100644 index 1d7eb02..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ruoyi.web.controller.monitor; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; - -/** - * 操作日志记录 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/operlog") -public class SysOperlogController extends BaseController -{ - @Autowired - private ISysOperLogService operLogService; - - @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") - @GetMapping("/list") - public TableDataInfo list(SysOperLog operLog) - { - startPage(); - List list = operLogService.selectOperLogList(operLog); - return getDataTable(list); - } - - @Log(title = "操作日志", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('monitor:operlog:export')") - @GetMapping("/export") - public AjaxResult export(SysOperLog operLog) - { - List list = operLogService.selectOperLogList(operLog); - ExcelUtil util = new ExcelUtil(SysOperLog.class); - return util.exportExcel(list, "操作日志"); - } - - @Log(title = "操作日志", businessType = BusinessType.DELETE) - @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") - @DeleteMapping("/{operIds}") - public AjaxResult remove(@PathVariable Long[] operIds) - { - return toAjax(operLogService.deleteOperLogByIds(operIds)); - } - - @Log(title = "操作日志", businessType = BusinessType.CLEAN) - @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") - @DeleteMapping("/clean") - public AjaxResult clean() - { - operLogService.cleanOperLog(); - return AjaxResult.success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java deleted file mode 100644 index 9b157ea..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.ruoyi.web.controller.monitor; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; - -/** - * 在线用户监控 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/online") -public class SysUserOnlineController extends BaseController -{ - @Autowired - private ISysUserOnlineService userOnlineService; - - @Autowired - private RedisCache redisCache; - - @PreAuthorize("@ss.hasPermi('monitor:online:list')") - @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) - { - Collection keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*"); - List userOnlineList = new ArrayList(); - for (String key : keys) - { - LoginUser user = redisCache.getCacheObject(key); - if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) - { - userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); - } - } - else if (StringUtils.isNotEmpty(ipaddr)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr())) - { - userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); - } - } - else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) - { - if (StringUtils.equals(userName, user.getUsername())) - { - userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); - } - } - else - { - userOnlineList.add(userOnlineService.loginUserToUserOnline(user)); - } - } - Collections.reverse(userOnlineList); - userOnlineList.removeAll(Collections.singleton(null)); - return getDataTable(userOnlineList); - } - - /** - * 强退用户 - */ - @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')") - @Log(title = "在线用户", businessType = BusinessType.FORCE) - @DeleteMapping("/{tokenId}") - public AjaxResult forceLogout(@PathVariable String tokenId) - { - redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId); - return AjaxResult.success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java deleted file mode 100644 index 2379e54..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; - -/** - * 参数配置 信息操作处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/config") -public class SysConfigController extends BaseController -{ - @Autowired - private ISysConfigService configService; - - /** - * 获取参数配置列表 - */ - @PreAuthorize("@ss.hasPermi('system:config:list')") - @GetMapping("/list") - public TableDataInfo list(SysConfig config) - { - startPage(); - List list = configService.selectConfigList(config); - return getDataTable(list); - } - - @Log(title = "参数管理", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:config:export')") - @GetMapping("/export") - public AjaxResult export(SysConfig config) - { - List list = configService.selectConfigList(config); - ExcelUtil util = new ExcelUtil(SysConfig.class); - return util.exportExcel(list, "参数数据"); - } - - /** - * 根据参数编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:config:query')") - @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long configId) - { - return AjaxResult.success(configService.selectConfigById(configId)); - } - - /** - * 根据参数键名查询参数值 - */ - @GetMapping(value = "/configKey/{configKey}") - public AjaxResult getConfigKey(@PathVariable String configKey) - { - return AjaxResult.success(configService.selectConfigByKey(configKey)); - } - - /** - * 新增参数配置 - */ - @PreAuthorize("@ss.hasPermi('system:config:add')") - @Log(title = "参数管理", businessType = BusinessType.INSERT) - @PostMapping - @RepeatSubmit - public AjaxResult add(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { - return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); - } - config.setCreateBy(SecurityUtils.getUsername()); - return toAjax(configService.insertConfig(config)); - } - - /** - * 修改参数配置 - */ - @PreAuthorize("@ss.hasPermi('system:config:edit')") - @Log(title = "参数管理", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { - return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); - } - config.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(configService.updateConfig(config)); - } - - /** - * 删除参数配置 - */ - @PreAuthorize("@ss.hasPermi('system:config:remove')") - @Log(title = "参数管理", businessType = BusinessType.DELETE) - @GetMapping("/batch/{configIds}") - // @DeleteMapping("/{configIds}") - public AjaxResult remove(@PathVariable Long[] configIds) - { - // System.out.println("configIds:" + configIds.toString()); - configService.deleteConfigByIds(configIds); - return success(); - } - - /** - * 刷新参数缓存 - */ - @PreAuthorize("@ss.hasPermi('system:config:remove')") - @Log(title = "参数管理", businessType = BusinessType.CLEAN) - @GetMapping("/refreshCache") - // @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { - configService.resetConfigCache(); - return AjaxResult.success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java deleted file mode 100644 index 11737e7..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.Iterator; -import java.util.List; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; - -import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.cp.api.WxCpService; -import me.chanjar.weixin.cp.bean.WxCpDepart; - -/** - * 部门信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/dept") -public class SysDeptController extends BaseController -{ - @Autowired - private ISysDeptService deptService; - - /*@Autowired - private WxDepartmentService wxDeptService;*/ - /** - * 获取部门列表 - */ - @PreAuthorize("@ss.hasPermi('system:dept:list')") - @GetMapping("/list") - public AjaxResult list(SysDept dept) - { - List depts = deptService.selectDeptList(dept); - return AjaxResult.success(depts); - } - - /** - * 查询部门列表（排除节点） - */ - @PreAuthorize("@ss.hasPermi('system:dept:list')") - @GetMapping("/list/exclude/{deptId}") - public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) - { - List depts = deptService.selectDeptList(new SysDept()); - Iterator it = depts.iterator(); - while (it.hasNext()) - { - SysDept d = (SysDept) it.next(); - if (d.getDeptId().intValue() == deptId - || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) - { - it.remove(); - } - } - return AjaxResult.success(depts); - } - - /** - * 根据部门编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:dept:query')") - @GetMapping(value = "/{deptId}") - public AjaxResult getInfo(@PathVariable Long deptId) - { - return AjaxResult.success(deptService.selectDeptById(deptId)); - } - - /** - * 获取部门下拉树列表 - */ - @GetMapping("/treeselect") - public AjaxResult treeselect(SysDept dept) - { - List depts = deptService.selectDeptList(dept); - return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); - } - - /** - * 加载对应角色部门列表树 - */ - @GetMapping(value = "/roleDeptTreeselect/{roleId}") - public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) - { - List depts = deptService.selectDeptList(new SysDept()); - AjaxResult ajax = AjaxResult.success(); - ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); - ajax.put("depts", deptService.buildDeptTreeSelect(depts)); - return ajax; - } - - /** - * 新增部门 - */ - @PreAuthorize("@ss.hasPermi('system:dept:add')") - @Log(title = "部门管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { - return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); - } - dept.setCreateBy(SecurityUtils.getUsername()); - return toAjax(deptService.insertDept(dept)); - } - - /** - * 修改部门 - */ - @PreAuthorize("@ss.hasPermi('system:dept:edit')") - @Log(title = "部门管理", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { - return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); - } - else if (dept.getParentId().equals(dept.getDeptId())) - { - return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); - } - else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) - && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) - { - return AjaxResult.error("该部门包含未停用的子部门！"); - } - dept.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(deptService.updateDept(dept)); - } - - /** - * 删除部门 - */ - @PreAuthorize("@ss.hasPermi('system:dept:remove')") - @Log(title = "部门管理", businessType = BusinessType.DELETE) - @GetMapping("/delete/{deptId}") - // @DeleteMapping("/{deptId}") - public AjaxResult remove(@PathVariable Long deptId) - { - if (deptService.hasChildByDeptId(deptId)) - { - return AjaxResult.error("存在下级部门,不允许删除"); - } - if (deptService.checkDeptExistUser(deptId)) - { - return AjaxResult.error("部门存在用户,不允许删除"); - } - return toAjax(deptService.deleteDeptById(deptId)); - } - - -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java deleted file mode 100644 index 0f0f18b..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; - -/** - * 数据字典信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/dict/data") -public class SysDictDataController extends BaseController -{ - @Autowired - private ISysDictDataService dictDataService; - - @Autowired - private ISysDictTypeService dictTypeService; - - @PreAuthorize("@ss.hasPermi('system:dict:list')") - @GetMapping("/list") - public TableDataInfo list(SysDictData dictData) - { - startPage(); - List list = dictDataService.selectDictDataList(dictData); - return getDataTable(list); - } - - @Log(title = "字典数据", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:dict:export')") - @GetMapping("/export") - public AjaxResult export(SysDictData dictData) - { - List list = dictDataService.selectDictDataList(dictData); - ExcelUtil util = new ExcelUtil(SysDictData.class); - return util.exportExcel(list, "字典数据"); - } - - /** - * 查询字典数据详细 - */ - @PreAuthorize("@ss.hasPermi('system:dict:query')") - @GetMapping(value = "/{dictCode}") - public AjaxResult getInfo(@PathVariable Long dictCode) - { - return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); - } - - /** - * 根据字典类型查询字典数据信息 - */ - @GetMapping(value = "/type/{dictType}") - public AjaxResult dictType(@PathVariable String dictType) - { - List data = dictTypeService.selectDictDataByType(dictType); - if (StringUtils.isNull(data)) - { - data = new ArrayList(); - } - return AjaxResult.success(data); - } - - /** - * 新增字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:add')") - @Log(title = "字典数据", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictData dict) - { - dict.setCreateBy(SecurityUtils.getUsername()); - return toAjax(dictDataService.insertDictData(dict)); - } - - /** - * 修改保存字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:edit')") - @Log(title = "字典数据", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictData dict) - { - dict.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(dictDataService.updateDictData(dict)); - } - - /** - * 删除字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.DELETE) - @GetMapping("/batch/{dictCodes}") - // @DeleteMapping("/{dictCodes}") - public AjaxResult remove(@PathVariable Long[] dictCodes) - { - dictDataService.deleteDictDataByIds(dictCodes); - return success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java deleted file mode 100644 index 78004dd..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; - -/** - * 数据字典信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/dict/type") -public class SysDictTypeController extends BaseController -{ - @Autowired - private ISysDictTypeService dictTypeService; - - @PreAuthorize("@ss.hasPermi('system:dict:list')") - @GetMapping("/list") - public TableDataInfo list(SysDictType dictType) - { - startPage(); - List list = dictTypeService.selectDictTypeList(dictType); - return getDataTable(list); - } - - @Log(title = "字典类型", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:dict:export')") - @GetMapping("/export") - public AjaxResult export(SysDictType dictType) - { - List list = dictTypeService.selectDictTypeList(dictType); - ExcelUtil util = new ExcelUtil(SysDictType.class); - return util.exportExcel(list, "字典类型"); - } - - /** - * 查询字典类型详细 - */ - @PreAuthorize("@ss.hasPermi('system:dict:query')") - @GetMapping(value = "/{dictId}") - public AjaxResult getInfo(@PathVariable Long dictId) - { - return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); - } - - /** - * 新增字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:add')") - @Log(title = "字典类型", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { - return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - dict.setCreateBy(SecurityUtils.getUsername()); - return toAjax(dictTypeService.insertDictType(dict)); - } - - /** - * 修改字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:edit')") - @Log(title = "字典类型", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { - return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); - } - dict.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(dictTypeService.updateDictType(dict)); - } - - /** - * 删除字典类型 - */ - @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.DELETE) - @GetMapping("/batch/{dictIds}") - // @DeleteMapping("/{dictIds}") - public AjaxResult remove(@PathVariable Long[] dictIds) - { - dictTypeService.deleteDictTypeByIds(dictIds); - return success(); - } - - /** - * 刷新字典缓存 - */ - @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.CLEAN) - @GetMapping("/refreshCache") - // @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { - dictTypeService.resetDictCache(); - return AjaxResult.success(); - } - - /** - * 获取字典选择框列表 - */ - @GetMapping("/optionselect") - public AjaxResult optionselect() - { - List dictTypes = dictTypeService.selectDictTypeAll(); - return AjaxResult.success(dictTypes); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java deleted file mode 100644 index 13007eb..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ruoyi.web.controller.system; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.utils.StringUtils; - -/** - * 首页 - * - * @author ruoyi - */ -@RestController -public class SysIndexController -{ - /** 系统基础配置 */ - @Autowired - private RuoYiConfig ruoyiConfig; - - /** - * 访问首页，提示语 - */ - @RequestMapping("/") - public String index() - { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java deleted file mode 100644 index 2b31b07..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.io.UnsupportedEncodingException; -import java.util.Base64; -import java.util.Date; -import java.util.List; -import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.entity.WechatLoginStatus; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.web.service.SysLoginService; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.framework.web.service.WechatService; -import com.ruoyi.system.mapper.WechatLoginStatusMapper; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 登录验证 - * - * @author ruoyi - */ -@RestController -public class SysLoginController -{ - private static final Logger log = LoggerFactory.getLogger(SysLoginController.class); - @Autowired - private SysLoginService loginService; - - @Autowired - private ISysMenuService menuService; - - @Autowired - private SysPermissionService permissionService; - - @Autowired - private TokenService tokenService; - - @Autowired - private WechatService wechatService; - - @Autowired - private WechatLoginStatusMapper wechatLoginStatusMapper; - - @Autowired - private ISysUserService userService; - - /** - * 登录方法 - * - * @param loginBody 登录信息 - * @return 结果 - */ - @PostMapping("/login") - public AjaxResult login(@RequestBody LoginBody loginBody) - { - // System.out.println("loginBody:" + loginBody.toString()); - String username = null; - String password = null; - try { - username = new String(Base64.getDecoder().decode(loginBody.getUsername()), "UTF-8"); - password = new String(Base64.getDecoder().decode(loginBody.getPassword()), "UTF-8"); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - return AjaxResult.error("解密字符串出错:" + e.getMessage()); - } - - AjaxResult ajax = AjaxResult.success(); - // 生成令牌 - String token = loginService.login(username, password, loginBody.getCode(), - loginBody.getUuid()); - ajax.put(Constants.TOKEN, token); - return ajax; - } - - /** - * 获取用户信息 - * - * @return 用户信息 - */ - @GetMapping("getInfo") - public AjaxResult getInfo() - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - SysUser user = loginUser.getUser(); - // 角色集合 - Set roles = permissionService.getRolePermission(user); - // 权限集合 - Set permissions = permissionService.getMenuPermission(user); - AjaxResult ajax = AjaxResult.success(); - ajax.put("user", user); - ajax.put("roles", roles); - ajax.put("permissions", permissions); - log.debug("ajax:{}", ajax.toString()); - return ajax; - } - - /** - * 获取路由信息 - * - * @return 路由信息 - */ - @GetMapping("getRouters") - public AjaxResult getRouters() - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - // 用户信息 - SysUser user = loginUser.getUser(); - List menus = menuService.selectMenuTreeByUserId(user.getUserId()); - return AjaxResult.success(menuService.buildMenus(menus)); - } - - /** - * 微信登录 - * - * @param loginId 登录ID - * @return 结果 - */ - @PostMapping("/wechat/login") - public AjaxResult wechatLogin(@RequestParam String loginId) - { - try { - // 查询登录状态 - WechatLoginStatus loginStatus = wechatLoginStatusMapper.selectWechatLoginStatusById(loginId); - if (loginStatus == null) { - return AjaxResult.error("登录状态不存在"); - } - - // 检查状态是否为已确认 - if (!"2".equals(loginStatus.getStatus())) { - return AjaxResult.error("登录状态不正确"); - } - - // 根据openid查询用户 - SysUser user = userService.selectUserByWechatOpenid(loginStatus.getOpenid()); - if (user == null) { - return AjaxResult.error("未找到绑定的用户"); - } - - // 检查用户状态 - if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { - return AjaxResult.error("用户已被删除"); - } - if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - return AjaxResult.error("用户已被禁用"); - } - - // 创建登录用户对象 - LoginUser loginUser = new LoginUser(user, permissionService.getMenuPermission(user)); - - // 生成令牌 - String token = tokenService.createToken(loginUser); - - // 更新登录状态为已使用 - loginStatus.setStatus("4"); // 已使用 - loginStatus.setUpdateTime(new Date()); - wechatLoginStatusMapper.updateWechatLoginStatus(loginStatus); - - AjaxResult ajax = AjaxResult.success(); - ajax.put(Constants.TOKEN, token); - return ajax; - } catch (Exception e) { - log.error("微信登录失败", e); - return AjaxResult.error("微信登录失败: " + e.getMessage()); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java deleted file mode 100644 index a4b633b..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysMenuService; - -/** - * 菜单信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/menu") -public class SysMenuController extends BaseController -{ - @Autowired - private ISysMenuService menuService; - - @Autowired - private TokenService tokenService; - - /** - * 获取菜单列表 - */ - @PreAuthorize("@ss.hasPermi('system:menu:list')") - @GetMapping("/list") - public AjaxResult list(SysMenu menu) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - Long userId = loginUser.getUser().getUserId(); - List menus = menuService.selectMenuList(menu, userId); - return AjaxResult.success(menus); - } - - /** - * 根据菜单编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:menu:query')") - @GetMapping(value = "/{menuId}") - public AjaxResult getInfo(@PathVariable Long menuId) - { - return AjaxResult.success(menuService.selectMenuById(menuId)); - } - - /** - * 获取菜单下拉树列表 - */ - @GetMapping("/treeselect") - public AjaxResult treeselect(SysMenu menu) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - Long userId = loginUser.getUser().getUserId(); - List menus = menuService.selectMenuList(menu, userId); - return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); - } - - /** - * 加载对应角色菜单列表树 - */ - @GetMapping(value = "/roleMenuTreeselect/{roleId}") - public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - List menus = menuService.selectMenuList(loginUser.getUser().getUserId()); - AjaxResult ajax = AjaxResult.success(); - ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); - ajax.put("menus", menuService.buildMenuTreeSelect(menus)); - return ajax; - } - - /** - * 新增菜单 - */ - @PreAuthorize("@ss.hasPermi('system:menu:add')") - @Log(title = "菜单管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { - return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) - { - return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); - } - menu.setCreateBy(SecurityUtils.getUsername()); - return toAjax(menuService.insertMenu(menu)); - } - - /** - * 修改菜单 - */ - @PreAuthorize("@ss.hasPermi('system:menu:edit')") - @Log(title = "菜单管理", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { - return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) - { - return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); - } - else if (menu.getMenuId().equals(menu.getParentId())) - { - return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); - } - menu.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(menuService.updateMenu(menu)); - } - - /** - * 删除菜单 - */ - @PreAuthorize("@ss.hasPermi('system:menu:remove')") - @Log(title = "菜单管理", businessType = BusinessType.DELETE) - @GetMapping("/delete/{menuId}") - // @DeleteMapping("/{menuId}") - public AjaxResult remove(@PathVariable("menuId") Long menuId) - { - if (menuService.hasChildByMenuId(menuId)) - { - return AjaxResult.error("存在子菜单,不允许删除"); - } - if (menuService.checkMenuExistRole(menuId)) - { - return AjaxResult.error("菜单已分配,不允许删除"); - } - return toAjax(menuService.deleteMenuById(menuId)); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java deleted file mode 100644 index ffaab3e..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; - -/** - * 公告 信息操作处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/notice") -public class SysNoticeController extends BaseController -{ - @Autowired - private ISysNoticeService noticeService; - - /** - * 获取通知公告列表 - */ - @PreAuthorize("@ss.hasPermi('system:notice:list')") - @GetMapping("/list") - public TableDataInfo list(SysNotice notice) - { - startPage(); - List list = noticeService.selectNoticeList(notice); - return getDataTable(list); - } - - /** - * 根据通知公告编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:notice:query')") - @GetMapping(value = "/{noticeId}") - public AjaxResult getInfo(@PathVariable Long noticeId) - { - return AjaxResult.success(noticeService.selectNoticeById(noticeId)); - } - - /** - * 新增通知公告 - */ - @PreAuthorize("@ss.hasPermi('system:notice:add')") - @Log(title = "通知公告", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysNotice notice) - { - notice.setCreateBy(SecurityUtils.getUsername()); - return toAjax(noticeService.insertNotice(notice)); - } - - /** - * 修改通知公告 - */ - @PreAuthorize("@ss.hasPermi('system:notice:edit')") - @Log(title = "通知公告", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysNotice notice) - { - notice.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(noticeService.updateNotice(notice)); - } - - /** - * 删除通知公告 - */ - @PreAuthorize("@ss.hasPermi('system:notice:remove')") - @Log(title = "通知公告", businessType = BusinessType.DELETE) - @GetMapping("/batch/{noticeIds}") - // @DeleteMapping("/{noticeIds}") - public AjaxResult remove(@PathVariable Long[] noticeIds) - { - return toAjax(noticeService.deleteNoticeByIds(noticeIds)); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java deleted file mode 100644 index 47e7983..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; - -/** - * 岗位信息操作处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/post") -public class SysPostController extends BaseController -{ - @Autowired - private ISysPostService postService; - - /** - * 获取岗位列表 - */ - @PreAuthorize("@ss.hasPermi('system:post:list')") - @GetMapping("/list") - public TableDataInfo list(SysPost post) - { - startPage(); - List list = postService.selectPostList(post); - return getDataTable(list); - } - - @Log(title = "岗位管理", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:post:export')") - @GetMapping("/export") - public AjaxResult export(SysPost post) - { - List list = postService.selectPostList(post); - ExcelUtil util = new ExcelUtil(SysPost.class); - return util.exportExcel(list, "岗位数据"); - } - - /** - * 根据岗位编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:post:query')") - @GetMapping(value = "/{postId}") - public AjaxResult getInfo(@PathVariable Long postId) - { - return AjaxResult.success(postService.selectPostById(postId)); - } - - /** - * 新增岗位 - */ - @PreAuthorize("@ss.hasPermi('system:post:add')") - @Log(title = "岗位管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { - return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { - return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); - } - post.setCreateBy(SecurityUtils.getUsername()); - return toAjax(postService.insertPost(post)); - } - - /** - * 修改岗位 - */ - @PreAuthorize("@ss.hasPermi('system:post:edit')") - @Log(title = "岗位管理", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { - return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { - return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); - } - post.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(postService.updatePost(post)); - } - - /** - * 删除岗位 - */ - @PreAuthorize("@ss.hasPermi('system:post:remove')") - @Log(title = "岗位管理", businessType = BusinessType.DELETE) - @GetMapping("/remove/{postIds}") - // @DeleteMapping("/{postIds}") - public AjaxResult remove(@PathVariable Long[] postIds) - { - return toAjax(postService.deletePostByIds(postIds)); - } - - /** - * 获取岗位选择框列表 - */ - @GetMapping("/optionselect") - public AjaxResult optionselect() - { - List posts = postService.selectPostAll(); - return AjaxResult.success(posts); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java deleted file mode 100644 index 4a01f0d..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.io.IOException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 个人信息 业务处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/user/profile") -public class SysProfileController extends BaseController -{ - @Autowired - private ISysUserService userService; - - @Autowired - private TokenService tokenService; - - /** - * 个人信息 - */ - @GetMapping - public AjaxResult profile() - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - SysUser user = loginUser.getUser(); - AjaxResult ajax = AjaxResult.success(user); - ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); - ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); - return ajax; - } - - /** - * 修改用户 - */ - @Log(title = "个人信息", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult updateProfile(@RequestBody SysUser user) - { - if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - if (userService.updateUserProfile(user) > 0) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - // 更新缓存用户信息 - loginUser.getUser().setNickName(user.getNickName()); - loginUser.getUser().setPhonenumber(user.getPhonenumber()); - loginUser.getUser().setEmail(user.getEmail()); - loginUser.getUser().setSex(user.getSex()); - tokenService.setLoginUser(loginUser); - return AjaxResult.success(); - } - return AjaxResult.error("修改个人信息异常，请联系管理员"); - } - - /** - * 重置密码 - */ - @Log(title = "个人信息", businessType = BusinessType.UPDATE) - @PostMapping("/updatePwd") - // @PutMapping("/updatePwd") - public AjaxResult updatePwd(String oldPassword, String newPassword) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - String userName = loginUser.getUsername(); - String password = loginUser.getPassword(); - if (!SecurityUtils.matchesPassword(oldPassword, password)) - { - return AjaxResult.error("修改密码失败，旧密码错误"); - } - if (SecurityUtils.matchesPassword(newPassword, password)) - { - return AjaxResult.error("新密码不能与旧密码相同"); - } - if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) - { - // 更新缓存用户密码 - loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); - tokenService.setLoginUser(loginUser); - return AjaxResult.success(); - } - return AjaxResult.error("修改密码异常，请联系管理员"); - } - - /** - * 头像上传 - */ - @Log(title = "用户头像", businessType = BusinessType.UPDATE) - @PostMapping("/avatar") - public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException - { - if (!file.isEmpty()) - { - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file); - if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) - { - AjaxResult ajax = AjaxResult.success(); - ajax.put("imgUrl", avatar); - // 更新缓存用户头像 - loginUser.getUser().setAvatar(avatar); - tokenService.setLoginUser(loginUser); - return ajax; - } - } - return AjaxResult.error("上传图片异常，请联系管理员"); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java deleted file mode 100644 index f2bb552..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 角色信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/role") -public class SysRoleController extends BaseController -{ - @Autowired - private ISysRoleService roleService; - - @Autowired - private TokenService tokenService; - - @Autowired - private SysPermissionService permissionService; - - @Autowired - private ISysUserService userService; - - @PreAuthorize("@ss.hasPermi('system:role:list')") - @GetMapping("/list") - public TableDataInfo list(SysRole role) - { - Map map = role.getParams(); - System.out.println("map:" + map.toString()); - - startPage(); - List list = roleService.selectRoleList(role); - return getDataTable(list); - } - - @Log(title = "角色管理", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:role:export')") - @GetMapping("/export") - public AjaxResult export(SysRole role) - { - List list = roleService.selectRoleList(role); - ExcelUtil util = new ExcelUtil(SysRole.class); - return util.exportExcel(list, "角色数据"); - } - - /** - * 根据角色编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:role:query')") - @GetMapping(value = "/{roleId}") - public AjaxResult getInfo(@PathVariable Long roleId) - { - return AjaxResult.success(roleService.selectRoleById(roleId)); - } - - /** - * 新增角色 - */ - @PreAuthorize("@ss.hasPermi('system:role:add')") - @Log(title = "角色管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysRole role) - { - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { - return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { - return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); - } - role.setCreateBy(SecurityUtils.getUsername()); - return toAjax(roleService.insertRole(role)); - - } - - /** - * 修改保存角色 - */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysRole role) - { - roleService.checkRoleAllowed(role); - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { - return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { - return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); - } - role.setUpdateBy(SecurityUtils.getUsername()); - - if (roleService.updateRole(role) > 0) - { - // 更新缓存用户权限 - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) - { - loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser())); - loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName())); - tokenService.setLoginUser(loginUser); - } - return AjaxResult.success(); - } - return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); - } - - /** - * 修改保存数据权限 - */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) - @PostMapping("/dataScope") - // @PutMapping("/dataScope") - public AjaxResult dataScope(@RequestBody SysRole role) - { - roleService.checkRoleAllowed(role); - return toAjax(roleService.authDataScope(role)); - } - - /** - * 状态修改 - */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) - @PostMapping("/changeStatus") - // @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysRole role) - { - roleService.checkRoleAllowed(role); - role.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(roleService.updateRoleStatus(role)); - } - - /** - * 删除角色 - */ - @PreAuthorize("@ss.hasPermi('system:role:remove')") - @Log(title = "角色管理", businessType = BusinessType.DELETE) - @GetMapping(value = "/batch/{roleIds}") - // @DeleteMapping("/{roleIds}") - public AjaxResult remove(@PathVariable Long[] roleIds) - { - return toAjax(roleService.deleteRoleByIds(roleIds)); - } - - /** - * 获取角色选择框列表 - */ - @PreAuthorize("@ss.hasPermi('system:role:query')") - @GetMapping("/optionselect") - public AjaxResult optionselect() - { - return AjaxResult.success(roleService.selectRoleAll()); - } - - /** - * 查询已分配用户角色列表 - */ - @PreAuthorize("@ss.hasPermi('system:role:list')") - @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(SysUser user) - { - startPage(); - List list = userService.selectAllocatedList(user); - return getDataTable(list); - } - - /** - * 查询未分配用户角色列表 - */ - @PreAuthorize("@ss.hasPermi('system:role:list')") - @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(SysUser user) - { - startPage(); - List list = userService.selectUnallocatedList(user); - return getDataTable(list); - } - - /** - * 取消授权用户 - */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.GRANT) - @PostMapping("/authUser/cancel") - // @PutMapping("/authUser/cancel") - public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) - { - return toAjax(roleService.deleteAuthUser(userRole)); - } - - /** - * 批量取消授权用户 - */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.GRANT) - @PostMapping("/authUser/cancelAll") - // @PutMapping("/authUser/cancelAll") - public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) - { - return toAjax(roleService.deleteAuthUsers(roleId, userIds)); - } - - /** - * 批量选择用户授权 - */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.GRANT) - @PostMapping("/authUser/selectAll") - // @PutMapping("/authUser/selectAll") - public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) - { - return toAjax(roleService.insertAuthUsers(roleId, userIds)); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java deleted file mode 100644 index e444c1d..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ /dev/null @@ -1,263 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.hig.utils.UUIDGenerator; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 用户信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/system/user") -public class SysUserController extends BaseController -{ - - @Autowired - private ISysUserService userService; - - @Autowired - private ISysRoleService roleService; - - @Autowired - private ISysPostService postService; - - @Autowired - private TokenService tokenService; - - /*@Value("${system.orgid}") - private String orgId;*/ - - /** - * 获取用户列表 - */ - // @PreAuthorize("@ss.hasPermi('system:user:list')") - @GetMapping("/list") - public TableDataInfo list(SysUser user) - { - // System.out.println("SysUser:" + user.toString()); - // 进行单位选择判断 - /*if (user.getDeptId() != null) { - System.out.println("选过单位"); - if (user.getDeptId().toString().equals(orgId)) { - user.setDeptId(null); - } else { - int count = sysDepartmentLevelMapper.selectCount(user.getDeptId()); - - if (count > 0) { - user.setCountyCode(user.getDeptId()); - user.setDeptId(null); - } - } - }*/ - // System.out.println("SysUser:" + user.toString()); - startPage(); - List list = userService.selectUserList(user); - return getDataTable(list); - } - - @Log(title = "用户管理", businessType = BusinessType.EXPORT) - @PreAuthorize("@ss.hasPermi('system:user:export')") - @GetMapping("/export") - public AjaxResult export(SysUser user) - { - List list = userService.selectUserList(user); - ExcelUtil util = new ExcelUtil(SysUser.class); - return util.exportExcel(list, "用户数据"); - } - - @Log(title = "用户管理", businessType = BusinessType.IMPORT) - @PreAuthorize("@ss.hasPermi('system:user:import')") - @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception - { - ExcelUtil util = new ExcelUtil(SysUser.class); - List userList = util.importExcel(file.getInputStream()); - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - String operName = loginUser.getUsername(); - String message = userService.importUser(userList, updateSupport, operName); - return AjaxResult.success(message); - } - - @GetMapping("/importTemplate") - public AjaxResult importTemplate() - { - ExcelUtil util = new ExcelUtil(SysUser.class); - return util.importTemplateExcel("用户数据"); - } - - /** - * 根据用户编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('system:user:query')") - @GetMapping(value = { "/", "/{userId}" }) - public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) - { - AjaxResult ajax = AjaxResult.success(); - List roles = roleService.selectRoleAll(); - // System.out.println("roles:" + roles); - ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); - // System.out.println("ajax:" + ajax); - ajax.put("posts", postService.selectPostAll()); - if (StringUtils.isNotNull(userId)) - { - ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId)); - ajax.put("postIds", postService.selectPostListByUserId(userId)); - ajax.put("roleIds", roleService.selectRoleListByUserId(userId)); - } - return ajax; - } - - /** - * 新增用户 - */ - @PreAuthorize("@ss.hasPermi('system:user:add')") - @Log(title = "用户管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysUser user) - { - if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) - { - return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); - } - else if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { - return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { - return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - user.setCreateBy(SecurityUtils.getUsername()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - user.setUserCode(UUIDGenerator.generate()); - return toAjax(userService.insertUser(user)); - } - - /** - * 修改用户 - */ - @PreAuthorize("@ss.hasPermi('system:user:edit')") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult edit(@Validated @RequestBody SysUser user) - { - userService.checkUserAllowed(user); - if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.updateUser(user)); - } - - /** - * 删除用户 - */ - @PreAuthorize("@ss.hasPermi('system:user:remove')") - @Log(title = "用户管理", businessType = BusinessType.DELETE) - @GetMapping("/batch/{userIds}") - // @DeleteMapping("/{userIds}") - public AjaxResult remove(@PathVariable Long[] userIds) - { - return toAjax(userService.deleteUserByIds(userIds)); - } - - /** - * 重置密码 - */ - @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PostMapping("/resetPwd") - // @PutMapping("/resetPwd") - public AjaxResult resetPwd(@RequestBody SysUser user) - { - userService.checkUserAllowed(user); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.resetPwd(user)); - } - - /** - * 状态修改 - */ - @PreAuthorize("@ss.hasPermi('system:user:edit')") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PostMapping("/changeStatus") - // @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysUser user) - { - userService.checkUserAllowed(user); - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.updateUserStatus(user)); - } - - /** - * 根据用户编号获取授权角色 - */ - @PreAuthorize("@ss.hasPermi('system:user:query')") - @GetMapping("/authRole/{userId}") - public AjaxResult authRole(@PathVariable("userId") Long userId) - { - AjaxResult ajax = AjaxResult.success(); - SysUser user = userService.selectUserById(userId); - List roles = roleService.selectRolesByUserId(userId); - ajax.put("user", user); - ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); - return ajax; - } - - /** - * 用户授权角色 - */ - @PreAuthorize("@ss.hasPermi('system:user:edit')") - @Log(title = "用户管理", businessType = BusinessType.GRANT) - @PostMapping("/authRole") - // @PutMapping("/authRole") - public AjaxResult insertAuthRole(Long userId, Long[] roleIds) - { - userService.insertUserAuth(userId, roleIds); - return success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/WechatLoginController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/WechatLoginController.java deleted file mode 100644 index 3a8e43a..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/WechatLoginController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.web.controller.system; - -import java.io.IOException; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.google.zxing.WriterException; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.framework.web.service.WechatService; - -import me.chanjar.weixin.common.error.WxErrorException; - -/** - * 微信登录控制器 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/wechat") -public class WechatLoginController extends BaseController -{ - @Autowired - private WechatService wechatService; - - /** - * 生成微信登录二维码 - */ - @GetMapping("/qrcode") - public AjaxResult generateQrCode() - { - try - { - Map result = wechatService.generateLoginQrCode(); - return AjaxResult.success(result); - } - catch (WxErrorException | IOException | WriterException e) - { - return AjaxResult.error("生成二维码失败: " + e.getMessage()); - } - } - - /** - * 检查登录状态 - */ - @GetMapping("/status") - public AjaxResult checkLoginStatus(@RequestParam String loginId) - { - Map result = wechatService.checkLoginStatus(loginId); - return AjaxResult.success(result); - } - - /** - * 微信回调接口 - */ - @GetMapping("/callback") - public AjaxResult wechatCallback( - @RequestParam(required = false) String code, - @RequestParam(required = false) String state) - { - return wechatService.handleWechatCallback(code, state); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java deleted file mode 100644 index f66ca24..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ruoyi.web.controller.tool; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; - -/** - * swagger 接口 - * - * @author ruoyi - */ -@Controller -@RequestMapping("/tool/swagger") -public class SwaggerController extends BaseController -{ - @PreAuthorize("@ss.hasPermi('tool:swagger:view')") - @GetMapping() - public String index() - { - return redirect("/swagger-ui.html"); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java deleted file mode 100644 index 68d1ebd..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.ruoyi.web.controller.tool; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; - -/** - * swagger 用户测试方法 - * - * @author ruoyi - */ -@Api("用户信息管理") -@RestController -@RequestMapping("/test/user") -public class TestController extends BaseController -{ - private final static Map USERS = new LinkedHashMap(); - { - USERS.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); - USERS.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); - } - - @ApiOperation("获取用户列表") - @GetMapping("/list") - public AjaxResult userList() - { - List userList = new ArrayList(USERS.values()); - return AjaxResult.success(userList); - } - - @ApiOperation("获取用户详细") - @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path") - @GetMapping("/{userId}") - public AjaxResult getUser(@PathVariable Integer userId) - { - if (!USERS.isEmpty() && USERS.containsKey(userId)) - { - return AjaxResult.success(USERS.get(userId)); - } - else - { - return error("用户不存在"); - } - } - - @ApiOperation("新增用户") - @ApiImplicitParams({ - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer"), - @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String"), - @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String"), - @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String") - }) - @PostMapping("/save") - public AjaxResult save(UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { - return error("用户ID不能为空"); - } - return AjaxResult.success(USERS.put(user.getUserId(), user)); - } - - @ApiOperation("更新用户") - @PutMapping("/update") - public AjaxResult update(@RequestBody UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { - return error("用户ID不能为空"); - } - if (USERS.isEmpty() || !USERS.containsKey(user.getUserId())) - { - return error("用户不存在"); - } - USERS.remove(user.getUserId()); - return AjaxResult.success(USERS.put(user.getUserId(), user)); - } - - @ApiOperation("删除用户信息") - @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path") - @DeleteMapping("/{userId}") - public AjaxResult delete(@PathVariable Integer userId) - { - if (!USERS.isEmpty() && USERS.containsKey(userId)) - { - USERS.remove(userId); - return success(); - } - else - { - return error("用户不存在"); - } - } -} - -@ApiModel(value = "UserEntity", description = "用户实体") -class UserEntity -{ - @ApiModelProperty("用户ID") - private Integer userId; - - @ApiModelProperty("用户名称") - private String username; - - @ApiModelProperty("用户密码") - private String password; - - @ApiModelProperty("用户手机") - private String mobile; - - public UserEntity() - { - - } - - public UserEntity(Integer userId, String username, String password, String mobile) - { - this.userId = userId; - this.username = username; - this.password = password; - this.mobile = mobile; - } - - public Integer getUserId() - { - return userId; - } - - public void setUserId(Integer userId) - { - this.userId = userId; - } - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getMobile() - { - return mobile; - } - - public void setMobile(String mobile) - { - this.mobile = mobile; - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java deleted file mode 100644 index ae1c3ec..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.ruoyi.web.core.config; - -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; -import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.AuthorizationScope; -import springfox.documentation.service.Contact; -import springfox.documentation.service.SecurityReference; -import springfox.documentation.service.SecurityScheme; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; - -/** - * Swagger2的接口配置 - * - * @author ruoyi - */ -@Configuration -public class SwaggerConfig -{ - /** 系统基础配置 */ - @Autowired - private RuoYiConfig ruoyiConfig; - - /** 是否开启swagger */ - @Value("${swagger.enabled}") - private boolean enabled; - - /** 设置请求的统一前缀 */ - @Value("${swagger.pathMapping}") - private String pathMapping; - - /** - * 创建API - */ - @Bean - public Docket createRestApi() - { - return new Docket(DocumentationType.OAS_30) - // 是否启用Swagger - .enable(enabled) - // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） - .apiInfo(apiInfo()) - // 设置哪些接口暴露给Swagger展示 - .select() - // 扫描所有有注解的api，用这种方式更灵活 - .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) - // 扫描指定包中的swagger注解 - // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) - // 扫描所有 .apis(RequestHandlerSelectors.any()) - .paths(PathSelectors.any()) - .build() - /* 设置安全模式，swagger可以设置访问token */ - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()) - .pathMapping(pathMapping); - } - - /** - * 安全模式，这里指定token通过Authorization头请求头传递 - */ - private List securitySchemes() - { - List apiKeyList = new ArrayList(); - apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); - return apiKeyList; - } - - /** - * 安全上下文 - */ - private List securityContexts() - { - List securityContexts = new ArrayList<>(); - securityContexts.add( - SecurityContext.builder() - .securityReferences(defaultAuth()) - .operationSelector(o -> o.requestMappingPattern().matches("/.*")) - .build()); - return securityContexts; - } - - /** - * 默认的安全上引用 - */ - private List defaultAuth() - { - AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; - authorizationScopes[0] = authorizationScope; - List securityReferences = new ArrayList<>(); - securityReferences.add(new SecurityReference("Authorization", authorizationScopes)); - return securityReferences; - } - - /** - * 添加摘要信息 - */ - private ApiInfo apiInfo() - { - // 用ApiInfoBuilder进行定制 - return new ApiInfoBuilder() - // 设置标题 - .title("标题：若依管理系统_接口文档") - // 描述 - .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") - // 作者信息 - .contact(new Contact(ruoyiConfig.getName(), null, null)) - // 版本 - .version("版本号:" + ruoyiConfig.getVersion()) - .build(); - } -} diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/exam-online-api-DEL/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index 2b23f85..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.json=/com.alibaba.fastjson.*.jar \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/resources/application-druid.yml b/exam-online-api-DEL/ruoyi-admin/src/main/resources/application-druid.yml deleted file mode 100644 index b760d28..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/resources/application-druid.yml +++ /dev/null @@ -1,65 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - #driver-class-name: oracle.jdbc.OracleDriver - druid: - # 主库数据源 - master: - #url: jdbc:mysql://62.234.3.186:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 - url: jdbc:mysql://127.0.0.1:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 - username: root - #password: Sxyanzhu@cf123 - password: haha123321 - - #url: jdbc:oracle:thin:@127.0.0.1:1521/xchwdb - #username: exam_user - #password: exam_user - - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/resources/application.yml b/exam-online-api-DEL/ruoyi-admin/src/main/resources/application.yml deleted file mode 100644 index bd6a36a..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/resources/application.yml +++ /dev/null @@ -1,164 +0,0 @@ -# 项目相关配置 -ruoyi: - # 名称 - name: Yanzhu - # 版本 - version: 3.6.0 - # 版权年份 - copyrightYear: 2025 - # 实例演示开关 - demoEnabled: false - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: /Users/mac/data/uploadPath/exam - # profile: D:/image/upload - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数组计算 char 字符验证 - captchaType: math - -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 8040 - servlet: - # 应用的访问路径 - context-path: /examapi - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # tomcat最大线程数，默认为200 - max-threads: 800 - # Tomcat启动初始化的线程数，默认值25 - min-spare-threads: 30 - -# Spring配置 -spring: - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: druid - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 30MB - # 设置总上传的文件大小 - max-request-size: 120MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 - redis: - database: 0 # Redis数据库索引（默认为0） - # host: localhost # Redis服务器地址 - host: 127.0.0.1 - port: 6379 # Redis服务器连接端口 - password: 123456 # Redis服务器连接密码（默认为空） - timeout: 20000 # 连接超时时间（毫秒） - jedis: - pool: - max-active: -1 # 连接池最大连接数（使用负值表示没有限制） - max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） - max-idle: 100 # 连接池中的最大空闲连接 - min-idle: 10 # 连接池中的最小空闲连接 - - -# 内容管理相关 -cms: - swipper: - photo-path: /photo/swipper -# 内容管理相关 - news: - photo-path: /photo/news - exam: - photo-path: /photo/exam -# 文件管理相关 - fms: - photo-path: /photo/fms -# 文件管理相关 - files: - photo-path: /photo/files -# 流程附件相关 - workflow: - file-path: /photo/ueditor - -# 微信配置 -wechat: - # 微信公众号AppId - app-id: your_wechat_appid - # 微信公众号AppSecret - app-secret: your_wechat_app_secret - # 授权回调地址 - redirect-uri: http://your-domain.com/examapi/wechat/callback - # 二维码场景值前缀 - qr-scene-prefix: LOGIN_ - # 二维码有效期（秒） - qr-expire-time: 600 - # 登录状态检查间隔（毫秒） - status-check-interval: 2000 -# 考试系统 - exam: - photo-path: /photo/exam - - -http: - maxTotal: 300 - defaultMaxPerRoute: 100 - connectTimeout: 30000 - connectionRequestTimeout: 30000 - socketTimeout: 30000 - staleConnectionCheckEnabled: true - -# 日志配置 -logging: - level: - root: info - com.ruoyi: debug - com.hig: debug - org.springframework: warn - - - -# token配置 -token: - # 令牌自定义标识 - header: Authorization - # 令牌密钥 - secret: abcdefghijklmnopqrstuvwxyz - # 令牌有效期（默认30分钟） - expireTime: 30 - -# MyBatis配置 -mybatis: - # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain,com.hig.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -# PageHelper分页插件 -pagehelper: - helperDialect: mysql - supportMethodsArguments: true - params: count=countSql - -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: /news-api - -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice/* - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/resources/config.json b/exam-online-api-DEL/ruoyi-admin/src/main/resources/config.json deleted file mode 100644 index 92aeb5b..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/resources/config.json +++ /dev/null @@ -1,77 +0,0 @@ - -{ - "basePath": "/u01/upload", - "imageActionName": "uploadimage", - "imageFieldName": "upfile", - "imageMaxSize": 2048000, - "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], - "imageCompressEnable": true, - "imageCompressBorder": 1600, - "imageInsertAlign": "none", - "imageUrlPrefix": "http://127.0.0.1:8080/examapi", - "imagePathFormat": "/photo/ueditor/{yyyy}{mm}{dd}/{time}{rand:6}", - - - "scrawlActionName": "uploadscrawl", - "scrawlFieldName": "upfile", - "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", - "scrawlMaxSize": 2048000, - "scrawlUrlPrefix": "", - "scrawlInsertAlign": "none", - - "snapscreenActionName": "uploadimage", - "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", - "snapscreenUrlPrefix": "", - "snapscreenInsertAlign": "none", - - "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"], - "catcherActionName": "catchimage", - "catcherFieldName": "source", - "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", - "catcherUrlPrefix": "", - "catcherMaxSize": 2048000, - "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], - - "videoActionName": "uploadvideo", - "videoFieldName": "upfile", - "videoPathFormat": "/photo/ueditor/{yyyy}{mm}{dd}/{time}{rand:6}", - "videoUrlPrefix": "http://127.0.0.1:8080/examapi", - "videoMaxSize": 102400000, - "videoAllowFiles": [ - ".mp4", ".ogg", ".webm"], - - "fileActionName": "uploadfile", - "fileFieldName": "upfile", - "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", - "fileUrlPrefix": "", - "fileMaxSize": 51200000, - "fileAllowFiles": [ - ".png", ".jpg", ".jpeg", ".gif", ".bmp", - ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", - ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", - ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", - ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" - ], - - - "imageManagerActionName": "listimage", - "imageManagerListPath": "/ueditor/jsp/upload/image/", - "imageManagerListSize": 20, - "imageManagerUrlPrefix": "", - "imageManagerInsertAlign": "none", - "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], - - - "fileManagerActionName": "listfile", - "fileManagerListPath": "/ueditor/jsp/upload/file/", - "fileManagerUrlPrefix": "", - "fileManagerListSize": 20, - "fileManagerAllowFiles": [ - ".png", ".jpg", ".jpeg", ".gif", ".bmp", - ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", - ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", - ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", - ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" - ] - -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/resources/i18n/messages.properties b/exam-online-api-DEL/ruoyi-admin/src/main/resources/i18n/messages.properties deleted file mode 100644 index d63aa1f..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/resources/i18n/messages.properties +++ /dev/null @@ -1,36 +0,0 @@ -#错误消息 -not.null=* 必须填写 -user.jcaptcha.error=验证码错误 -user.jcaptcha.expire=验证码已失效 -user.not.exists=用户不存在/密码错误 -user.password.not.match=用户不存在/密码错误 -user.password.retry.limit.count=密码输入错误{0}次 -user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟 -user.password.delete=对不起，您的账号已被删除 -user.blocked=用户已封禁，请联系管理员 -role.blocked=角色已封禁，请联系管理员 -user.logout.success=退出成功 - -length.not.valid=长度必须在{min}到{max}个字符之间 - -user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 -user.password.not.valid=* 5-50个字符 - -user.email.not.valid=邮箱格式错误 -user.mobile.phone.number.not.valid=手机号格式错误 -user.login.success=登录成功 -user.notfound=请重新登录 -user.forcelogout=管理员强制退出，请重新登录 -user.unknown.error=未知错误，请重新登录 - -##文件上传消息 -upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ -upload.filename.exceed.length=上传的文件名最长{0}个字符 - -##权限 -no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] -no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] -no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] -no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] -no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] -no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/resources/logback.xml b/exam-online-api-DEL/ruoyi-admin/src/main/resources/logback.xml deleted file mode 100644 index ad18ae5..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/resources/logback.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/sys-info.log - - - - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/sys-error.log - - - - ${log.path}/sys-error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - ${log.path}/sys-user.log - - - ${log.path}/sys-user.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/exam-online-api-DEL/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index 2903d5a..0000000 --- a/exam-online-api-DEL/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/exam-online-api-DEL/ruoyi-common/pom.xml b/exam-online-api-DEL/ruoyi-common/pom.xml deleted file mode 100644 index 35a3d77..0000000 --- a/exam-online-api-DEL/ruoyi-common/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.8.6 - - 4.0.0 - - ruoyi-common - - - common通用工具 - - - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - org.springframework.boot - spring-boot-starter-security - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - javax.validation - validation-api - - - - - org.apache.commons - commons-lang3 - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.alibaba - fastjson - - - - - commons-io - commons-io - - - - - commons-fileupload - commons-fileupload - - - - - org.apache.poi - poi-ooxml - - - - - org.yaml - snakeyaml - - - - - io.jsonwebtoken - jjwt - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - org.apache.commons - commons-pool2 - - - - - eu.bitwalker - UserAgentUtils - - - - - javax.servlet - javax.servlet-api - - - - - javax.xml.bind - jaxb-api - 2.3.1 - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java deleted file mode 100644 index 176878e..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 数据权限过滤注解 - * - * @author ruoyi - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface DataScope -{ - /** - * 部门表的别名 - */ - public String deptAlias() default ""; - - /** - * 用户表的别名 - */ - public String userAlias() default ""; -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java deleted file mode 100644 index 79cd191..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import com.ruoyi.common.enums.DataSourceType; - -/** - * 自定义多数据源切换注解 - * - * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 - * - * @author ruoyi - */ -@Target({ ElementType.METHOD, ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited -public @interface DataSource -{ - /** - * 切换数据源名称 - */ - public DataSourceType value() default DataSourceType.MASTER; -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java deleted file mode 100644 index 573edea..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.math.BigDecimal; - -/** - * 自定义导出Excel数据注解 - * - * @author ruoyi - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.FIELD) -public @interface Excel -{ - /** - * 导出时在excel中排序 - */ - public int sort() default Integer.MAX_VALUE; - - /** - * 导出到Excel中的名字. - */ - public String name() default ""; - - /** - * 日期格式, 如: yyyy-MM-dd - */ - public String dateFormat() default ""; - - /** - * 如果是字典类型，请设置字典的type值 (如: sys_user_sex) - */ - public String dictType() default ""; - - /** - * 读取内容转表达式 (如: 0=男,1=女,2=未知) - */ - public String readConverterExp() default ""; - - /** - * 分隔符，读取字符串组内容 - */ - public String separator() default ","; - - /** - * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) - */ - public int scale() default -1; - - /** - * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN - */ - public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; - - /** - * 导出类型（0数字 1字符串） - */ - public ColumnType cellType() default ColumnType.STRING; - - /** - * 导出时在excel中每个列的高度 单位为字符 - */ - public double height() default 14; - - /** - * 导出时在excel中每个列的宽 单位为字符 - */ - public double width() default 16; - - /** - * 文字后缀,如% 90 变成90% - */ - public String suffix() default ""; - - /** - * 当值为空时,字段的默认值 - */ - public String defaultValue() default ""; - - /** - * 提示信息 - */ - public String prompt() default ""; - - /** - * 设置只能选择不能输入的列内容. - */ - public String[] combo() default {}; - - /** - * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. - */ - public boolean isExport() default true; - - /** - * 另一个类中的属性名称,支持多级获取,以小数点隔开 - */ - public String targetAttr() default ""; - - /** - * 是否自动统计数据,在最后追加一行统计数据总和 - */ - public boolean isStatistics() default false; - - /** - * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右） - */ - Align align() default Align.AUTO; - - /** - * 字段类型（0：自动；1：左；2：右） - */ - public enum Align - { - /** - * 自动 - */ - AUTO(0), - /** - * 左边 - */ - LEFT(1), - /** - * 中间 - */ - CENTER(2), - /** - * 右边 - */ - right(3); - private final int value; - - Align(int value) - { - this.value = value; - } - - public int value() - { - return this.value; - } - } - - /** - * 字段类型（0：导出导入；1：仅导出；2：仅导入） - */ - Type type() default Type.ALL; - - /** - * 字段类型（0：导出导入；1：仅导出；2：仅导入） - */ - public enum Type - { - /** - * 全部 - */ - ALL(0), - /** - * 导出 - */ - EXPORT(1), - /** - * 导入 - */ - IMPORT(2); - private final int value; - - Type(int value) - { - this.value = value; - } - - public int value() - { - return this.value; - } - } - - /** - * 字段类型（0：数字；1：字符；2：图片） - */ - public enum ColumnType - { - /** - * 数字 - */ - NUMERIC(0), - /** - * 字符 - */ - STRING(1), - /** - * 图片 - */ - IMAGE(2); - private final int value; - - ColumnType(int value) - { - this.value = value; - } - - public int value() - { - return this.value; - } - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java deleted file mode 100644 index d33004f..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Excel注解集 - * - * @author ruoyi - */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -public @interface Excels -{ - Excel[] value(); -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java deleted file mode 100644 index eb05dc7..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; - -/** - * 自定义操作日志记录注解 - * - * @author ruoyi - * - */ -@Target({ ElementType.PARAMETER, ElementType.METHOD }) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface Log -{ - /** - * 模块 - */ - public String title() default ""; - - /** - * 功能 - */ - public BusinessType businessType() default BusinessType.OTHER; - - /** - * 操作人类别 - */ - public OperatorType operatorType() default OperatorType.MANAGE; - - /** - * 是否保存请求的参数 - */ - public boolean isSaveRequestData() default true; -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java deleted file mode 100644 index 9e350f1..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 自定义注解防止表单重复提交 - * - * @author ruoyi - * - */ -@Inherited -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface RepeatSubmit -{ - -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java deleted file mode 100644 index d5d8723..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.ruoyi.common.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * 读取项目相关配置 - * - * @author ruoyi - */ -@Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig -{ - /** 项目名称 */ - private String name; - - /** 版本 */ - private String version; - - /** 版权年份 */ - private String copyrightYear; - - /** 实例演示开关 */ - private boolean demoEnabled; - - /** 上传路径 */ - private static String profile; - - /** 获取地址开关 */ - private static boolean addressEnabled; - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getVersion() - { - return version; - } - - public void setVersion(String version) - { - this.version = version; - } - - public String getCopyrightYear() - { - return copyrightYear; - } - - public void setCopyrightYear(String copyrightYear) - { - this.copyrightYear = copyrightYear; - } - - public boolean isDemoEnabled() - { - return demoEnabled; - } - - public void setDemoEnabled(boolean demoEnabled) - { - this.demoEnabled = demoEnabled; - } - - public static String getProfile() - { - return profile; - } - - public void setProfile(String profile) - { - RuoYiConfig.profile = profile; - } - - public static boolean isAddressEnabled() - { - return addressEnabled; - } - - public void setAddressEnabled(boolean addressEnabled) - { - RuoYiConfig.addressEnabled = addressEnabled; - } - - /** - * 获取头像上传路径 - */ - public static String getAvatarPath() - { - return getProfile() + "/avatar"; - } - - /** - * 获取下载路径 - */ - public static String getDownloadPath() - { - return getProfile() + "/download/"; - } - - /** - * 获取上传路径 - */ - public static String getUploadPath() - { - return getProfile() + "/upload"; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java deleted file mode 100644 index 5a67274..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.ruoyi.common.constant; - -/** - * 通用常量信息 - * - * @author ruoyi - */ -public class Constants -{ - /** - * UTF-8 字符集 - */ - public static final String UTF8 = "UTF-8"; - - /** - * GBK 字符集 - */ - public static final String GBK = "GBK"; - - /** - * http请求 - */ - public static final String HTTP = "http://"; - - /** - * https请求 - */ - public static final String HTTPS = "https://"; - - /** - * 通用成功标识 - */ - public static final String SUCCESS = "0"; - - /** - * 通用失败标识 - */ - public static final String FAIL = "1"; - - /** - * 登录成功 - */ - public static final String LOGIN_SUCCESS = "Success"; - - /** - * 注销 - */ - public static final String LOGOUT = "Logout"; - - /** - * 登录出错 - */ - public static final String LOGIN_ERROR_COUNT = "login_error_count:"; - - /** - * 登录失败 - */ - public static final String LOGIN_FAIL = "Error"; - - /** - * 验证码 redis key - */ - public static final String CAPTCHA_CODE_KEY = "captcha_codes:"; - - /** - * 登录用户 redis key - */ - public static final String LOGIN_TOKEN_KEY = "login_tokens:"; - - /** - * 防重提交 redis key - */ - public static final String REPEAT_SUBMIT_KEY = "repeat_submit:"; - - /** - * 验证码有效期（分钟） - */ - public static final Integer CAPTCHA_EXPIRATION = 2; - - /** - * 令牌 - */ - public static final String TOKEN = "token"; - - /** - * 令牌前缀 - */ - public static final String TOKEN_PREFIX = "Bearer "; - - /** - * 令牌前缀 - */ - public static final String LOGIN_USER_KEY = "login_user_key"; - - /** - * 用户ID - */ - public static final String JWT_USERID = "userid"; - - /** - * 用户名称 - */ - public static final String JWT_USERNAME = "sub"; - - /** - * 用户头像 - */ - public static final String JWT_AVATAR = "avatar"; - - /** - * 创建时间 - */ - public static final String JWT_CREATED = "created"; - - /** - * 用户权限 - */ - public static final String JWT_AUTHORITIES = "authorities"; - - /** - * 参数管理 cache key - */ - public static final String SYS_CONFIG_KEY = "sys_config:"; - - /** - * 字典管理 cache key - */ - public static final String SYS_DICT_KEY = "sys_dict:"; - - /** - * 资源映射路径 前缀 - */ - public static final String RESOURCE_PREFIX = "/profile"; - - /** - * RMI 远程方法调用 - */ - public static final String LOOKUP_RMI = "rmi://"; -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java deleted file mode 100644 index 1fa328e..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.ruoyi.common.constant; - -/** - * 代码生成通用常量 - * - * @author ruoyi - */ -public class GenConstants -{ - /** 单表（增删改查） */ - public static final String TPL_CRUD = "crud"; - - /** 树表（增删改查） */ - public static final String TPL_TREE = "tree"; - - /** 主子表（增删改查） */ - public static final String TPL_SUB = "sub"; - - /** 树编码字段 */ - public static final String TREE_CODE = "treeCode"; - - /** 树父编码字段 */ - public static final String TREE_PARENT_CODE = "treeParentCode"; - - /** 树名称字段 */ - public static final String TREE_NAME = "treeName"; - - /** 上级菜单ID字段 */ - public static final String PARENT_MENU_ID = "parentMenuId"; - - /** 上级菜单名称字段 */ - public static final String PARENT_MENU_NAME = "parentMenuName"; - - /** 数据库字符串类型 */ - public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" }; - - /** 数据库文本类型 */ - public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" }; - - /** 数据库时间类型 */ - public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" }; - - /** 数据库数字类型 */ - public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer", - "bit", "bigint", "float", "double", "decimal" }; - - /** 页面不需要编辑字段 */ - public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" }; - - /** 页面不需要显示的列表字段 */ - public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by", - "update_time" }; - - /** 页面不需要查询字段 */ - public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by", - "update_time", "remark" }; - - /** Entity基类字段 */ - public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" }; - - /** Tree基类字段 */ - public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" }; - - /** 文本框 */ - public static final String HTML_INPUT = "input"; - - /** 文本域 */ - public static final String HTML_TEXTAREA = "textarea"; - - /** 下拉框 */ - public static final String HTML_SELECT = "select"; - - /** 单选框 */ - public static final String HTML_RADIO = "radio"; - - /** 复选框 */ - public static final String HTML_CHECKBOX = "checkbox"; - - /** 日期控件 */ - public static final String HTML_DATETIME = "datetime"; - - /** 图片上传控件 */ - public static final String HTML_IMAGE_UPLOAD = "imageUpload"; - - /** 文件上传控件 */ - public static final String HTML_FILE_UPLOAD = "fileUpload"; - - /** 富文本控件 */ - public static final String HTML_EDITOR = "editor"; - - /** 字符串类型 */ - public static final String TYPE_STRING = "String"; - - /** 整型 */ - public static final String TYPE_INTEGER = "Integer"; - - /** 长整型 */ - public static final String TYPE_LONG = "Long"; - - /** 浮点型 */ - public static final String TYPE_DOUBLE = "Double"; - - /** 高精度计算类型 */ - public static final String TYPE_BIGDECIMAL = "BigDecimal"; - - /** 时间类型 */ - public static final String TYPE_DATE = "Date"; - - /** 模糊查询 */ - public static final String QUERY_LIKE = "LIKE"; - - /** 需要 */ - public static final String REQUIRE = "1"; -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java deleted file mode 100644 index d60afee..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.ruoyi.common.constant; - -/** - * 返回状态码 - * - * @author ruoyi - */ -public class HttpStatus -{ - /** - * 操作成功 - */ - public static final int SUCCESS = 200; - - /** - * 对象创建成功 - */ - public static final int CREATED = 201; - - /** - * 请求已经被接受 - */ - public static final int ACCEPTED = 202; - - /** - * 操作已经执行成功，但是没有返回数据 - */ - public static final int NO_CONTENT = 204; - - /** - * 资源已被移除 - */ - public static final int MOVED_PERM = 301; - - /** - * 重定向 - */ - public static final int SEE_OTHER = 303; - - /** - * 资源没有被修改 - */ - public static final int NOT_MODIFIED = 304; - - /** - * 参数列表错误（缺少，格式不匹配） - */ - public static final int BAD_REQUEST = 400; - - /** - * 未授权 - */ - public static final int UNAUTHORIZED = 401; - - /** - * 访问受限，授权过期 - */ - public static final int FORBIDDEN = 403; - - /** - * 资源，服务未找到 - */ - public static final int NOT_FOUND = 404; - - /** - * 不允许的http方法 - */ - public static final int BAD_METHOD = 405; - - /** - * 资源冲突，或者资源被锁 - */ - public static final int CONFLICT = 409; - - /** - * 不支持的数据，媒体类型 - */ - public static final int UNSUPPORTED_TYPE = 415; - - /** - * 系统内部错误 - */ - public static final int ERROR = 500; - - /** - * 接口未实现 - */ - public static final int NOT_IMPLEMENTED = 501; -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java deleted file mode 100644 index 62ad815..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ruoyi.common.constant; - -/** - * 任务调度通用常量 - * - * @author ruoyi - */ -public class ScheduleConstants -{ - public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; - - /** 执行目标key */ - public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; - - /** 默认 */ - public static final String MISFIRE_DEFAULT = "0"; - - /** 立即触发执行 */ - public static final String MISFIRE_IGNORE_MISFIRES = "1"; - - /** 触发一次执行 */ - public static final String MISFIRE_FIRE_AND_PROCEED = "2"; - - /** 不触发立即执行 */ - public static final String MISFIRE_DO_NOTHING = "3"; - - public enum Status - { - /** - * 正常 - */ - NORMAL("0"), - /** - * 暂停 - */ - PAUSE("1"); - - private String value; - - private Status(String value) - { - this.value = value; - } - - public String getValue() - { - return value; - } - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java deleted file mode 100644 index 5b1bce1..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.ruoyi.common.constant; - -/** - * 用户常量信息 - * - * @author ruoyi - */ -public class UserConstants -{ - /** - * 平台内系统用户的唯一标志 - */ - public static final String SYS_USER = "SYS_USER"; - - /** 正常状态 */ - public static final String NORMAL = "0"; - - /** 异常状态 */ - public static final String EXCEPTION = "1"; - - /** 用户封禁状态 */ - public static final String USER_DISABLE = "1"; - - /** 角色封禁状态 */ - public static final String ROLE_DISABLE = "1"; - - /** 部门正常状态 */ - public static final String DEPT_NORMAL = "0"; - - /** 部门停用状态 */ - public static final String DEPT_DISABLE = "1"; - - /** 字典正常状态 */ - public static final String DICT_NORMAL = "0"; - - /** 是否为系统默认（是） */ - public static final String YES = "Y"; - - /** 是否菜单外链（是） */ - public static final String YES_FRAME = "0"; - - /** 是否菜单外链（否） */ - public static final String NO_FRAME = "1"; - - /** 菜单类型（目录） */ - public static final String TYPE_DIR = "M"; - - /** 菜单类型（菜单） */ - public static final String TYPE_MENU = "C"; - - /** 菜单类型（按钮） */ - public static final String TYPE_BUTTON = "F"; - - /** Layout组件标识 */ - public final static String LAYOUT = "Layout"; - - /** ParentView组件标识 */ - public final static String PARENT_VIEW = "ParentView"; - - /** InnerLink组件标识 */ - public final static String INNER_LINK = "InnerLink"; - - /** 校验返回结果码 */ - public final static String UNIQUE = "0"; - public final static String NOT_UNIQUE = "1"; -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java deleted file mode 100644 index c47fcaa..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.ruoyi.common.core.controller; - -import java.beans.PropertyEditorSupport; -import java.util.Date; -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; - -/** - * web层通用数据处理 - * - * @author ruoyi - */ -public class BaseController -{ - protected final Logger logger = LoggerFactory.getLogger(this.getClass()); - - /** - * 将前台传递过来的日期格式的字符串，自动转化为Date类型 - */ - @InitBinder - public void initBinder(WebDataBinder binder) - { - // Date 类型转换 - binder.registerCustomEditor(Date.class, new PropertyEditorSupport() - { - @Override - public void setAsText(String text) - { - setValue(DateUtils.parseDate(text)); - } - }); - } - - /** - * 设置请求分页数据 - */ - protected void startPage() - { - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) - { - String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); - PageHelper.startPage(pageNum, pageSize, orderBy); - } - } - - /** - * 设置请求排序数据 - */ - protected void startOrderBy() - { - PageDomain pageDomain = TableSupport.buildPageRequest(); - if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) - { - String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); - PageHelper.orderBy(orderBy); - } - } - - /** - * 响应请求分页数据 - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - protected TableDataInfo getDataTable(List list) - { - TableDataInfo rspData = new TableDataInfo(); - rspData.setCode(HttpStatus.SUCCESS); - rspData.setMsg("查询成功"); - rspData.setRows(list); - rspData.setTotal(new PageInfo(list).getTotal()); - return rspData; - } - - /** - * 响应返回结果 - * - * @param rows 影响行数 - * @return 操作结果 - */ - protected AjaxResult toAjax(int rows) - { - return rows > 0 ? AjaxResult.success() : AjaxResult.error(); - } - - /** - * 响应返回结果 - * - * @param result 结果 - * @return 操作结果 - */ - protected AjaxResult toAjax(boolean result) - { - return result ? success() : error(); - } - - /** - * 返回成功 - */ - public AjaxResult success() - { - return AjaxResult.success(); - } - - /** - * 返回失败消息 - */ - public AjaxResult error() - { - return AjaxResult.error(); - } - - /** - * 返回成功消息 - */ - public AjaxResult success(String message) - { - return AjaxResult.success(message); - } - - /** - * 返回失败消息 - */ - public AjaxResult error(String message) - { - return AjaxResult.error(message); - } - - /** - * 页面跳转 - */ - public String redirect(String url) - { - return StringUtils.format("redirect:{}", url); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java deleted file mode 100644 index 28e5a68..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.ruoyi.common.core.domain; - -import java.util.HashMap; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.StringUtils; - -/** - * 操作消息提醒 - * - * @author ruoyi - */ -public class AjaxResult extends HashMap -{ - private static final long serialVersionUID = 1L; - - /** 状态码 */ - public static final String CODE_TAG = "code"; - - /** 返回内容 */ - public static final String MSG_TAG = "msg"; - - /** 数据对象 */ - public static final String DATA_TAG = "data"; - - /** - * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。 - */ - public AjaxResult() - { - } - - /** - * 初始化一个新创建的 AjaxResult 对象 - * - * @param code 状态码 - * @param msg 返回内容 - */ - public AjaxResult(int code, String msg) - { - super.put(CODE_TAG, code); - super.put(MSG_TAG, msg); - } - - /** - * 初始化一个新创建的 AjaxResult 对象 - * - * @param code 状态码 - * @param msg 返回内容 - * @param data 数据对象 - */ - public AjaxResult(int code, String msg, Object data) - { - super.put(CODE_TAG, code); - super.put(MSG_TAG, msg); - if (StringUtils.isNotNull(data)) - { - super.put(DATA_TAG, data); - } - } - - /** - * 返回成功消息 - * - * @return 成功消息 - */ - public static AjaxResult success() - { - return AjaxResult.success("操作成功"); - } - - /** - * 返回成功数据 - * - * @return 成功消息 - */ - public static AjaxResult success(Object data) - { - return AjaxResult.success("操作成功", data); - } - - /** - * 返回成功消息 - * - * @param msg 返回内容 - * @return 成功消息 - */ - public static AjaxResult success(String msg) - { - return AjaxResult.success(msg, null); - } - - /** - * 返回成功消息 - * - * @param msg 返回内容 - * @param data 数据对象 - * @return 成功消息 - */ - public static AjaxResult success(String msg, Object data) - { - return new AjaxResult(HttpStatus.SUCCESS, msg, data); - } - - /** - * 返回错误消息 - * - * @return - */ - public static AjaxResult error() - { - return AjaxResult.error("操作失败"); - } - - /** - * 返回错误消息 - * - * @param msg 返回内容 - * @return 警告消息 - */ - public static AjaxResult error(String msg) - { - return AjaxResult.error(msg, null); - } - - /** - * 返回错误消息 - * - * @param msg 返回内容 - * @param data 数据对象 - * @return 警告消息 - */ - public static AjaxResult error(String msg, Object data) - { - return new AjaxResult(HttpStatus.ERROR, msg, data); - } - - /** - * 返回错误消息 - * - * @param code 状态码 - * @param msg 返回内容 - * @return 警告消息 - */ - public static AjaxResult error(int code, String msg) - { - return new AjaxResult(code, msg, null); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java deleted file mode 100644 index f7d5bf4..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.ruoyi.common.core.domain; - -import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import com.fasterxml.jackson.annotation.JsonFormat; - -/** - * Entity基类 - * - * @author ruoyi - */ -public class BaseEntity implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 搜索值 */ - private String searchValue; - - /** 创建者 */ - private String createBy; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** 更新者 */ - private String updateBy; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - /** 备注 */ - private String remark; - - /** 请求参数 */ - private Map params; - - public String getSearchValue() - { - return searchValue; - } - - public void setSearchValue(String searchValue) - { - this.searchValue = searchValue; - } - - public String getCreateBy() - { - return createBy; - } - - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - public Date getCreateTime() - { - return createTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public Date getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public Map getParams() - { - if (params == null) - { - params = new HashMap<>(); - } - return params; - } - - public void setParams(Map params) - { - this.params = params; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java deleted file mode 100644 index a180a18..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.ruoyi.common.core.domain; - -import java.util.ArrayList; -import java.util.List; - -/** - * Tree基类 - * - * @author ruoyi - */ -public class TreeEntity extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 父菜单名称 */ - private String parentName; - - /** 父菜单ID */ - private Long parentId; - - /** 显示顺序 */ - private Integer orderNum; - - /** 祖级列表 */ - private String ancestors; - - /** 子部门 */ - private List children = new ArrayList<>(); - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public Integer getOrderNum() - { - return orderNum; - } - - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java deleted file mode 100644 index bd835db..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.ruoyi.common.core.domain; - -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysMenu; - -/** - * Treeselect树结构实体类 - * - * @author ruoyi - */ -public class TreeSelect implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 节点ID */ - private Long id; - - /** 节点名称 */ - private String label; - - /** 子节点 */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; - - public TreeSelect() - { - - } - - public TreeSelect(SysDept dept) - { - this.id = dept.getDeptId(); - this.label = dept.getDeptName(); - this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); - } - - public TreeSelect(SysMenu menu) - { - this.id = menu.getMenuId(); - this.label = menu.getMenuName(); - this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); - } - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getLabel() - { - return label; - } - - public void setLabel(String label) - { - this.label = label; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java deleted file mode 100644 index 35108cc..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ /dev/null @@ -1,218 +0,0 @@ -package com.ruoyi.common.core.domain.entity; - -import java.util.ArrayList; -import java.util.List; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 部门表 sys_dept - * - * @author ruoyi - */ -public class SysDept extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 部门ID */ - private Long deptId; - - /** 父部门ID */ - private Long parentId; - - /** 祖级列表 */ - private String ancestors; - - /** 新增部门代码 */ - private String deptCode; - - - - /** 部门名称 */ - private String deptName; - - /** 显示顺序 */ - private String orderNum; - - /** 负责人 */ - private String leader; - - /** 联系电话 */ - private String phone; - - /** 邮箱 */ - private String email; - - /** 部门状态:0正常,1停用 */ - private String status; - - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - - /** 父部门名称 */ - private String parentName; - - /** 子部门 */ - private List children = new ArrayList(); - - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - - /** 新增部门代码 */ - @Size(min = 0, max = 50, message = "部门代码长度不能超过50个字符") - public String getDeptCode() { - return deptCode; - } - - public void setDeptCode(String deptCode) { - this.deptCode = deptCode; - } - - @NotBlank(message = "部门名称不能为空") - @Size(min = 0, max = 200, message = "部门名称长度不能超过200个字符") - public String getDeptName() - { - return deptName; - } - - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - @NotBlank(message = "显示顺序不能为空") - public String getOrderNum() - { - return orderNum; - } - - public void setOrderNum(String orderNum) - { - this.orderNum = orderNum; - } - - public String getLeader() - { - return leader; - } - - public void setLeader(String leader) - { - this.leader = leader; - } - - @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") - public String getPhone() - { - return phone; - } - - public void setPhone(String phone) - { - this.phone = phone; - } - - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("ancestors", getAncestors()) - .append("deptCode", getDeptCode()) - .append("deptName", getDeptName()) - .append("orderNum", getOrderNum()) - .append("leader", getLeader()) - .append("phone", getPhone()) - .append("email", getEmail()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java deleted file mode 100644 index 3f152b3..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.ruoyi.common.core.domain.entity; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 字典数据表 sys_dict_data - * - * @author ruoyi - */ -public class SysDictData extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 字典编码 */ - @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) - private Long dictCode; - - /** 字典排序 */ - @Excel(name = "字典排序", cellType = ColumnType.NUMERIC) - private Long dictSort; - - /** 字典标签 */ - @Excel(name = "字典标签") - private String dictLabel; - - /** 字典键值 */ - @Excel(name = "字典键值") - private String dictValue; - - /** 字典类型 */ - @Excel(name = "字典类型") - private String dictType; - - /** 样式属性（其他样式扩展） */ - private String cssClass; - - /** 表格字典样式 */ - private String listClass; - - /** 是否默认（Y是 N否） */ - @Excel(name = "是否默认", readConverterExp = "Y=是,N=否") - private String isDefault; - - /** 状态（0正常 1停用） */ - @Excel(name = "状态", readConverterExp = "0=正常,1=停用") - private String status; - - public Long getDictCode() - { - return dictCode; - } - - public void setDictCode(Long dictCode) - { - this.dictCode = dictCode; - } - - public Long getDictSort() - { - return dictSort; - } - - public void setDictSort(Long dictSort) - { - this.dictSort = dictSort; - } - - @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") - public String getDictLabel() - { - return dictLabel; - } - - public void setDictLabel(String dictLabel) - { - this.dictLabel = dictLabel; - } - - @NotBlank(message = "字典键值不能为空") - @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") - public String getDictValue() - { - return dictValue; - } - - public void setDictValue(String dictValue) - { - this.dictValue = dictValue; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") - public String getDictType() - { - return dictType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") - public String getCssClass() - { - return cssClass; - } - - public void setCssClass(String cssClass) - { - this.cssClass = cssClass; - } - - public String getListClass() - { - return listClass; - } - - public void setListClass(String listClass) - { - this.listClass = listClass; - } - - public boolean getDefault() - { - return UserConstants.YES.equals(this.isDefault) ? true : false; - } - - public String getIsDefault() - { - return isDefault; - } - - public void setIsDefault(String isDefault) - { - this.isDefault = isDefault; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictCode", getDictCode()) - .append("dictSort", getDictSort()) - .append("dictLabel", getDictLabel()) - .append("dictValue", getDictValue()) - .append("dictType", getDictType()) - .append("cssClass", getCssClass()) - .append("listClass", getListClass()) - .append("isDefault", getIsDefault()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java deleted file mode 100644 index d2c4249..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ruoyi.common.core.domain.entity; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 字典类型表 sys_dict_type - * - * @author ruoyi - */ -public class SysDictType extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 字典主键 */ - @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) - private Long dictId; - - /** 字典名称 */ - @Excel(name = "字典名称") - private String dictName; - - /** 字典类型 */ - @Excel(name = "字典类型") - private String dictType; - - /** 状态（0正常 1停用） */ - @Excel(name = "状态", readConverterExp = "0=正常,1=停用") - private String status; - - public Long getDictId() - { - return dictId; - } - - public void setDictId(Long dictId) - { - this.dictId = dictId; - } - - @NotBlank(message = "字典名称不能为空") - @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") - public String getDictName() - { - return dictName; - } - - public void setDictName(String dictName) - { - this.dictName = dictName; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") - public String getDictType() - { - return dictType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictId", getDictId()) - .append("dictName", getDictName()) - .append("dictType", getDictType()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java deleted file mode 100644 index 94d654a..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ /dev/null @@ -1,245 +0,0 @@ -package com.ruoyi.common.core.domain.entity; - -import java.util.ArrayList; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 菜单权限表 sys_menu - * - * @author ruoyi - */ -public class SysMenu extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 菜单ID */ - private Long menuId; - - /** 菜单名称 */ - private String menuName; - - /** 父菜单名称 */ - private String parentName; - - /** 父菜单ID */ - private Long parentId; - - /** 显示顺序 */ - private String orderNum; - - /** 路由地址 */ - private String path; - - /** 组件路径 */ - private String component; - - /** 是否为外链（0是 1否） */ - private String isFrame; - - /** 是否缓存（0缓存 1不缓存） */ - private String isCache; - - /** 类型（M目录 C菜单 F按钮） */ - private String menuType; - - /** 显示状态（0显示 1隐藏） */ - private String visible; - - /** 菜单状态（0显示 1隐藏） */ - private String status; - - /** 权限字符串 */ - private String perms; - - /** 菜单图标 */ - private String icon; - - /** 子菜单 */ - private List children = new ArrayList(); - - public Long getMenuId() - { - return menuId; - } - - public void setMenuId(Long menuId) - { - this.menuId = menuId; - } - - @NotBlank(message = "菜单名称不能为空") - @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") - public String getMenuName() - { - return menuName; - } - - public void setMenuName(String menuName) - { - this.menuName = menuName; - } - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - @NotBlank(message = "显示顺序不能为空") - public String getOrderNum() - { - return orderNum; - } - - public void setOrderNum(String orderNum) - { - this.orderNum = orderNum; - } - - @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") - public String getPath() - { - return path; - } - - public void setPath(String path) - { - this.path = path; - } - - @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") - public String getComponent() - { - return component; - } - - public void setComponent(String component) - { - this.component = component; - } - - public String getIsFrame() - { - return isFrame; - } - - public void setIsFrame(String isFrame) - { - this.isFrame = isFrame; - } - - public String getIsCache() - { - return isCache; - } - - public void setIsCache(String isCache) - { - this.isCache = isCache; - } - - @NotBlank(message = "菜单类型不能为空") - public String getMenuType() - { - return menuType; - } - - public void setMenuType(String menuType) - { - this.menuType = menuType; - } - - public String getVisible() - { - return visible; - } - - public void setVisible(String visible) - { - this.visible = visible; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") - public String getPerms() - { - return perms; - } - - public void setPerms(String perms) - { - this.perms = perms; - } - - public String getIcon() - { - return icon; - } - - public void setIcon(String icon) - { - this.icon = icon; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("menuId", getMenuId()) - .append("menuName", getMenuName()) - .append("parentId", getParentId()) - .append("orderNum", getOrderNum()) - .append("path", getPath()) - .append("component", getComponent()) - .append("isFrame", getIsFrame()) - .append("IsCache", getIsCache()) - .append("menuType", getMenuType()) - .append("visible", getVisible()) - .append("status ", getStatus()) - .append("perms", getPerms()) - .append("icon", getIcon()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java deleted file mode 100644 index 9d16acc..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.ruoyi.common.core.domain.entity; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 角色表 sys_role - * - * @author ruoyi - */ -public class SysRole extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 角色ID */ - @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) - private Long roleId; - - /** 角色名称 */ - @Excel(name = "角色名称") - private String roleName; - - /** 角色权限 */ - @Excel(name = "角色权限") - private String roleKey; - - /** 角色排序 */ - @Excel(name = "角色排序") - private String roleSort; - - /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */ - @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") - private String dataScope; - - /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */ - private boolean menuCheckStrictly; - - /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */ - private boolean deptCheckStrictly; - - /** 角色状态（0正常 1停用） */ - @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用") - private String status; - - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - - /** 用户是否存在此角色标识 默认不存在 */ - private boolean flag = false; - - /** 菜单组 */ - private Long[] menuIds; - - /** 部门组（数据权限） */ - private Long[] deptIds; - - public SysRole() - { - - } - - public SysRole(Long roleId) - { - this.roleId = roleId; - } - - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - public boolean isAdmin() - { - return isAdmin(this.roleId); - } - - public static boolean isAdmin(Long roleId) - { - return roleId != null && 1L == roleId; - } - - @NotBlank(message = "角色名称不能为空") - @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") - public String getRoleName() - { - return roleName; - } - - public void setRoleName(String roleName) - { - this.roleName = roleName; - } - - @NotBlank(message = "权限字符不能为空") - @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") - public String getRoleKey() - { - return roleKey; - } - - public void setRoleKey(String roleKey) - { - this.roleKey = roleKey; - } - - @NotBlank(message = "显示顺序不能为空") - public String getRoleSort() - { - return roleSort; - } - - public void setRoleSort(String roleSort) - { - this.roleSort = roleSort; - } - - public String getDataScope() - { - return dataScope; - } - - public void setDataScope(String dataScope) - { - this.dataScope = dataScope; - } - - public boolean isMenuCheckStrictly() - { - return menuCheckStrictly; - } - - public void setMenuCheckStrictly(boolean menuCheckStrictly) - { - this.menuCheckStrictly = menuCheckStrictly; - } - - public boolean isDeptCheckStrictly() - { - return deptCheckStrictly; - } - - public void setDeptCheckStrictly(boolean deptCheckStrictly) - { - this.deptCheckStrictly = deptCheckStrictly; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public boolean isFlag() - { - return flag; - } - - public void setFlag(boolean flag) - { - this.flag = flag; - } - - public Long[] getMenuIds() - { - return menuIds; - } - - public void setMenuIds(Long[] menuIds) - { - this.menuIds = menuIds; - } - - public Long[] getDeptIds() - { - return deptIds; - } - - public void setDeptIds(Long[] deptIds) - { - this.deptIds = deptIds; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("roleName", getRoleName()) - .append("roleKey", getRoleKey()) - .append("roleSort", getRoleSort()) - .append("dataScope", getDataScope()) - .append("menuCheckStrictly", isMenuCheckStrictly()) - .append("deptCheckStrictly", isDeptCheckStrictly()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java deleted file mode 100644 index 8f3771d..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ /dev/null @@ -1,436 +0,0 @@ -package com.ruoyi.common.core.domain.entity; - -import java.util.Date; -import java.util.List; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 用户对象 sys_user - * - * @author ruoyi - */ -public class SysUser extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 用户ID */ - @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") - private Long userId; - - /** 部门ID */ - @Excel(name = "部门编号", type = Type.IMPORT) - private Long deptId; - - /** 分公司ID */ - private Long countyCode; - - - /** 用户账号 */ - @Excel(name = "登录名称") - private String userName; - - private String userCode; - public String getUserCode() { - return userCode; - } - - public void setUserCode(String userCode) { - this.userCode = userCode; - } - - /** 用户昵称 */ - @Excel(name = "用户名称") - private String nickName; - - /** 用户邮箱 */ - @Excel(name = "用户邮箱") - private String email; - - /** 手机号码 */ - @Excel(name = "手机号码") - private String phonenumber; - - /** 用户性别 */ - @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") - private String sex; - - /** 用户头像 */ - private String avatar; - - /** 微信openid */ - private String wechatOpenid; - - /** 微信unionid */ - private String wechatUnionid; - - /** 微信昵称 */ - private String wechatNickname; - - /** 微信头像 */ - private String wechatAvatar; - - /** 是否绑定微信 */ - private String bindWechat; - - /** 密码 */ - private String password; - - /** 盐加密 */ - private String salt; - - /** 帐号状态（0正常 1停用） */ - @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") - private String status; - - /** 删除标志（0代表存在 2代表删除） */ - private String delFlag; - - /** 最后登录IP */ - @Excel(name = "最后登录IP", type = Type.EXPORT) - private String loginIp; - - /** 最后登录时间 */ - @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) - private Date loginDate; - - /** 部门对象 */ - @Excels({ - @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), - @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) - }) - private SysDept dept; - - /** 角色对象 */ - private List roles; - - /** 角色组 */ - private Long[] roleIds; - - /** 岗位组 */ - private Long[] postIds; - - /** 角色ID */ - private Long roleId; - - public SysUser() - { - - } - - public SysUser(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public boolean isAdmin() - { - return isAdmin(this.userId); - } - - public static boolean isAdmin(Long userId) - { - return userId != null && 1L == userId; - } - - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getCountyCode() { - return countyCode; - } - - public void setCountyCode(Long countyCode) { - this.countyCode = countyCode; - } - - @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") - public String getNickName() - { - return nickName; - } - - public void setNickName(String nickName) - { - this.nickName = nickName; - } - - @NotBlank(message = "用户账号不能为空") - @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") - public String getUserName() - { - return userName; - } - - public void setUserName(String userName) - { - this.userName = userName; - } - - @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") - public String getPhonenumber() - { - return phonenumber; - } - - public void setPhonenumber(String phonenumber) - { - this.phonenumber = phonenumber; - } - - public String getSex() - { - return sex; - } - - public void setSex(String sex) - { - this.sex = sex; - } - - public String getAvatar() - { - return avatar; - } - - public void setAvatar(String avatar) - { - this.avatar = avatar; - } - - public String getWechatOpenid() - { - return wechatOpenid; - } - - public void setWechatOpenid(String wechatOpenid) - { - this.wechatOpenid = wechatOpenid; - } - - public String getWechatUnionid() - { - return wechatUnionid; - } - - public void setWechatUnionid(String wechatUnionid) - { - this.wechatUnionid = wechatUnionid; - } - - public String getWechatNickname() - { - return wechatNickname; - } - - public void setWechatNickname(String wechatNickname) - { - this.wechatNickname = wechatNickname; - } - - public String getWechatAvatar() - { - return wechatAvatar; - } - - public void setWechatAvatar(String wechatAvatar) - { - this.wechatAvatar = wechatAvatar; - } - - public String getBindWechat() - { - return bindWechat; - } - - public void setBindWechat(String bindWechat) - { - this.bindWechat = bindWechat; - } - - @JsonIgnore - @JsonProperty - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getSalt() - { - return salt; - } - - public void setSalt(String salt) - { - this.salt = salt; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getLoginIp() - { - return loginIp; - } - - public void setLoginIp(String loginIp) - { - this.loginIp = loginIp; - } - - public Date getLoginDate() - { - return loginDate; - } - - public void setLoginDate(Date loginDate) - { - this.loginDate = loginDate; - } - - public SysDept getDept() - { - return dept; - } - - public void setDept(SysDept dept) - { - this.dept = dept; - } - - public List getRoles() - { - return roles; - } - - public void setRoles(List roles) - { - this.roles = roles; - } - - public Long[] getRoleIds() - { - return roleIds; - } - - public void setRoleIds(Long[] roleIds) - { - this.roleIds = roleIds; - } - - public Long[] getPostIds() - { - return postIds; - } - - public void setPostIds(Long[] postIds) - { - this.postIds = postIds; - } - - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("countyCode",getCountyCode()) - .append("userCode",getUserCode()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("wechatOpenid", getWechatOpenid()) - .append("wechatUnionid", getWechatUnionid()) - .append("wechatNickname", getWechatNickname()) - .append("wechatAvatar", getWechatAvatar()) - .append("bindWechat", getBindWechat()) - .append("password", getPassword()) - .append("salt", getSalt()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("postIds",getPostIds()) - .append("roleIds",getRoleIds()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/WechatLoginStatus.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/WechatLoginStatus.java deleted file mode 100644 index 743c4a2..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/WechatLoginStatus.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.ruoyi.common.core.domain.entity; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; - -/** - * 微信登录状态对象 - * - * @author ruoyi - * @date 2024-08-24 - */ -public class WechatLoginStatus -{ - /** 登录状态ID */ - private String id; - - /** 二维码URL */ - @Excel(name = "二维码URL") - private String qrCodeUrl; - - /** 登录状态(0-待扫码 1-已扫码 2-已确认 3-已过期) */ - @Excel(name = "登录状态", readConverterExp = "0=待扫码,1=已扫码,2=已确认,3=已过期") - private String status; - - /** 用户ID */ - @Excel(name = "用户ID") - private Long userId; - - /** 微信openid */ - @Excel(name = "微信openid") - private String openid; - - /** 过期时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date expireTime; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - public void setId(String id) - { - this.id = id; - } - - public String getId() - { - return id; - } - - public void setQrCodeUrl(String qrCodeUrl) - { - this.qrCodeUrl = qrCodeUrl; - } - - public String getQrCodeUrl() - { - return qrCodeUrl; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - - public void setOpenid(String openid) - { - this.openid = openid; - } - - public String getOpenid() - { - return openid; - } - - public void setExpireTime(Date expireTime) - { - this.expireTime = expireTime; - } - - public Date getExpireTime() - { - return expireTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public Date getCreateTime() - { - return createTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public Date getUpdateTime() - { - return updateTime; - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java deleted file mode 100644 index 03948b4..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.common.core.domain.model; - -/** - * 用户登录对象 - * - * @author ruoyi - */ -public class LoginBody -{ - /** - * 用户名 - */ - private String username; - - /** - * 用户密码 - */ - private String password; - - /** - * 验证码 - */ - private String code; - - /** - * 唯一标识 - */ - private String uuid = ""; - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getCode() - { - return code; - } - - public void setCode(String code) - { - this.code = code; - } - - public String getUuid() - { - return uuid; - } - - public void setUuid(String uuid) - { - this.uuid = uuid; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java deleted file mode 100644 index 6e3f1c6..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.ruoyi.common.core.domain.model; - -import java.util.Collection; -import java.util.Set; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.ruoyi.common.core.domain.entity.SysUser; - -/** - * 登录用户身份权限 - * - * @author ruoyi - */ -public class LoginUser implements UserDetails -{ - private static final long serialVersionUID = 1L; - - /** - * 用户唯一标识 - */ - private String token; - - /** - * 登录时间 - */ - private Long loginTime; - - /** - * 过期时间 - */ - private Long expireTime; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地点 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 权限列表 - */ - private Set permissions; - - /** - * 用户信息 - */ - private SysUser user; - - public String getToken() - { - return token; - } - - public void setToken(String token) - { - this.token = token; - } - - public LoginUser() - { - } - - public LoginUser(SysUser user, Set permissions) - { - this.user = user; - this.permissions = permissions; - } - - @JsonIgnore - @Override - public String getPassword() - { - return user.getPassword(); - } - - @Override - public String getUsername() - { - return user.getUserName(); - } - - /** - * 账户是否未过期,过期无法验证 - */ - @JsonIgnore - @Override - public boolean isAccountNonExpired() - { - return true; - } - - /** - * 指定用户是否解锁,锁定的用户无法进行身份验证 - * - * @return - */ - @JsonIgnore - @Override - public boolean isAccountNonLocked() - { - return true; - } - - /** - * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证 - * - * @return - */ - @JsonIgnore - @Override - public boolean isCredentialsNonExpired() - { - return true; - } - - /** - * 是否可用 ,禁用的用户不能身份验证 - * - * @return - */ - @JsonIgnore - @Override - public boolean isEnabled() - { - return true; - } - - public Long getLoginTime() - { - return loginTime; - } - - public void setLoginTime(Long loginTime) - { - this.loginTime = loginTime; - } - - public String getIpaddr() - { - return ipaddr; - } - - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getLoginLocation() - { - return loginLocation; - } - - public void setLoginLocation(String loginLocation) - { - this.loginLocation = loginLocation; - } - - public String getBrowser() - { - return browser; - } - - public void setBrowser(String browser) - { - this.browser = browser; - } - - public String getOs() - { - return os; - } - - public void setOs(String os) - { - this.os = os; - } - - public Long getExpireTime() - { - return expireTime; - } - - public void setExpireTime(Long expireTime) - { - this.expireTime = expireTime; - } - - public Set getPermissions() - { - return permissions; - } - - public void setPermissions(Set permissions) - { - this.permissions = permissions; - } - - public SysUser getUser() - { - return user; - } - - public void setUser(SysUser user) - { - this.user = user; - } - - @Override - public Collection getAuthorities() - { - return null; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java deleted file mode 100644 index b9d5e6e..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.ruoyi.common.core.page; - -import com.ruoyi.common.utils.StringUtils; - -/** - * 分页数据 - * - * @author ruoyi - */ -public class PageDomain -{ - /** 当前记录起始索引 */ - private Integer pageNum; - - /** 每页显示记录数 */ - private Integer pageSize; - - /** 排序列 */ - private String orderByColumn; - - /** 排序的方向desc或者asc */ - private String isAsc = "asc"; - - public String getOrderBy() - { - if (StringUtils.isEmpty(orderByColumn)) - { - return ""; - } - return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc; - } - - public Integer getPageNum() - { - return pageNum; - } - - public void setPageNum(Integer pageNum) - { - this.pageNum = pageNum; - } - - public Integer getPageSize() - { - return pageSize; - } - - public void setPageSize(Integer pageSize) - { - this.pageSize = pageSize; - } - - public String getOrderByColumn() - { - return orderByColumn; - } - - public void setOrderByColumn(String orderByColumn) - { - this.orderByColumn = orderByColumn; - } - - public String getIsAsc() - { - return isAsc; - } - - public void setIsAsc(String isAsc) - { - if (StringUtils.isNotEmpty(isAsc)) - { - // 兼容前端排序类型 - if ("ascending".equals(isAsc)) - { - isAsc = "asc"; - } - else if ("descending".equals(isAsc)) - { - isAsc = "desc"; - } - this.isAsc = isAsc; - } - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java deleted file mode 100644 index 847685b..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.ruoyi.common.core.page; - -import java.io.Serializable; -import java.util.List; - -/** - * 表格分页数据对象 - * - * @author ruoyi - */ -public class TableDataInfo implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 总记录数 */ - private long total; - - /** 列表数据 */ - private List rows; - - /** 消息状态码 */ - private int code; - - /** 消息内容 */ - private String msg; - - /** - * 表格数据对象 - */ - public TableDataInfo() - { - } - - /** - * 分页 - * - * @param list 列表数据 - * @param total 总记录数 - */ - public TableDataInfo(List list, int total) - { - this.rows = list; - this.total = total; - } - - public long getTotal() - { - return total; - } - - public void setTotal(long total) - { - this.total = total; - } - - public List getRows() - { - return rows; - } - - public void setRows(List rows) - { - this.rows = rows; - } - - public int getCode() - { - return code; - } - - public void setCode(int code) - { - this.code = code; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java deleted file mode 100644 index 14eb1e1..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ruoyi.common.core.page; - -import com.ruoyi.common.utils.ServletUtils; - -/** - * 表格数据处理 - * - * @author ruoyi - */ -public class TableSupport -{ - /** - * 当前记录起始索引 - */ - public static final String PAGE_NUM = "pageNum"; - - /** - * 每页显示记录数 - */ - public static final String PAGE_SIZE = "pageSize"; - - /** - * 排序列 - */ - public static final String ORDER_BY_COLUMN = "orderByColumn"; - - /** - * 排序的方向 "desc" 或者 "asc". - */ - public static final String IS_ASC = "isAsc"; - - /** - * 封装分页对象 - */ - public static PageDomain getPageDomain() - { - PageDomain pageDomain = new PageDomain(); - pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM)); - pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE)); - pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); - pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); - return pageDomain; - } - - public static PageDomain buildPageRequest() - { - return getPageDomain(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java deleted file mode 100644 index fd85611..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ /dev/null @@ -1,234 +0,0 @@ -package com.ruoyi.common.core.redis; - -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.BoundSetOperations; -import org.springframework.data.redis.core.HashOperations; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.stereotype.Component; - -/** - * spring redis 工具类 - * - * @author ruoyi - **/ -@SuppressWarnings(value = { "unchecked", "rawtypes" }) -@Component -public class RedisCache -{ - @Autowired - public RedisTemplate redisTemplate; - - /** - * 缓存基本的对象，Integer、String、实体类等 - * - * @param key 缓存的键值 - * @param value 缓存的值 - */ - public void setCacheObject(final String key, final T value) - { - redisTemplate.opsForValue().set(key, value); - } - - /** - * 缓存基本的对象，Integer、String、实体类等 - * - * @param key 缓存的键值 - * @param value 缓存的值 - * @param timeout 时间 - * @param timeUnit 时间颗粒度 - */ - public void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) - { - redisTemplate.opsForValue().set(key, value, timeout, timeUnit); - } - - /** - * 设置有效时间 - * - * @param key Redis键 - * @param timeout 超时时间 - * @return true=设置成功；false=设置失败 - */ - public boolean expire(final String key, final long timeout) - { - return expire(key, timeout, TimeUnit.SECONDS); - } - - /** - * 设置有效时间 - * - * @param key Redis键 - * @param timeout 超时时间 - * @param unit 时间单位 - * @return true=设置成功；false=设置失败 - */ - public boolean expire(final String key, final long timeout, final TimeUnit unit) - { - return redisTemplate.expire(key, timeout, unit); - } - - /** - * 获得缓存的基本对象。 - * - * @param key 缓存键值 - * @return 缓存键值对应的数据 - */ - public T getCacheObject(final String key) - { - ValueOperations operation = redisTemplate.opsForValue(); - return operation.get(key); - } - - /** - * 删除单个对象 - * - * @param key - */ - public boolean deleteObject(final String key) - { - return redisTemplate.delete(key); - } - - /** - * 删除集合对象 - * - * @param collection 多个对象 - * @return - */ - public long deleteObject(final Collection collection) - { - return redisTemplate.delete(collection); - } - - /** - * 缓存List数据 - * - * @param key 缓存的键值 - * @param dataList 待缓存的List数据 - * @return 缓存的对象 - */ - public long setCacheList(final String key, final List dataList) - { - Long count = redisTemplate.opsForList().rightPushAll(key, dataList); - return count == null ? 0 : count; - } - - /** - * 获得缓存的list对象 - * - * @param key 缓存的键值 - * @return 缓存键值对应的数据 - */ - public List getCacheList(final String key) - { - return redisTemplate.opsForList().range(key, 0, -1); - } - - /** - * 缓存Set - * - * @param key 缓存键值 - * @param dataSet 缓存的数据 - * @return 缓存数据的对象 - */ - public BoundSetOperations setCacheSet(final String key, final Set dataSet) - { - BoundSetOperations setOperation = redisTemplate.boundSetOps(key); - Iterator it = dataSet.iterator(); - while (it.hasNext()) - { - setOperation.add(it.next()); - } - return setOperation; - } - - /** - * 获得缓存的set - * - * @param key - * @return - */ - public Set getCacheSet(final String key) - { - return redisTemplate.opsForSet().members(key); - } - - /** - * 缓存Map - * - * @param key - * @param dataMap - */ - public void setCacheMap(final String key, final Map dataMap) - { - if (dataMap != null) { - redisTemplate.opsForHash().putAll(key, dataMap); - } - } - - /** - * 获得缓存的Map - * - * @param key - * @return - */ - public Map getCacheMap(final String key) - { - return redisTemplate.opsForHash().entries(key); - } - - /** - * 往Hash中存入数据 - * - * @param key Redis键 - * @param hKey Hash键 - * @param value 值 - */ - public void setCacheMapValue(final String key, final String hKey, final T value) - { - redisTemplate.opsForHash().put(key, hKey, value); - } - - /** - * 获取Hash中的数据 - * - * @param key Redis键 - * @param hKey Hash键 - * @return Hash中的对象 - */ - public T getCacheMapValue(final String key, final String hKey) - { - HashOperations opsForHash = redisTemplate.opsForHash(); - return opsForHash.get(key, hKey); - } - - /** - * 获取多个Hash中的数据 - * - * @param key Redis键 - * @param hKeys Hash键集合 - * @return Hash对象集合 - */ - public List getMultiCacheMapValue(final String key, final Collection hKeys) - { - return redisTemplate.opsForHash().multiGet(key, hKeys); - } - - /** - * 获得缓存的基本对象列表 - * - * @param pattern 字符串前缀 - * @return 对象列表 - */ - public Collection keys(final String pattern) - { - return redisTemplate.keys(pattern); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java deleted file mode 100644 index 84124aa..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.ruoyi.common.core.text; - -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; - -/** - * 字符集工具类 - * - * @author ruoyi - */ -public class CharsetKit -{ - /** ISO-8859-1 */ - public static final String ISO_8859_1 = "ISO-8859-1"; - /** UTF-8 */ - public static final String UTF_8 = "UTF-8"; - /** GBK */ - public static final String GBK = "GBK"; - - /** ISO-8859-1 */ - public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1); - /** UTF-8 */ - public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8); - /** GBK */ - public static final Charset CHARSET_GBK = Charset.forName(GBK); - - /** - * 转换为Charset对象 - * - * @param charset 字符集，为空则返回默认字符集 - * @return Charset - */ - public static Charset charset(String charset) - { - return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset); - } - - /** - * 转换字符串的字符集编码 - * - * @param source 字符串 - * @param srcCharset 源字符集，默认ISO-8859-1 - * @param destCharset 目标字符集，默认UTF-8 - * @return 转换后的字符集 - */ - public static String convert(String source, String srcCharset, String destCharset) - { - return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset)); - } - - /** - * 转换字符串的字符集编码 - * - * @param source 字符串 - * @param srcCharset 源字符集，默认ISO-8859-1 - * @param destCharset 目标字符集，默认UTF-8 - * @return 转换后的字符集 - */ - public static String convert(String source, Charset srcCharset, Charset destCharset) - { - if (null == srcCharset) - { - srcCharset = StandardCharsets.ISO_8859_1; - } - - if (null == destCharset) - { - destCharset = StandardCharsets.UTF_8; - } - - if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) - { - return source; - } - return new String(source.getBytes(srcCharset), destCharset); - } - - /** - * @return 系统字符集编码 - */ - public static String systemCharset() - { - return Charset.defaultCharset().name(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java deleted file mode 100644 index b2caca1..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java +++ /dev/null @@ -1,1005 +0,0 @@ -package com.ruoyi.common.core.text; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.text.NumberFormat; -import java.util.Set; -import com.ruoyi.common.utils.StringUtils; -import org.apache.commons.lang3.ArrayUtils; - -/** - * 类型转换器 - * - * @author ruoyi - */ -public class Convert -{ - /** - * 转换为字符串
- * 如果给定的值为null，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static String toStr(Object value, String defaultValue) - { - if (null == value) - { - return defaultValue; - } - if (value instanceof String) - { - return (String) value; - } - return value.toString(); - } - - /** - * 转换为字符串
- * 如果给定的值为null，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static String toStr(Object value) - { - return toStr(value, null); - } - - /** - * 转换为字符
- * 如果给定的值为null，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Character toChar(Object value, Character defaultValue) - { - if (null == value) - { - return defaultValue; - } - if (value instanceof Character) - { - return (Character) value; - } - - final String valueStr = toStr(value, null); - return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0); - } - - /** - * 转换为字符
- * 如果给定的值为null，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Character toChar(Object value) - { - return toChar(value, null); - } - - /** - * 转换为byte
- * 如果给定的值为null，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Byte toByte(Object value, Byte defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Byte) - { - return (Byte) value; - } - if (value instanceof Number) - { - return ((Number) value).byteValue(); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return Byte.parseByte(valueStr); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为byte
- * 如果给定的值为null，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Byte toByte(Object value) - { - return toByte(value, null); - } - - /** - * 转换为Short
- * 如果给定的值为null，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Short toShort(Object value, Short defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Short) - { - return (Short) value; - } - if (value instanceof Number) - { - return ((Number) value).shortValue(); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return Short.parseShort(valueStr.trim()); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为Short
- * 如果给定的值为null，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Short toShort(Object value) - { - return toShort(value, null); - } - - /** - * 转换为Number
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Number toNumber(Object value, Number defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Number) - { - return (Number) value; - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return NumberFormat.getInstance().parse(valueStr); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为Number
- * 如果给定的值为空，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Number toNumber(Object value) - { - return toNumber(value, null); - } - - /** - * 转换为int
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Integer toInt(Object value, Integer defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Integer) - { - return (Integer) value; - } - if (value instanceof Number) - { - return ((Number) value).intValue(); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return Integer.parseInt(valueStr.trim()); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为int
- * 如果给定的值为null，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Integer toInt(Object value) - { - return toInt(value, null); - } - - /** - * 转换为Integer数组
- * - * @param str 被转换的值 - * @return 结果 - */ - public static Integer[] toIntArray(String str) - { - return toIntArray(",", str); - } - - /** - * 转换为Long数组
- * - * @param str 被转换的值 - * @return 结果 - */ - public static Long[] toLongArray(String str) - { - return toLongArray(",", str); - } - - /** - * 转换为Integer数组
- * - * @param split 分隔符 - * @param split 被转换的值 - * @return 结果 - */ - public static Integer[] toIntArray(String split, String str) - { - if (StringUtils.isEmpty(str)) - { - return new Integer[] {}; - } - String[] arr = str.split(split); - final Integer[] ints = new Integer[arr.length]; - for (int i = 0; i < arr.length; i++) - { - final Integer v = toInt(arr[i], 0); - ints[i] = v; - } - return ints; - } - - /** - * 转换为Long数组
- * - * @param split 分隔符 - * @param str 被转换的值 - * @return 结果 - */ - public static Long[] toLongArray(String split, String str) - { - if (StringUtils.isEmpty(str)) - { - return new Long[] {}; - } - String[] arr = str.split(split); - final Long[] longs = new Long[arr.length]; - for (int i = 0; i < arr.length; i++) - { - final Long v = toLong(arr[i], null); - longs[i] = v; - } - return longs; - } - - /** - * 转换为String数组
- * - * @param str 被转换的值 - * @return 结果 - */ - public static String[] toStrArray(String str) - { - return toStrArray(",", str); - } - - /** - * 转换为String数组
- * - * @param split 分隔符 - * @param split 被转换的值 - * @return 结果 - */ - public static String[] toStrArray(String split, String str) - { - return str.split(split); - } - - /** - * 转换为long
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Long toLong(Object value, Long defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Long) - { - return (Long) value; - } - if (value instanceof Number) - { - return ((Number) value).longValue(); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - // 支持科学计数法 - return new BigDecimal(valueStr.trim()).longValue(); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为long
- * 如果给定的值为null，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Long toLong(Object value) - { - return toLong(value, null); - } - - /** - * 转换为double
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Double toDouble(Object value, Double defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Double) - { - return (Double) value; - } - if (value instanceof Number) - { - return ((Number) value).doubleValue(); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - // 支持科学计数法 - return new BigDecimal(valueStr.trim()).doubleValue(); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为double
- * 如果给定的值为空，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Double toDouble(Object value) - { - return toDouble(value, null); - } - - /** - * 转换为Float
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Float toFloat(Object value, Float defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Float) - { - return (Float) value; - } - if (value instanceof Number) - { - return ((Number) value).floatValue(); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return Float.parseFloat(valueStr.trim()); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为Float
- * 如果给定的值为空，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Float toFloat(Object value) - { - return toFloat(value, null); - } - - /** - * 转换为boolean
- * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static Boolean toBool(Object value, Boolean defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof Boolean) - { - return (Boolean) value; - } - String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - valueStr = valueStr.trim().toLowerCase(); - switch (valueStr) - { - case "true": - return true; - case "false": - return false; - case "yes": - return true; - case "ok": - return true; - case "no": - return false; - case "1": - return true; - case "0": - return false; - default: - return defaultValue; - } - } - - /** - * 转换为boolean
- * 如果给定的值为空，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static Boolean toBool(Object value) - { - return toBool(value, null); - } - - /** - * 转换为Enum对象
- * 如果给定的值为空，或者转换失败，返回默认值
- * - * @param clazz Enum的Class - * @param value 值 - * @param defaultValue 默认值 - * @return Enum - */ - public static > E toEnum(Class clazz, Object value, E defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (clazz.isAssignableFrom(value.getClass())) - { - @SuppressWarnings("unchecked") - E myE = (E) value; - return myE; - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return Enum.valueOf(clazz, valueStr); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为Enum对象
- * 如果给定的值为空，或者转换失败，返回默认值null
- * - * @param clazz Enum的Class - * @param value 值 - * @return Enum - */ - public static > E toEnum(Class clazz, Object value) - { - return toEnum(clazz, value, null); - } - - /** - * 转换为BigInteger
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static BigInteger toBigInteger(Object value, BigInteger defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof BigInteger) - { - return (BigInteger) value; - } - if (value instanceof Long) - { - return BigInteger.valueOf((Long) value); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return new BigInteger(valueStr); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为BigInteger
- * 如果给定的值为空，或者转换失败，返回默认值null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static BigInteger toBigInteger(Object value) - { - return toBigInteger(value, null); - } - - /** - * 转换为BigDecimal
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @param defaultValue 转换错误时的默认值 - * @return 结果 - */ - public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) - { - if (value == null) - { - return defaultValue; - } - if (value instanceof BigDecimal) - { - return (BigDecimal) value; - } - if (value instanceof Long) - { - return new BigDecimal((Long) value); - } - if (value instanceof Double) - { - return new BigDecimal((Double) value); - } - if (value instanceof Integer) - { - return new BigDecimal((Integer) value); - } - final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { - return defaultValue; - } - try - { - return new BigDecimal(valueStr); - } - catch (Exception e) - { - return defaultValue; - } - } - - /** - * 转换为BigDecimal
- * 如果给定的值为空，或者转换失败，返回默认值
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static BigDecimal toBigDecimal(Object value) - { - return toBigDecimal(value, null); - } - - /** - * 将对象转为字符串
- * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 - * - * @param obj 对象 - * @return 字符串 - */ - public static String utf8Str(Object obj) - { - return str(obj, CharsetKit.CHARSET_UTF_8); - } - - /** - * 将对象转为字符串
- * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 - * - * @param obj 对象 - * @param charsetName 字符集 - * @return 字符串 - */ - public static String str(Object obj, String charsetName) - { - return str(obj, Charset.forName(charsetName)); - } - - /** - * 将对象转为字符串
- * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 - * - * @param obj 对象 - * @param charset 字符集 - * @return 字符串 - */ - public static String str(Object obj, Charset charset) - { - if (null == obj) - { - return null; - } - - if (obj instanceof String) - { - return (String) obj; - } - else if (obj instanceof byte[]) - { - return str((byte[]) obj, charset); - } - else if (obj instanceof Byte[]) - { - byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj); - return str(bytes, charset); - } - else if (obj instanceof ByteBuffer) - { - return str((ByteBuffer) obj, charset); - } - return obj.toString(); - } - - /** - * 将byte数组转为字符串 - * - * @param bytes byte数组 - * @param charset 字符集 - * @return 字符串 - */ - public static String str(byte[] bytes, String charset) - { - return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset)); - } - - /** - * 解码字节码 - * - * @param data 字符串 - * @param charset 字符集，如果此字段为空，则解码的结果取决于平台 - * @return 解码后的字符串 - */ - public static String str(byte[] data, Charset charset) - { - if (data == null) - { - return null; - } - - if (null == charset) - { - return new String(data); - } - return new String(data, charset); - } - - /** - * 将编码的byteBuffer数据转换为字符串 - * - * @param data 数据 - * @param charset 字符集，如果为空使用当前系统字符集 - * @return 字符串 - */ - public static String str(ByteBuffer data, String charset) - { - if (data == null) - { - return null; - } - - return str(data, Charset.forName(charset)); - } - - /** - * 将编码的byteBuffer数据转换为字符串 - * - * @param data 数据 - * @param charset 字符集，如果为空使用当前系统字符集 - * @return 字符串 - */ - public static String str(ByteBuffer data, Charset charset) - { - if (null == charset) - { - charset = Charset.defaultCharset(); - } - return charset.decode(data).toString(); - } - - // ----------------------------------------------------------------------- 全角半角转换 - /** - * 半角转全角 - * - * @param input String. - * @return 全角字符串. - */ - public static String toSbc(String input) - { - return toSbc(input, null); - } - - /** - * 半角转全角 - * - * @param input String - * @param notConvertSet 不替换的字符集合 - * @return 全角字符串. - */ - public static String toSbc(String input, Set notConvertSet) - { - char c[] = input.toCharArray(); - for (int i = 0; i < c.length; i++) - { - if (null != notConvertSet && notConvertSet.contains(c[i])) - { - // 跳过不替换的字符 - continue; - } - - if (c[i] == ' ') - { - c[i] = '\u3000'; - } - else if (c[i] < '\177') - { - c[i] = (char) (c[i] + 65248); - - } - } - return new String(c); - } - - /** - * 全角转半角 - * - * @param input String. - * @return 半角字符串 - */ - public static String toDbc(String input) - { - return toDbc(input, null); - } - - /** - * 替换全角为半角 - * - * @param text 文本 - * @param notConvertSet 不替换的字符集合 - * @return 替换后的字符 - */ - public static String toDbc(String text, Set notConvertSet) - { - char c[] = text.toCharArray(); - for (int i = 0; i < c.length; i++) - { - if (null != notConvertSet && notConvertSet.contains(c[i])) - { - // 跳过不替换的字符 - continue; - } - - if (c[i] == '\u3000') - { - c[i] = ' '; - } - else if (c[i] > '\uFF00' && c[i] < '\uFF5F') - { - c[i] = (char) (c[i] - 65248); - } - } - String returnString = new String(c); - - return returnString; - } - - /** - * 数字金额大写转换 先写个完整的然后将如零拾替换成零 - * - * @param n 数字 - * @return 中文大写数字 - */ - public static String digitUppercase(double n) - { - String[] fraction = { "角", "分" }; - String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" }; - String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } }; - - String head = n < 0 ? "负" : ""; - n = Math.abs(n); - - String s = ""; - for (int i = 0; i < fraction.length; i++) - { - s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); - } - if (s.length() < 1) - { - s = "整"; - } - int integerPart = (int) Math.floor(n); - - for (int i = 0; i < unit[0].length && integerPart > 0; i++) - { - String p = ""; - for (int j = 0; j < unit[1].length && n > 0; j++) - { - p = digit[integerPart % 10] + unit[1][j] + p; - integerPart = integerPart / 10; - } - s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s; - } - return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java deleted file mode 100644 index c78ac77..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.ruoyi.common.core.text; - -import com.ruoyi.common.utils.StringUtils; - -/** - * 字符串格式化 - * - * @author ruoyi - */ -public class StrFormatter -{ - public static final String EMPTY_JSON = "{}"; - public static final char C_BACKSLASH = '\\'; - public static final char C_DELIM_START = '{'; - public static final char C_DELIM_END = '}'; - - /** - * 格式化字符串
- * 此方法只是简单将占位符 {} 按照顺序替换为参数
- * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
- * 例：
- * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
- * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
- * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- * - * @param strPattern 字符串模板 - * @param argArray 参数列表 - * @return 结果 - */ - public static String format(final String strPattern, final Object... argArray) - { - if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) - { - return strPattern; - } - final int strPatternLength = strPattern.length(); - - // 初始化定义好的长度以获得更好的性能 - StringBuilder sbuf = new StringBuilder(strPatternLength + 50); - - int handledPosition = 0; - int delimIndex;// 占位符所在位置 - for (int argIndex = 0; argIndex < argArray.length; argIndex++) - { - delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition); - if (delimIndex == -1) - { - if (handledPosition == 0) - { - return strPattern; - } - else - { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果 - sbuf.append(strPattern, handledPosition, strPatternLength); - return sbuf.toString(); - } - } - else - { - if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) - { - if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) - { - // 转义符之前还有一个转义符，占位符依旧有效 - sbuf.append(strPattern, handledPosition, delimIndex - 1); - sbuf.append(Convert.utf8Str(argArray[argIndex])); - handledPosition = delimIndex + 2; - } - else - { - // 占位符被转义 - argIndex--; - sbuf.append(strPattern, handledPosition, delimIndex - 1); - sbuf.append(C_DELIM_START); - handledPosition = delimIndex + 1; - } - } - else - { - // 正常占位符 - sbuf.append(strPattern, handledPosition, delimIndex); - sbuf.append(Convert.utf8Str(argArray[argIndex])); - handledPosition = delimIndex + 2; - } - } - } - // 加入最后一个占位符后所有的字符 - sbuf.append(strPattern, handledPosition, strPattern.length()); - - return sbuf.toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java deleted file mode 100644 index 10b7306..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ruoyi.common.enums; - -/** - * 操作状态 - * - * @author ruoyi - * - */ -public enum BusinessStatus -{ - /** - * 成功 - */ - SUCCESS, - - /** - * 失败 - */ - FAIL, -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java deleted file mode 100644 index 7e001e4..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.common.enums; - -/** - * 业务操作类型 - * - * @author ruoyi - */ -public enum BusinessType -{ - /** - * 其它 - */ - OTHER, - - /** - * 新增 - */ - INSERT, - - /** - * 修改 - */ - UPDATE, - - /** - * 删除 - */ - DELETE, - - /** - * 授权 - */ - GRANT, - - /** - * 导出 - */ - EXPORT, - - /** - * 导入 - */ - IMPORT, - - /** - * 强退 - */ - FORCE, - - /** - * 生成代码 - */ - GENCODE, - - /** - * 清空数据 - */ - CLEAN, - - /** - * 微信导入 - */ - WECHATIN -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java deleted file mode 100644 index 0d945be..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ruoyi.common.enums; - -/** - * 数据源 - * - * @author ruoyi - */ -public enum DataSourceType -{ - /** - * 主库 - */ - MASTER, - - /** - * 从库 - */ - SLAVE -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java deleted file mode 100644 index c8a2e25..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ruoyi.common.enums; - -import java.util.HashMap; -import java.util.Map; -import org.springframework.lang.Nullable; - -/** - * 请求方式 - * - * @author ruoyi - */ -public enum HttpMethod -{ - /** - * GET - */ - GET, - /** - * HEAD - */ - HEAD, - /** - * POST - */ - POST, - /** - * PUT - */ - PUT, - /** - * PATCH - */ - PATCH, - /** - * DELETE - */ - DELETE, - /** - * OPTIONS - */ - OPTIONS, - /** - * TRACE - */ - TRACE; - - private static final Map MAPPINGS = new HashMap<>(16); - - static - { - for (HttpMethod httpMethod : values()) - { - MAPPINGS.put(httpMethod.name(), httpMethod); - } - } - - @Nullable - public static HttpMethod resolve(@Nullable String method) - { - return (method != null ? MAPPINGS.get(method) : null); - } - - public boolean matches(String method) - { - return (this == resolve(method)); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java deleted file mode 100644 index bdd143c..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ruoyi.common.enums; - -/** - * 操作人类别 - * - * @author ruoyi - */ -public enum OperatorType -{ - /** - * 其它 - */ - OTHER, - - /** - * 后台用户 - */ - MANAGE, - - /** - * 手机端用户 - */ - MOBILE -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java deleted file mode 100644 index ced0d03..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ruoyi.common.enums; - -/** - * 用户状态 - * - * @author ruoyi - */ -public enum UserStatus -{ - /** - * 正常 - */ - OK("0", "正常"), - /** - * 停用 - */ - DISABLE("1", "停用"), - /** - * 删除 - */ - DELETED("2", "删除"); - - private final String code; - private final String info; - - UserStatus(String code, String info) - { - this.code = code; - this.info = info; - } - - public String getCode() - { - return code; - } - - public String getInfo() - { - return info; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java deleted file mode 100644 index 92d6ae2..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.common.exception; - -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; - -/** - * 基础异常 - * - * @author ruoyi - */ -public class BaseException extends RuntimeException -{ - private static final long serialVersionUID = 1L; - - /** - * 所属模块 - */ - private String module; - - /** - * 错误码 - */ - private String code; - - /** - * 错误码对应的参数 - */ - private Object[] args; - - /** - * 错误消息 - */ - private String defaultMessage; - - public BaseException(String module, String code, Object[] args, String defaultMessage) - { - this.module = module; - this.code = code; - this.args = args; - this.defaultMessage = defaultMessage; - } - - public BaseException(String module, String code, Object[] args) - { - this(module, code, args, null); - } - - public BaseException(String module, String defaultMessage) - { - this(module, null, null, defaultMessage); - } - - public BaseException(String code, Object[] args) - { - this(null, code, args, null); - } - - public BaseException(String defaultMessage) - { - this(null, null, null, defaultMessage); - } - - @Override - public String getMessage() - { - String message = null; - if (!StringUtils.isEmpty(code)) - { - message = MessageUtils.message(code, args); - } - if (message == null) - { - message = defaultMessage; - } - return message; - } - - public String getModule() - { - return module; - } - - public String getCode() - { - return code; - } - - public Object[] getArgs() - { - return args; - } - - public String getDefaultMessage() - { - return defaultMessage; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java deleted file mode 100644 index d96c7ba..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ruoyi.common.exception; - -/** - * 自定义异常 - * - * @author ruoyi - */ -public class CustomException extends RuntimeException -{ - private static final long serialVersionUID = 1L; - - private Integer code; - - private String message; - - public CustomException(String message) - { - this.message = message; - } - - public CustomException(String message, Integer code) - { - this.message = message; - this.code = code; - } - - public CustomException(String message, Throwable e) - { - super(message, e); - this.message = message; - } - - @Override - public String getMessage() - { - return message; - } - - public Integer getCode() - { - return code; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java deleted file mode 100644 index f6ad2ab..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.common.exception; - -/** - * 演示模式异常 - * - * @author ruoyi - */ -public class DemoModeException extends RuntimeException -{ - private static final long serialVersionUID = 1L; - - public DemoModeException() - { - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java deleted file mode 100644 index 980fa46..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ruoyi.common.exception; - -/** - * 工具类异常 - * - * @author ruoyi - */ -public class UtilException extends RuntimeException -{ - private static final long serialVersionUID = 8247610319171014183L; - - public UtilException(Throwable e) - { - super(e.getMessage(), e); - } - - public UtilException(String message) - { - super(message); - } - - public UtilException(String message, Throwable throwable) - { - super(message, throwable); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java deleted file mode 100644 index 75d6dbf..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ruoyi.common.exception.file; - -import com.ruoyi.common.exception.BaseException; - -/** - * 文件信息异常类 - * - * @author ruoyi - */ -public class FileException extends BaseException -{ - private static final long serialVersionUID = 1L; - - public FileException(String code, Object[] args) - { - super("file", code, args, null); - } - -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java deleted file mode 100644 index 70e0ec9..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.common.exception.file; - -/** - * 文件名称超长限制异常类 - * - * @author ruoyi - */ -public class FileNameLengthLimitExceededException extends FileException -{ - private static final long serialVersionUID = 1L; - - public FileNameLengthLimitExceededException(int defaultFileNameLength) - { - super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java deleted file mode 100644 index ec6ab05..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.common.exception.file; - -/** - * 文件名大小限制异常类 - * - * @author ruoyi - */ -public class FileSizeLimitExceededException extends FileException -{ - private static final long serialVersionUID = 1L; - - public FileSizeLimitExceededException(long defaultMaxSize) - { - super("upload.exceed.maxSize", new Object[] { defaultMaxSize }); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java deleted file mode 100644 index f1c8e83..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.ruoyi.common.exception.file; - -import java.util.Arrays; -import org.apache.commons.fileupload.FileUploadException; - -/** - * 文件上传 误异常类 - * - * @author ruoyi - */ -public class InvalidExtensionException extends FileUploadException -{ - private static final long serialVersionUID = 1L; - - private String[] allowedExtension; - private String extension; - private String filename; - - public InvalidExtensionException(String[] allowedExtension, String extension, String filename) - { - super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]"); - this.allowedExtension = allowedExtension; - this.extension = extension; - this.filename = filename; - } - - public String[] getAllowedExtension() - { - return allowedExtension; - } - - public String getExtension() - { - return extension; - } - - public String getFilename() - { - return filename; - } - - public static class InvalidImageExtensionException extends InvalidExtensionException - { - private static final long serialVersionUID = 1L; - - public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) - { - super(allowedExtension, extension, filename); - } - } - - public static class InvalidFlashExtensionException extends InvalidExtensionException - { - private static final long serialVersionUID = 1L; - - public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) - { - super(allowedExtension, extension, filename); - } - } - - public static class InvalidMediaExtensionException extends InvalidExtensionException - { - private static final long serialVersionUID = 1L; - - public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) - { - super(allowedExtension, extension, filename); - } - } - - public static class InvalidVideoExtensionException extends InvalidExtensionException - { - private static final long serialVersionUID = 1L; - - public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) - { - super(allowedExtension, extension, filename); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java deleted file mode 100644 index f07db7c..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.ruoyi.common.exception.job; - -/** - * 计划策略异常 - * - * @author ruoyi - */ -public class TaskException extends Exception -{ - private static final long serialVersionUID = 1L; - - private Code code; - - public TaskException(String msg, Code code) - { - this(msg, code, null); - } - - public TaskException(String msg, Code code, Exception nestedEx) - { - super(msg, nestedEx); - this.code = code; - } - - public Code getCode() - { - return code; - } - - public enum Code - { - /** - * 任务已存在 - */ - TASK_EXISTS, - /** - * 任务不存在 - */ - NO_TASK_EXISTS, - /** - * 任务已开始 - */ - TASK_ALREADY_STARTED, - /** - * 未知 - */ - UNKNOWN, - /** - * 配置错误 - */ - CONFIG_ERROR, - /** - * 节点不可用 - */ - TASK_NODE_NOT_AVAILABLE - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java deleted file mode 100644 index 389dbc7..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.common.exception.user; - -/** - * 验证码错误异常类 - * - * @author ruoyi - */ -public class CaptchaException extends UserException -{ - private static final long serialVersionUID = 1L; - - public CaptchaException() - { - super("user.jcaptcha.error", null); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java deleted file mode 100644 index 85f9486..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.common.exception.user; - -/** - * 验证码失效异常类 - * - * @author ruoyi - */ -public class CaptchaExpireException extends UserException -{ - private static final long serialVersionUID = 1L; - - public CaptchaExpireException() - { - super("user.jcaptcha.expire", null); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java deleted file mode 100644 index aa015f8..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.common.exception.user; - -import com.ruoyi.common.exception.BaseException; - -/** - * 用户信息异常类 - * - * @author ruoyi - */ -public class UserException extends BaseException -{ - private static final long serialVersionUID = 1L; - - public UserException(String code, Object[] args) - { - super("user", code, args, null); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java deleted file mode 100644 index a7f3e5f..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.common.exception.user; - -/** - * 用户密码不正确或不符合规范异常类 - * - * @author ruoyi - */ -public class UserPasswordNotMatchException extends UserException -{ - private static final long serialVersionUID = 1L; - - public UserPasswordNotMatchException() - { - super("user.password.not.match", null); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java deleted file mode 100644 index a1bcfe2..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ruoyi.common.filter; - -import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; - -/** - * Repeatable 过滤器 - * - * @author ruoyi - */ -public class RepeatableFilter implements Filter -{ - @Override - public void init(FilterConfig filterConfig) throws ServletException - { - - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException - { - ServletRequest requestWrapper = null; - if (request instanceof HttpServletRequest - && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) - { - requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); - } - if (null == requestWrapper) - { - chain.doFilter(request, response); - } - else - { - chain.doFilter(requestWrapper, response); - } - } - - @Override - public void destroy() - { - - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java deleted file mode 100644 index 614c24c..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.ruoyi.common.filter; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import com.ruoyi.common.utils.http.HttpHelper; - -/** - * 构建可重复读取inputStream的request - * - * @author ruoyi - */ -public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper -{ - private final byte[] body; - - public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException - { - super(request); - request.setCharacterEncoding("UTF-8"); - response.setCharacterEncoding("UTF-8"); - - body = HttpHelper.getBodyString(request).getBytes("UTF-8"); - } - - @Override - public BufferedReader getReader() throws IOException - { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - - @Override - public ServletInputStream getInputStream() throws IOException - { - final ByteArrayInputStream bais = new ByteArrayInputStream(body); - return new ServletInputStream() - { - @Override - public int read() throws IOException - { - return bais.read(); - } - - @Override - public int available() throws IOException - { - return body.length; - } - - @Override - public boolean isFinished() - { - return false; - } - - @Override - public boolean isReady() - { - return false; - } - - @Override - public void setReadListener(ReadListener readListener) - { - - } - }; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java deleted file mode 100644 index f77590b..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.common.filter; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.StringUtils; - -/** - * 防止XSS攻击的过滤器 - * - * @author ruoyi - */ -public class XssFilter implements Filter -{ - /** - * 排除链接 - */ - public List excludes = new ArrayList<>(); - - /** - * xss过滤开关 - */ - public boolean enabled = false; - - @Override - public void init(FilterConfig filterConfig) throws ServletException - { - String tempExcludes = filterConfig.getInitParameter("excludes"); - String tempEnabled = filterConfig.getInitParameter("enabled"); - if (StringUtils.isNotEmpty(tempExcludes)) - { - String[] url = tempExcludes.split(","); - for (int i = 0; url != null && i < url.length; i++) - { - excludes.add(url[i]); - } - } - if (StringUtils.isNotEmpty(tempEnabled)) - { - enabled = Boolean.valueOf(tempEnabled); - } - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException - { - HttpServletRequest req = (HttpServletRequest) request; - HttpServletResponse resp = (HttpServletResponse) response; - if (handleExcludeUrl(req, resp)) - { - chain.doFilter(request, response); - return; - } - XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper((HttpServletRequest) request); - chain.doFilter(xssRequest, response); - } - - private boolean handleExcludeUrl(HttpServletRequest request, HttpServletResponse response) - { - if (!enabled) - { - return true; - } - if (excludes == null || excludes.isEmpty()) - { - return false; - } - String url = request.getServletPath(); - for (String pattern : excludes) - { - Pattern p = Pattern.compile("^" + pattern); - Matcher m = p.matcher(url); - if (m.find()) - { - return true; - } - } - return false; - } - - @Override - public void destroy() - { - - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java deleted file mode 100644 index 4508c92..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.common.filter; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import org.apache.commons.io.IOUtils; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; - -/** - * XSS过滤处理 - * - * @author ruoyi - */ -public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper -{ - /** - * @param request - */ - public XssHttpServletRequestWrapper(HttpServletRequest request) - { - super(request); - } - - @Override - public String[] getParameterValues(String name) - { - String[] values = super.getParameterValues(name); - if (values != null) - { - int length = values.length; - String[] escapseValues = new String[length]; - for (int i = 0; i < length; i++) - { - // 防xss攻击和过滤前后空格 - escapseValues[i] = EscapeUtil.clean(values[i]).trim(); - } - return escapseValues; - } - return super.getParameterValues(name); - } - - @Override - public ServletInputStream getInputStream() throws IOException - { - // 非json类型，直接返回 - if (!isJsonRequest()) - { - return super.getInputStream(); - } - - // 为空，直接返回 - String json = IOUtils.toString(super.getInputStream(), "utf-8"); - if (StringUtils.isEmpty(json)) - { - return super.getInputStream(); - } - - // xss过滤 - json = EscapeUtil.clean(json).trim(); - final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8")); - return new ServletInputStream() - { - @Override - public boolean isFinished() - { - return true; - } - - @Override - public boolean isReady() - { - return true; - } - - @Override - public void setReadListener(ReadListener readListener) - { - } - - @Override - public int read() throws IOException - { - return bis.read(); - } - }; - } - - /** - * 是否是Json请求 - * - * @param request - */ - public boolean isJsonRequest() - { - String header = super.getHeader(HttpHeaders.CONTENT_TYPE); - return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java deleted file mode 100644 index b6326c2..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.ruoyi.common.utils; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -/** - * 精确的浮点数运算 - * - * @author ruoyi - */ -public class Arith -{ - - /** 默认除法运算精度 */ - private static final int DEF_DIV_SCALE = 10; - - /** 这个类不能实例化 */ - private Arith() - { - } - - /** - * 提供精确的加法运算。 - * @param v1 被加数 - * @param v2 加数 - * @return 两个参数的和 - */ - public static double add(double v1, double v2) - { - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); - return b1.add(b2).doubleValue(); - } - - /** - * 提供精确的减法运算。 - * @param v1 被减数 - * @param v2 减数 - * @return 两个参数的差 - */ - public static double sub(double v1, double v2) - { - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); - return b1.subtract(b2).doubleValue(); - } - - /** - * 提供精确的乘法运算。 - * @param v1 被乘数 - * @param v2 乘数 - * @return 两个参数的积 - */ - public static double mul(double v1, double v2) - { - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); - return b1.multiply(b2).doubleValue(); - } - - /** - * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到 - * 小数点以后10位，以后的数字四舍五入。 - * @param v1 被除数 - * @param v2 除数 - * @return 两个参数的商 - */ - public static double div(double v1, double v2) - { - return div(v1, v2, DEF_DIV_SCALE); - } - - /** - * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指 - * 定精度，以后的数字四舍五入。 - * @param v1 被除数 - * @param v2 除数 - * @param scale 表示表示需要精确到小数点以后几位。 - * @return 两个参数的商 - */ - public static double div(double v1, double v2, int scale) - { - if (scale < 0) - { - throw new IllegalArgumentException( - "The scale must be a positive integer or zero"); - } - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); - if (b1.compareTo(BigDecimal.ZERO) == 0) - { - return BigDecimal.ZERO.doubleValue(); - } - return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue(); - } - - /** - * 提供精确的小数位四舍五入处理。 - * @param v 需要四舍五入的数字 - * @param scale 小数点后保留几位 - * @return 四舍五入后的结果 - */ - public static double round(double v, int scale) - { - if (scale < 0) - { - throw new IllegalArgumentException( - "The scale must be a positive integer or zero"); - } - BigDecimal b = new BigDecimal(Double.toString(v)); - BigDecimal one = BigDecimal.ONE; - return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java deleted file mode 100644 index 536cb3c..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.ruoyi.common.utils; - -import java.lang.management.ManagementFactory; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import org.apache.commons.lang3.time.DateFormatUtils; - -/** - * 时间工具类 - * - * @author ruoyi - */ -public class DateUtils extends org.apache.commons.lang3.time.DateUtils -{ - public static String YYYY = "yyyy"; - - public static String YYYY_MM = "yyyy-MM"; - - public static String YYYY_MM_DD = "yyyy-MM-dd"; - - public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; - - public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - - private static String[] parsePatterns = { - "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", - "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", - "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; - - /** - * 获取当前Date型日期 - * - * @return Date() 当前日期 - */ - public static Date getNowDate() - { - return new Date(); - } - - /** - * 获取当前日期, 默认格式为yyyy-MM-dd - * - * @return String - */ - public static String getDate() - { - return dateTimeNow(YYYY_MM_DD); - } - - public static final String getTime() - { - return dateTimeNow(YYYY_MM_DD_HH_MM_SS); - } - - public static final String dateTimeNow() - { - return dateTimeNow(YYYYMMDDHHMMSS); - } - - public static final String dateTimeNow(final String format) - { - return parseDateToStr(format, new Date()); - } - - public static final String dateTime(final Date date) - { - return parseDateToStr(YYYY_MM_DD, date); - } - - public static final String parseDateToStr(final String format, final Date date) - { - return new SimpleDateFormat(format).format(date); - } - - public static final Date dateTime(final String format, final String ts) - { - try - { - return new SimpleDateFormat(format).parse(ts); - } - catch (ParseException e) - { - throw new RuntimeException(e); - } - } - - /** - * 日期路径 即年/月/日 如2018/08/08 - */ - public static final String datePath() - { - Date now = new Date(); - return DateFormatUtils.format(now, "yyyy/MM/dd"); - } - - /** - * 日期路径 即年/月/日 如20180808 - */ - public static final String dateTime() - { - Date now = new Date(); - return DateFormatUtils.format(now, "yyyyMMdd"); - } - - /** - * 日期型字符串转化为日期 格式 - */ - public static Date parseDate(Object str) - { - if (str == null) - { - return null; - } - try - { - return parseDate(str.toString(), parsePatterns); - } - catch (ParseException e) - { - return null; - } - } - - /** - * 获取服务器启动时间 - */ - public static Date getServerStartDate() - { - long time = ManagementFactory.getRuntimeMXBean().getStartTime(); - return new Date(time); - } - - /** - * 计算两个时间差 - */ - public static String getDatePoor(Date endDate, Date nowDate) - { - long nd = 1000 * 24 * 60 * 60; - long nh = 1000 * 60 * 60; - long nm = 1000 * 60; - // long ns = 1000; - // 获得两个时间的毫秒时间差异 - long diff = endDate.getTime() - nowDate.getTime(); - // 计算差多少天 - long day = diff / nd; - // 计算差多少小时 - long hour = diff % nd / nh; - // 计算差多少分钟 - long min = diff % nd % nh / nm; - // 计算差多少秒//输出结果 - // long sec = diff % nd % nh % nm / ns; - return day + "天" + hour + "小时" + min + "分钟"; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java deleted file mode 100644 index fd9946d..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.ruoyi.common.utils; - -import java.util.Collection; -import java.util.List; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.spring.SpringUtils; - -/** - * 字典工具类 - * - * @author ruoyi - */ -public class DictUtils -{ - /** - * 分隔符 - */ - public static final String SEPARATOR = ","; - - /** - * 设置字典缓存 - * - * @param key 参数键 - * @param dictDatas 字典数据列表 - */ - public static void setDictCache(String key, List dictDatas) - { - SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); - } - - /** - * 获取字典缓存 - * - * @param key 参数键 - * @return dictDatas 字典数据列表 - */ - public static List getDictCache(String key) - { - Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); - if (StringUtils.isNotNull(cacheObj)) - { - List dictDatas = StringUtils.cast(cacheObj); - return dictDatas; - } - return null; - } - - /** - * 根据字典类型和字典值获取字典标签 - * - * @param dictType 字典类型 - * @param dictValue 字典值 - * @return 字典标签 - */ - public static String getDictLabel(String dictType, String dictValue) - { - return getDictLabel(dictType, dictValue, SEPARATOR); - } - - /** - * 根据字典类型和字典标签获取字典值 - * - * @param dictType 字典类型 - * @param dictLabel 字典标签 - * @return 字典值 - */ - public static String getDictValue(String dictType, String dictLabel) - { - return getDictValue(dictType, dictLabel, SEPARATOR); - } - - /** - * 根据字典类型和字典值获取字典标签 - * - * @param dictType 字典类型 - * @param dictValue 字典值 - * @param separator 分隔符 - * @return 字典标签 - */ - public static String getDictLabel(String dictType, String dictValue, String separator) - { - StringBuilder propertyString = new StringBuilder(); - List datas = getDictCache(dictType); - - if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas)) - { - for (SysDictData dict : datas) - { - for (String value : dictValue.split(separator)) - { - if (value.equals(dict.getDictValue())) - { - propertyString.append(dict.getDictLabel() + separator); - break; - } - } - } - } - else - { - for (SysDictData dict : datas) - { - if (dictValue.equals(dict.getDictValue())) - { - return dict.getDictLabel(); - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 根据字典类型和字典标签获取字典值 - * - * @param dictType 字典类型 - * @param dictLabel 字典标签 - * @param separator 分隔符 - * @return 字典值 - */ - public static String getDictValue(String dictType, String dictLabel, String separator) - { - StringBuilder propertyString = new StringBuilder(); - List datas = getDictCache(dictType); - - if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) - { - for (SysDictData dict : datas) - { - for (String label : dictLabel.split(separator)) - { - if (label.equals(dict.getDictLabel())) - { - propertyString.append(dict.getDictValue() + separator); - break; - } - } - } - } - else - { - for (SysDictData dict : datas) - { - if (dictLabel.equals(dict.getDictLabel())) - { - return dict.getDictValue(); - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 删除指定字典缓存 - * - * @param key 字典键 - */ - public static void removeDictCache(String key) - { - SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key)); - } - - /** - * 清空字典缓存 - */ - public static void clearDictCache() - { - Collection keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*"); - SpringUtils.getBean(RedisCache.class).deleteObject(keys); - } - - /** - * 设置cache key - * - * @param configKey 参数键 - * @return 缓存键key - */ - public static String getCacheKey(String configKey) - { - return Constants.SYS_DICT_KEY + configKey; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java deleted file mode 100644 index ae81a69..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.common.utils; - -import java.io.PrintWriter; -import java.io.StringWriter; -import org.apache.commons.lang3.exception.ExceptionUtils; - -/** - * 错误信息处理类。 - * - * @author ruoyi - */ -public class ExceptionUtil -{ - /** - * 获取exception的详细错误信息。 - */ - public static String getExceptionMessage(Throwable e) - { - StringWriter sw = new StringWriter(); - e.printStackTrace(new PrintWriter(sw, true)); - String str = sw.toString(); - return str; - } - - public static String getRootErrorMessage(Exception e) - { - Throwable root = ExceptionUtils.getRootCause(e); - root = (root == null ? e : root); - if (root == null) - { - return ""; - } - String msg = root.getMessage(); - if (msg == null) - { - return "null"; - } - return StringUtils.defaultString(msg); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java deleted file mode 100644 index 0de30c6..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.common.utils; - -/** - * 处理并记录日志文件 - * - * @author ruoyi - */ -public class LogUtils -{ - public static String getBlock(Object msg) - { - if (msg == null) - { - msg = ""; - } - return "[" + msg.toString() + "]"; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java deleted file mode 100644 index 7dac75a..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ruoyi.common.utils; - -import org.springframework.context.MessageSource; -import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; - -/** - * 获取i18n资源文件 - * - * @author ruoyi - */ -public class MessageUtils -{ - /** - * 根据消息键和参数 获取消息 委托给spring messageSource - * - * @param code 消息键 - * @param args 参数 - * @return 获取国际化翻译值 - */ - public static String message(String code, Object... args) - { - MessageSource messageSource = SpringUtils.getBean(MessageSource.class); - return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java deleted file mode 100644 index aec5776..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ruoyi.common.utils; - -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.CustomException; - -/** - * 安全服务工具类 - * - * @author ruoyi - */ -public class SecurityUtils -{ - /** - * 获取用户账户 - **/ - public static String getUsername() - { - try - { - return getLoginUser().getUsername(); - } - catch (Exception e) - { - throw new CustomException("获取用户账户异常", HttpStatus.UNAUTHORIZED); - } - } - - /** - * 获取用户 - **/ - public static LoginUser getLoginUser() - { - try - { - return (LoginUser) getAuthentication().getPrincipal(); - } - catch (Exception e) - { - throw new CustomException("获取用户信息异常", HttpStatus.UNAUTHORIZED); - } - } - - /** - * 获取Authentication - */ - public static Authentication getAuthentication() - { - return SecurityContextHolder.getContext().getAuthentication(); - } - - /** - * 生成BCryptPasswordEncoder密码 - * - * @param password 密码 - * @return 加密字符串 - */ - public static String encryptPassword(String password) - { - BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); - return passwordEncoder.encode(password); - } - - /** - * 判断密码是否相同 - * - * @param rawPassword 真实密码 - * @param encodedPassword 加密后字符 - * @return 结果 - */ - public static boolean matchesPassword(String rawPassword, String encodedPassword) - { - BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); - return passwordEncoder.matches(rawPassword, encodedPassword); - } - - /** - * 是否为管理员 - * - * @param userId 用户ID - * @return 结果 - */ - public static boolean isAdmin(Long userId) - { - return userId != null && 1L == userId; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java deleted file mode 100644 index ab9ebcf..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.ruoyi.common.utils; - -import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import com.ruoyi.common.core.text.Convert; - -/** - * 客户端工具类 - * - * @author ruoyi - */ -public class ServletUtils -{ - /** - * 获取String参数 - */ - public static String getParameter(String name) - { - return getRequest().getParameter(name); - } - - /** - * 获取String参数 - */ - public static String getParameter(String name, String defaultValue) - { - return Convert.toStr(getRequest().getParameter(name), defaultValue); - } - - /** - * 获取Integer参数 - */ - public static Integer getParameterToInt(String name) - { - return Convert.toInt(getRequest().getParameter(name)); - } - - /** - * 获取Integer参数 - */ - public static Integer getParameterToInt(String name, Integer defaultValue) - { - return Convert.toInt(getRequest().getParameter(name), defaultValue); - } - - /** - * 获取request - */ - public static HttpServletRequest getRequest() - { - return getRequestAttributes().getRequest(); - } - - /** - * 获取response - */ - public static HttpServletResponse getResponse() - { - return getRequestAttributes().getResponse(); - } - - /** - * 获取session - */ - public static HttpSession getSession() - { - return getRequest().getSession(); - } - - public static ServletRequestAttributes getRequestAttributes() - { - RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); - return (ServletRequestAttributes) attributes; - } - - /** - * 将字符串渲染到客户端 - * - * @param response 渲染对象 - * @param string 待渲染的字符串 - * @return null - */ - public static String renderString(HttpServletResponse response, String string) - { - try - { - response.setStatus(200); - response.setContentType("application/json"); - response.setCharacterEncoding("utf-8"); - response.getWriter().print(string); - } - catch (IOException e) - { - e.printStackTrace(); - } - return null; - } - - /** - * 是否是Ajax异步请求 - * - * @param request - */ - public static boolean isAjaxRequest(HttpServletRequest request) - { - String accept = request.getHeader("accept"); - if (accept != null && accept.indexOf("application/json") != -1) - { - return true; - } - - String xRequestedWith = request.getHeader("X-Requested-With"); - if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) - { - return true; - } - - String uri = request.getRequestURI(); - if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) - { - return true; - } - - String ajax = request.getParameter("__ajax"); - if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")) - { - return true; - } - return false; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java deleted file mode 100644 index 235f837..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ /dev/null @@ -1,471 +0,0 @@ -package com.ruoyi.common.utils; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; - -/** - * 字符串工具类 - * - * @author ruoyi - */ -public class StringUtils extends org.apache.commons.lang3.StringUtils -{ - /** 空字符串 */ - private static final String NULLSTR = ""; - - /** 下划线 */ - private static final char SEPARATOR = '_'; - - /** - * 获取参数不为空值 - * - * @param value defaultValue 要判断的value - * @return value 返回值 - */ - public static T nvl(T value, T defaultValue) - { - return value != null ? value : defaultValue; - } - - /** - * * 判断一个Collection是否为空， 包含List，Set，Queue - * - * @param coll 要判断的Collection - * @return true：为空 false：非空 - */ - public static boolean isEmpty(Collection coll) - { - return isNull(coll) || coll.isEmpty(); - } - - /** - * * 判断一个Collection是否非空，包含List，Set，Queue - * - * @param coll 要判断的Collection - * @return true：非空 false：空 - */ - public static boolean isNotEmpty(Collection coll) - { - return !isEmpty(coll); - } - - /** - * * 判断一个对象数组是否为空 - * - * @param objects 要判断的对象数组 - ** @return true：为空 false：非空 - */ - public static boolean isEmpty(Object[] objects) - { - return isNull(objects) || (objects.length == 0); - } - - /** - * * 判断一个对象数组是否非空 - * - * @param objects 要判断的对象数组 - * @return true：非空 false：空 - */ - public static boolean isNotEmpty(Object[] objects) - { - return !isEmpty(objects); - } - - /** - * * 判断一个Map是否为空 - * - * @param map 要判断的Map - * @return true：为空 false：非空 - */ - public static boolean isEmpty(Map map) - { - return isNull(map) || map.isEmpty(); - } - - /** - * * 判断一个Map是否为空 - * - * @param map 要判断的Map - * @return true：非空 false：空 - */ - public static boolean isNotEmpty(Map map) - { - return !isEmpty(map); - } - - /** - * * 判断一个字符串是否为空串 - * - * @param str String - * @return true：为空 false：非空 - */ - public static boolean isEmpty(String str) - { - return isNull(str) || NULLSTR.equals(str.trim()); - } - - /** - * * 判断一个字符串是否为非空串 - * - * @param str String - * @return true：非空串 false：空串 - */ - public static boolean isNotEmpty(String str) - { - return !isEmpty(str); - } - - /** - * * 判断一个对象是否为空 - * - * @param object Object - * @return true：为空 false：非空 - */ - public static boolean isNull(Object object) - { - return object == null; - } - - /** - * * 判断一个对象是否非空 - * - * @param object Object - * @return true：非空 false：空 - */ - public static boolean isNotNull(Object object) - { - return !isNull(object); - } - - /** - * * 判断一个对象是否是数组类型（Java基本型别的数组） - * - * @param object 对象 - * @return true：是数组 false：不是数组 - */ - public static boolean isArray(Object object) - { - return isNotNull(object) && object.getClass().isArray(); - } - - /** - * 去空格 - */ - public static String trim(String str) - { - return (str == null ? "" : str.trim()); - } - - /** - * 截取字符串 - * - * @param str 字符串 - * @param start 开始 - * @return 结果 - */ - public static String substring(final String str, int start) - { - if (str == null) - { - return NULLSTR; - } - - if (start < 0) - { - start = str.length() + start; - } - - if (start < 0) - { - start = 0; - } - if (start > str.length()) - { - return NULLSTR; - } - - return str.substring(start); - } - - /** - * 截取字符串 - * - * @param str 字符串 - * @param start 开始 - * @param end 结束 - * @return 结果 - */ - public static String substring(final String str, int start, int end) - { - if (str == null) - { - return NULLSTR; - } - - if (end < 0) - { - end = str.length() + end; - } - if (start < 0) - { - start = str.length() + start; - } - - if (end > str.length()) - { - end = str.length(); - } - - if (start > end) - { - return NULLSTR; - } - - if (start < 0) - { - start = 0; - } - if (end < 0) - { - end = 0; - } - - return str.substring(start, end); - } - - /** - * 格式化文本, {} 表示占位符
- * 此方法只是简单将占位符 {} 按照顺序替换为参数
- * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
- * 例：
- * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
- * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
- * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- * - * @param template 文本模板，被替换的部分用 {} 表示 - * @param params 参数值 - * @return 格式化后的文本 - */ - public static String format(String template, Object... params) - { - if (isEmpty(params) || isEmpty(template)) - { - return template; - } - return StrFormatter.format(template, params); - } - - /** - * 是否为http(s)://开头 - * - * @param link 链接 - * @return 结果 - */ - public static boolean ishttp(String link) - { - return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS); - } - - /** - * 字符串转set - * - * @param str 字符串 - * @param sep 分隔符 - * @return set集合 - */ - public static final Set str2Set(String str, String sep) - { - return new HashSet(str2List(str, sep, true, false)); - } - - /** - * 字符串转list - * - * @param str 字符串 - * @param sep 分隔符 - * @param filterBlank 过滤纯空白 - * @param trim 去掉首尾空白 - * @return list集合 - */ - public static final List str2List(String str, String sep, boolean filterBlank, boolean trim) - { - List list = new ArrayList(); - if (StringUtils.isEmpty(str)) - { - return list; - } - - // 过滤空白字符串 - if (filterBlank && StringUtils.isBlank(str)) - { - return list; - } - String[] split = str.split(sep); - for (String string : split) - { - if (filterBlank && StringUtils.isBlank(string)) - { - continue; - } - if (trim) - { - string = string.trim(); - } - list.add(string); - } - - return list; - } - - /** - * 驼峰转下划线命名 - */ - public static String toUnderScoreCase(String str) - { - if (str == null) - { - return null; - } - StringBuilder sb = new StringBuilder(); - // 前置字符是否大写 - boolean preCharIsUpperCase = true; - // 当前字符是否大写 - boolean curreCharIsUpperCase = true; - // 下一字符是否大写 - boolean nexteCharIsUpperCase = true; - for (int i = 0; i < str.length(); i++) - { - char c = str.charAt(i); - if (i > 0) - { - preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1)); - } - else - { - preCharIsUpperCase = false; - } - - curreCharIsUpperCase = Character.isUpperCase(c); - - if (i < (str.length() - 1)) - { - nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1)); - } - - if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) - { - sb.append(SEPARATOR); - } - else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) - { - sb.append(SEPARATOR); - } - sb.append(Character.toLowerCase(c)); - } - - return sb.toString(); - } - - /** - * 是否包含字符串 - * - * @param str 验证字符串 - * @param strs 字符串组 - * @return 包含返回true - */ - public static boolean inStringIgnoreCase(String str, String... strs) - { - if (str != null && strs != null) - { - for (String s : strs) - { - if (str.equalsIgnoreCase(trim(s))) - { - return true; - } - } - } - return false; - } - - /** - * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld - * - * @param name 转换前的下划线大写方式命名的字符串 - * @return 转换后的驼峰式命名的字符串 - */ - public static String convertToCamelCase(String name) - { - StringBuilder result = new StringBuilder(); - // 快速检查 - if (name == null || name.isEmpty()) - { - // 没必要转换 - return ""; - } - else if (!name.contains("_")) - { - // 不含下划线，仅将首字母大写 - return name.substring(0, 1).toUpperCase() + name.substring(1); - } - // 用下划线将原始字符串分割 - String[] camels = name.split("_"); - for (String camel : camels) - { - // 跳过原始字符串中开头、结尾的下换线或双重下划线 - if (camel.isEmpty()) - { - continue; - } - // 首字母大写 - result.append(camel.substring(0, 1).toUpperCase()); - result.append(camel.substring(1).toLowerCase()); - } - return result.toString(); - } - - /** - * 驼峰式命名法 例如：user_name->userName - */ - public static String toCamelCase(String s) - { - if (s == null) - { - return null; - } - s = s.toLowerCase(); - StringBuilder sb = new StringBuilder(s.length()); - boolean upperCase = false; - for (int i = 0; i < s.length(); i++) - { - char c = s.charAt(i); - - if (c == SEPARATOR) - { - upperCase = true; - } - else if (upperCase) - { - sb.append(Character.toUpperCase(c)); - upperCase = false; - } - else - { - sb.append(c); - } - } - return sb.toString(); - } - - @SuppressWarnings("unchecked") - public static T cast(Object obj) - { - return (T) obj; - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java deleted file mode 100644 index 1934195..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.ruoyi.common.utils; - -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * 线程相关工具类. - * - * @author ruoyi - */ -public class Threads -{ - private static final Logger logger = LoggerFactory.getLogger(Threads.class); - - /** - * sleep等待,单位为毫秒 - */ - public static void sleep(long milliseconds) - { - try - { - Thread.sleep(milliseconds); - } - catch (InterruptedException e) - { - return; - } - } - - /** - * 停止线程池 - * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. - * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. - * 如果仍人超時，則強制退出. - * 另对在shutdown时线程本身被调用中断做了处理. - */ - public static void shutdownAndAwaitTermination(ExecutorService pool) - { - if (pool != null && !pool.isShutdown()) - { - pool.shutdown(); - try - { - if (!pool.awaitTermination(120, TimeUnit.SECONDS)) - { - pool.shutdownNow(); - if (!pool.awaitTermination(120, TimeUnit.SECONDS)) - { - logger.info("Pool did not terminate"); - } - } - } - catch (InterruptedException ie) - { - pool.shutdownNow(); - Thread.currentThread().interrupt(); - } - } - } - - /** - * 打印线程异常信息 - */ - public static void printException(Runnable r, Throwable t) - { - if (t == null && r instanceof Future) - { - try - { - Future future = (Future) r; - if (future.isDone()) - { - future.get(); - } - } - catch (CancellationException ce) - { - t = ce; - } - catch (ExecutionException ee) - { - t = ee.getCause(); - } - catch (InterruptedException ie) - { - Thread.currentThread().interrupt(); - } - } - if (t != null) - { - logger.error(t.getMessage(), t); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java deleted file mode 100644 index 5fdf3a9..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.ruoyi.common.utils; - -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.OutputStream; -import java.security.SecureRandom; -import java.util.Arrays; -import java.util.Random; -import javax.imageio.ImageIO; - -/** - * 验证码工具类 - * - * @author ruoyi - */ -public class VerifyCodeUtils -{ - // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符 - public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ"; - - private static Random random = new SecureRandom(); - - /** - * 使用系统默认字符源生成验证码 - * - * @param verifySize 验证码长度 - * @return - */ - public static String generateVerifyCode(int verifySize) - { - return generateVerifyCode(verifySize, VERIFY_CODES); - } - - /** - * 使用指定源生成验证码 - * - * @param verifySize 验证码长度 - * @param sources 验证码字符源 - * @return - */ - public static String generateVerifyCode(int verifySize, String sources) - { - if (sources == null || sources.length() == 0) - { - sources = VERIFY_CODES; - } - int codesLen = sources.length(); - Random rand = new Random(System.currentTimeMillis()); - StringBuilder verifyCode = new StringBuilder(verifySize); - for (int i = 0; i < verifySize; i++) - { - verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1))); - } - return verifyCode.toString(); - } - - /** - * 输出指定验证码图片流 - * - * @param w - * @param h - * @param os - * @param code - * @throws IOException - */ - public static void outputImage(int w, int h, OutputStream os, String code) throws IOException - { - int verifySize = code.length(); - BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); - Random rand = new Random(); - Graphics2D g2 = image.createGraphics(); - g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - Color[] colors = new Color[5]; - Color[] colorSpaces = new Color[] { Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA, - Color.ORANGE, Color.PINK, Color.YELLOW }; - float[] fractions = new float[colors.length]; - for (int i = 0; i < colors.length; i++) - { - colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)]; - fractions[i] = rand.nextFloat(); - } - Arrays.sort(fractions); - - g2.setColor(Color.GRAY);// 设置边框色 - g2.fillRect(0, 0, w, h); - - Color c = getRandColor(200, 250); - g2.setColor(c);// 设置背景色 - g2.fillRect(0, 2, w, h - 4); - - // 绘制干扰线 - Random random = new Random(); - g2.setColor(getRandColor(160, 200));// 设置线条的颜色 - for (int i = 0; i < 20; i++) - { - int x = random.nextInt(w - 1); - int y = random.nextInt(h - 1); - int xl = random.nextInt(6) + 1; - int yl = random.nextInt(12) + 1; - g2.drawLine(x, y, x + xl + 40, y + yl + 20); - } - - // 添加噪点 - float yawpRate = 0.05f;// 噪声率 - int area = (int) (yawpRate * w * h); - for (int i = 0; i < area; i++) - { - int x = random.nextInt(w); - int y = random.nextInt(h); - int rgb = getRandomIntColor(); - image.setRGB(x, y, rgb); - } - - shear(g2, w, h, c);// 使图片扭曲 - - g2.setColor(getRandColor(100, 160)); - int fontSize = h - 4; - Font font = new Font("Algerian", Font.ITALIC, fontSize); - g2.setFont(font); - char[] chars = code.toCharArray(); - for (int i = 0; i < verifySize; i++) - { - AffineTransform affine = new AffineTransform(); - affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1), - (w / verifySize) * i + fontSize / 2, h / 2); - g2.setTransform(affine); - g2.drawChars(chars, i, 1, ((w - 10) / verifySize) * i + 5, h / 2 + fontSize / 2 - 10); - } - - g2.dispose(); - ImageIO.write(image, "jpg", os); - } - - private static Color getRandColor(int fc, int bc) - { - if (fc > 255) { - fc = 255; - } - if (bc > 255) { - bc = 255; - } - int r = fc + random.nextInt(bc - fc); - int g = fc + random.nextInt(bc - fc); - int b = fc + random.nextInt(bc - fc); - return new Color(r, g, b); - } - - private static int getRandomIntColor() - { - int[] rgb = getRandomRgb(); - int color = 0; - for (int c : rgb) - { - color = color << 8; - color = color | c; - } - return color; - } - - private static int[] getRandomRgb() - { - int[] rgb = new int[3]; - for (int i = 0; i < 3; i++) - { - rgb[i] = random.nextInt(255); - } - return rgb; - } - - private static void shear(Graphics g, int w1, int h1, Color color) - { - shearX(g, w1, h1, color); - shearY(g, w1, h1, color); - } - - private static void shearX(Graphics g, int w1, int h1, Color color) - { - - int period = random.nextInt(2); - - boolean borderGap = true; - int frames = 1; - int phase = random.nextInt(2); - - for (int i = 0; i < h1; i++) - { - double d = (double) (period >> 1) - * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames); - g.copyArea(0, i, w1, 1, (int) d, 0); - if (borderGap) - { - g.setColor(color); - g.drawLine((int) d, i, 0, i); - g.drawLine((int) d + w1, i, w1, i); - } - } - - } - - private static void shearY(Graphics g, int w1, int h1, Color color) - { - - int period = random.nextInt(40) + 10; // 50; - - boolean borderGap = true; - int frames = 20; - int phase = 7; - for (int i = 0; i < w1; i++) - { - double d = (double) (period >> 1) - * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames); - g.copyArea(i, 0, 1, h1, 0, (int) d); - if (borderGap) - { - g.setColor(color); - g.drawLine(i, (int) d, i, 0); - g.drawLine(i, (int) d + h1, i, h1); - } - - } - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java deleted file mode 100644 index 4463662..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.ruoyi.common.utils.bean; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Bean 工具类 - * - * @author ruoyi - */ -public class BeanUtils extends org.springframework.beans.BeanUtils -{ - /** Bean方法名中属性名开始的下标 */ - private static final int BEAN_METHOD_PROP_INDEX = 3; - - /** * 匹配getter方法的正则表达式 */ - private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)"); - - /** * 匹配setter方法的正则表达式 */ - private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)"); - - /** - * Bean属性复制工具方法。 - * - * @param dest 目标对象 - * @param src 源对象 - */ - public static void copyBeanProp(Object dest, Object src) - { - try - { - copyProperties(src, dest); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - /** - * 获取对象的setter方法。 - * - * @param obj 对象 - * @return 对象的setter方法列表 - */ - public static List getSetterMethods(Object obj) - { - // setter方法列表 - List setterMethods = new ArrayList(); - - // 获取所有方法 - Method[] methods = obj.getClass().getMethods(); - - // 查找setter方法 - - for (Method method : methods) - { - Matcher m = SET_PATTERN.matcher(method.getName()); - if (m.matches() && (method.getParameterTypes().length == 1)) - { - setterMethods.add(method); - } - } - // 返回setter方法列表 - return setterMethods; - } - - /** - * 获取对象的getter方法。 - * - * @param obj 对象 - * @return 对象的getter方法列表 - */ - - public static List getGetterMethods(Object obj) - { - // getter方法列表 - List getterMethods = new ArrayList(); - // 获取所有方法 - Method[] methods = obj.getClass().getMethods(); - // 查找getter方法 - for (Method method : methods) - { - Matcher m = GET_PATTERN.matcher(method.getName()); - if (m.matches() && (method.getParameterTypes().length == 0)) - { - getterMethods.add(method); - } - } - // 返回getter方法列表 - return getterMethods; - } - - /** - * 检查Bean方法名中的属性名是否相等。
- * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。 - * - * @param m1 方法名1 - * @param m2 方法名2 - * @return 属性名一样返回true，否则返回false - */ - - public static boolean isMethodPropEquals(String m1, String m2) - { - return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java deleted file mode 100644 index 68130b9..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ruoyi.common.utils.file; - -import java.io.File; -import org.apache.commons.lang3.StringUtils; - -/** - * 文件类型工具类 - * - * @author ruoyi - */ -public class FileTypeUtils -{ - /** - * 获取文件类型 - *

- * 例如: ruoyi.txt, 返回: txt - * - * @param file 文件名 - * @return 后缀（不含".") - */ - public static String getFileType(File file) - { - if (null == file) - { - return StringUtils.EMPTY; - } - return getFileType(file.getName()); - } - - /** - * 获取文件类型 - *

- * 例如: ruoyi.txt, 返回: txt - * - * @param fileName 文件名 - * @return 后缀（不含".") - */ - public static String getFileType(String fileName) - { - int separatorIndex = fileName.lastIndexOf("."); - if (separatorIndex < 0) - { - return ""; - } - return fileName.substring(separatorIndex + 1).toLowerCase(); - } - - /** - * 获取文件类型 - * - * @param photoByte 文件字节码 - * @return 后缀（不含".") - */ - public static String getFileExtendName(byte[] photoByte) - { - String strFileExtendName = "JPG"; - if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) - && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) - { - strFileExtendName = "GIF"; - } - else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) - { - strFileExtendName = "JPG"; - } - else if ((photoByte[0] == 66) && (photoByte[1] == 77)) - { - strFileExtendName = "BMP"; - } - else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) - { - strFileExtendName = "PNG"; - } - return strFileExtendName; - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java deleted file mode 100644 index 844028a..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.ruoyi.common.utils.file; - -import java.io.File; -import java.io.IOException; -import org.apache.commons.io.FilenameUtils; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.exception.file.InvalidExtensionException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; - -/** - * 文件上传工具类 - * - * @author ruoyi - */ -public class FileUploadUtils -{ - /** - * 默认大小 50M - */ - public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; - - /** - * 默认的文件名最大长度 100 - */ - public static final int DEFAULT_FILE_NAME_LENGTH = 100; - - /** - * 默认上传的地址 - */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); - - public static void setDefaultBaseDir(String defaultBaseDir) - { - FileUploadUtils.defaultBaseDir = defaultBaseDir; - } - - public static String getDefaultBaseDir() - { - return defaultBaseDir; - } - - /** - * 以默认配置进行文件上传 - * - * @param file 上传的文件 - * @return 文件名称 - * @throws Exception - */ - public static final String upload(MultipartFile file) throws IOException - { - try - { - return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - } - catch (Exception e) - { - throw new IOException(e.getMessage(), e); - } - } - - /** - * 根据文件路径上传 - * - * @param baseDir 相对应用的基目录 - * @param file 上传的文件 - * @return 文件名称 - * @throws IOException - */ - public static final String upload(String baseDir, MultipartFile file) throws IOException - { - try - { - return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - } - catch (Exception e) - { - throw new IOException(e.getMessage(), e); - } - } - - /** - * 文件上传 - * - * @param baseDir 相对应用的基目录 - * @param file 上传的文件 - * @param allowedExtension 上传文件类型 - * @return 返回上传成功的文件名 - * @throws FileSizeLimitExceededException 如果超出最大大小 - * @throws FileNameLengthLimitExceededException 文件名太长 - * @throws IOException 比如读写文件出错时 - * @throws InvalidExtensionException 文件校验异常 - */ - public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, - InvalidExtensionException - { - int fileNamelength = file.getOriginalFilename().length(); - if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) - { - throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); - } - - assertAllowed(file, allowedExtension); - - String fileName = extractFilename(file); - - File desc = getAbsoluteFile(baseDir, fileName); - file.transferTo(desc); - String pathFileName = getPathFileName(baseDir, fileName); - return pathFileName; - } - - /** - * 编码文件名 - */ - public static final String extractFilename(MultipartFile file) - { - String fileName = file.getOriginalFilename(); - String extension = getExtension(file); - fileName = DateUtils.datePath() + "/" + IdUtils.fastUuid() + "." + extension; - return fileName; - } - - private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException - { - File desc = new File(uploadDir + File.separator + fileName); - - if (!desc.exists()) - { - if (!desc.getParentFile().exists()) - { - desc.getParentFile().mkdirs(); - } - } - return desc; - } - - private static final String getPathFileName(String uploadDir, String fileName) throws IOException - { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; - String currentDir = StringUtils.substring(uploadDir, dirLastIndex); - String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; - return pathFileName; - } - - /** - * 文件大小校验 - * - * @param file 上传的文件 - * @return - * @throws FileSizeLimitExceededException 如果超出最大大小 - * @throws InvalidExtensionException - */ - public static final void assertAllowed(MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, InvalidExtensionException - { - long size = file.getSize(); - if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE) - { - throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); - } - - String fileName = file.getOriginalFilename(); - String extension = getExtension(file); - if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) - { - if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) - { - throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) - { - throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) - { - throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) - { - throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, - fileName); - } - else - { - throw new InvalidExtensionException(allowedExtension, extension, fileName); - } - } - - } - - /** - * 判断MIME类型是否是允许的MIME类型 - * - * @param extension - * @param allowedExtension - * @return - */ - public static final boolean isAllowedExtension(String extension, String[] allowedExtension) - { - for (String str : allowedExtension) - { - if (str.equalsIgnoreCase(extension)) - { - return true; - } - } - return false; - } - - /** - * 获取文件名的后缀 - * - * @param file 表单文件 - * @return 后缀名 - */ - public static final String getExtension(MultipartFile file) - { - String extension = FilenameUtils.getExtension(file.getOriginalFilename()); - if (StringUtils.isEmpty(extension)) - { - extension = MimeTypeUtils.getExtension(file.getContentType()); - } - return extension; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java deleted file mode 100644 index bd8d3cd..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.ruoyi.common.utils.file; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.utils.StringUtils; - -/** - * 文件处理工具类 - * - * @author ruoyi - */ -public class FileUtils -{ - public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; - - /** - * 输出指定文件的byte数组 - * - * @param filePath 文件路径 - * @param os 输出流 - * @return - */ - public static void writeBytes(String filePath, OutputStream os) throws IOException - { - FileInputStream fis = null; - try - { - File file = new File(filePath); - if (!file.exists()) - { - throw new FileNotFoundException(filePath); - } - fis = new FileInputStream(file); - byte[] b = new byte[1024]; - int length; - while ((length = fis.read(b)) > 0) - { - os.write(b, 0, length); - } - } - catch (IOException e) - { - throw e; - } - finally - { - if (os != null) - { - try - { - os.close(); - } - catch (IOException e1) - { - e1.printStackTrace(); - } - } - if (fis != null) - { - try - { - fis.close(); - } - catch (IOException e1) - { - e1.printStackTrace(); - } - } - } - } - - /** - * 删除文件 - * - * @param filePath 文件 - * @return - */ - public static boolean deleteFile(String filePath) - { - boolean flag = false; - File file = new File(filePath); - // 路径为文件且不为空则进行删除 - if (file.isFile() && file.exists()) - { - file.delete(); - flag = true; - } - return flag; - } - - /** - * 文件名称验证 - * - * @param filename 文件名称 - * @return true 正常 false 非法 - */ - public static boolean isValidFilename(String filename) - { - return filename.matches(FILENAME_PATTERN); - } - - /** - * 检查文件是否可下载 - * - * @param resource 需要下载的文件 - * @return true 正常 false 非法 - */ - public static boolean checkAllowDownload(String resource) - { - // 禁止目录上跳级别 - if (StringUtils.contains(resource, "..")) - { - return false; - } - - // 检查允许下载的文件规则 - if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) - { - return true; - } - - // 不在允许下载的文件规则 - return false; - } - - /** - * 下载文件名重新编码 - * - * @param request 请求对象 - * @param fileName 文件名 - * @return 编码后的文件名 - */ - public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException - { - final String agent = request.getHeader("USER-AGENT"); - String filename = fileName; - if (agent.contains("MSIE")) - { - // IE浏览器 - filename = URLEncoder.encode(filename, "utf-8"); - filename = filename.replace("+", " "); - } - else if (agent.contains("Firefox")) - { - // 火狐浏览器 - filename = new String(fileName.getBytes(), "ISO8859-1"); - } - else if (agent.contains("Chrome")) - { - // google浏览器 - filename = URLEncoder.encode(filename, "utf-8"); - } - else - { - // 其它浏览器 - filename = URLEncoder.encode(filename, "utf-8"); - } - return filename; - } - - /** - * 下载文件名重新编码 - * - * @param response 响应对象 - * @param realFileName 真实文件名 - * @return - */ - public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException - { - String percentEncodedFileName = percentEncode(realFileName); - - StringBuilder contentDispositionValue = new StringBuilder(); - contentDispositionValue.append("attachment; filename=") - .append(percentEncodedFileName) - .append(";") - .append("filename*=") - .append("utf-8''") - .append(percentEncodedFileName); - - response.setHeader("Content-disposition", contentDispositionValue.toString()); - } - - /** - * 百分号编码工具方法 - * - * @param s 需要百分号编码的字符串 - * @return 百分号编码后的字符串 - */ - public static String percentEncode(String s) throws UnsupportedEncodingException - { - String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); - return encode.replaceAll("\\+", "%20"); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java deleted file mode 100644 index 0b7b5aa..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.ruoyi.common.utils.file; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.Arrays; -import org.apache.poi.util.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; - -/** - * 图片处理工具类 - * - * @author ruoyi - */ -public class ImageUtils -{ - private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); - - public static byte[] getImage(String imagePath) - { - InputStream is = getFile(imagePath); - try - { - return IOUtils.toByteArray(is); - } - catch (Exception e) - { - log.error("图片加载异常 {}", e); - return null; - } - finally - { - IOUtils.closeQuietly(is); - } - } - - public static InputStream getFile(String imagePath) - { - try - { - byte[] result = readFile(imagePath); - result = Arrays.copyOf(result, result.length); - return new ByteArrayInputStream(result); - } - catch (Exception e) - { - log.error("获取图片异常 {}", e); - } - return null; - } - - /** - * 读取文件为字节数据 - * - * @param key 地址 - * @return 字节数据 - */ - public static byte[] readFile(String url) - { - InputStream in = null; - ByteArrayOutputStream baos = null; - try - { - if (url.startsWith("http")) - { - // 网络地址 - URL urlObj = new URL(url); - URLConnection urlConnection = urlObj.openConnection(); - urlConnection.setConnectTimeout(30 * 1000); - urlConnection.setReadTimeout(60 * 1000); - urlConnection.setDoInput(true); - in = urlConnection.getInputStream(); - } - else - { - // 本机地址 - String localPath = RuoYiConfig.getProfile(); - String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); - in = new FileInputStream(downloadPath); - } - return IOUtils.toByteArray(in); - } - catch (Exception e) - { - log.error("获取文件路径异常 {}", e); - return null; - } - finally - { - IOUtils.closeQuietly(in); - IOUtils.closeQuietly(baos); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java deleted file mode 100644 index f968f1a..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.ruoyi.common.utils.file; - -/** - * 媒体类型工具类 - * - * @author ruoyi - */ -public class MimeTypeUtils -{ - public static final String IMAGE_PNG = "image/png"; - - public static final String IMAGE_JPG = "image/jpg"; - - public static final String IMAGE_JPEG = "image/jpeg"; - - public static final String IMAGE_BMP = "image/bmp"; - - public static final String IMAGE_GIF = "image/gif"; - - public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" }; - - public static final String[] FLASH_EXTENSION = { "swf", "flv" }; - - public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", - "asf", "rm", "rmvb" }; - - public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" }; - - public static final String[] DEFAULT_ALLOWED_EXTENSION = { - // 图片 - "bmp", "gif", "jpg", "jpeg", "png", - // word excel powerpoint - "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", - // 压缩文件 - "rar", "zip", "gz", "bz2", - // 视频格式 - "mp4", "avi", "rmvb", - // pdf - "pdf" }; - - public static String getExtension(String prefix) - { - switch (prefix) - { - case IMAGE_PNG: - return "png"; - case IMAGE_JPG: - return "jpg"; - case IMAGE_JPEG: - return "jpeg"; - case IMAGE_BMP: - return "bmp"; - case IMAGE_GIF: - return "gif"; - default: - return ""; - } - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java deleted file mode 100644 index 7f74ac2..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.ruoyi.common.utils.html; - -import com.ruoyi.common.utils.StringUtils; - -/** - * 转义和反转义工具类 - * - * @author ruoyi - */ -public class EscapeUtil -{ - public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)"; - - private static final char[][] TEXT = new char[64][]; - - static - { - for (int i = 0; i < 64; i++) - { - TEXT[i] = new char[] { (char) i }; - } - - // special HTML characters - TEXT['\''] = "'".toCharArray(); // 单引号 - TEXT['"'] = """.toCharArray(); // 双引号 - TEXT['&'] = "&".toCharArray(); // &符 - TEXT['<'] = "<".toCharArray(); // 小于号 - TEXT['>'] = ">".toCharArray(); // 大于号 - } - - /** - * 转义文本中的HTML字符为安全的字符 - * - * @param text 被转义的文本 - * @return 转义后的文本 - */ - public static String escape(String text) - { - return encode(text); - } - - /** - * 还原被转义的HTML特殊字符 - * - * @param content 包含转义符的HTML内容 - * @return 转换后的字符串 - */ - public static String unescape(String content) - { - return decode(content); - } - - /** - * 清除所有HTML标签，但是不删除标签内的内容 - * - * @param content 文本 - * @return 清除标签后的文本 - */ - public static String clean(String content) - { - return new HTMLFilter().filter(content); - } - - /** - * Escape编码 - * - * @param text 被编码的文本 - * @return 编码后的字符 - */ - private static String encode(String text) - { - int len; - if ((text == null) || ((len = text.length()) == 0)) - { - return StringUtils.EMPTY; - } - StringBuilder buffer = new StringBuilder(len + (len >> 2)); - char c; - for (int i = 0; i < len; i++) - { - c = text.charAt(i); - if (c < 64) - { - buffer.append(TEXT[c]); - } - else - { - buffer.append(c); - } - } - return buffer.toString(); - } - - /** - * Escape解码 - * - * @param content 被转义的内容 - * @return 解码后的字符串 - */ - public static String decode(String content) - { - if (StringUtils.isEmpty(content)) - { - return content; - } - - StringBuilder tmp = new StringBuilder(content.length()); - int lastPos = 0, pos = 0; - char ch; - while (lastPos < content.length()) - { - pos = content.indexOf("%", lastPos); - if (pos == lastPos) - { - if (content.charAt(pos + 1) == 'u') - { - ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16); - tmp.append(ch); - lastPos = pos + 6; - } - else - { - ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16); - tmp.append(ch); - lastPos = pos + 3; - } - } - else - { - if (pos == -1) - { - tmp.append(content.substring(lastPos)); - lastPos = content.length(); - } - else - { - tmp.append(content.substring(lastPos, pos)); - lastPos = pos; - } - } - } - return tmp.toString(); - } - - public static void main(String[] args) - { - String html = ""; - // String html = "ipt>alert(\"XSS\")ipt>"; - // String html = "<123"; - // String html = "123>"; - System.out.println(EscapeUtil.clean(html)); - System.out.println(EscapeUtil.escape(html)); - System.out.println(EscapeUtil.unescape(html)); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java deleted file mode 100644 index b013417..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ /dev/null @@ -1,570 +0,0 @@ -package com.ruoyi.common.utils.html; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * HTML过滤器，用于去除XSS漏洞隐患。 - * - * @author ruoyi - */ -public final class HTMLFilter -{ - /** - * regex flag union representing /si modifiers in php - **/ - private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL; - private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL); - private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI); - private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL); - private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI); - private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI); - private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI); - private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI); - private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI); - private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?"); - private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?"); - private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?"); - private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))"); - private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL); - private static final Pattern P_END_ARROW = Pattern.compile("^>"); - private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)"); - private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)"); - private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)"); - private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)"); - private static final Pattern P_AMP = Pattern.compile("&"); - private static final Pattern P_QUOTE = Pattern.compile("\""); - private static final Pattern P_LEFT_ARROW = Pattern.compile("<"); - private static final Pattern P_RIGHT_ARROW = Pattern.compile(">"); - private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>"); - - // @xxx could grow large... maybe use sesat's ReferenceMap - private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>(); - private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>(); - - /** - * set of allowed html elements, along with allowed attributes for each element - **/ - private final Map> vAllowed; - /** - * counts of open tags for each (allowable) html element - **/ - private final Map vTagCounts = new HashMap<>(); - - /** - * html elements which must always be self-closing (e.g. "") - **/ - private final String[] vSelfClosingTags; - /** - * html elements which must always have separate opening and closing tags (e.g. "") - **/ - private final String[] vNeedClosingTags; - /** - * set of disallowed html elements - **/ - private final String[] vDisallowed; - /** - * attributes which should be checked for valid protocols - **/ - private final String[] vProtocolAtts; - /** - * allowed protocols - **/ - private final String[] vAllowedProtocols; - /** - * tags which should be removed if they contain no content (e.g. "" or "") - **/ - private final String[] vRemoveBlanks; - /** - * entities allowed within html markup - **/ - private final String[] vAllowedEntities; - /** - * flag determining whether comments are allowed in input String. - */ - private final boolean stripComment; - private final boolean encodeQuotes; - /** - * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "" - * becomes " text "). If set to false, unbalanced angle brackets will be html escaped. - */ - private final boolean alwaysMakeTags; - - /** - * Default constructor. - */ - public HTMLFilter() - { - vAllowed = new HashMap<>(); - - final ArrayList aAtts = new ArrayList<>(); - aAtts.add("href"); - aAtts.add("target"); - vAllowed.put("a", aAtts); - - final ArrayList imgAtts = new ArrayList<>(); - imgAtts.add("src"); - imgAtts.add("width"); - imgAtts.add("height"); - imgAtts.add("alt"); - vAllowed.put("img", imgAtts); - - final ArrayList noAtts = new ArrayList<>(); - vAllowed.put("b", noAtts); - vAllowed.put("strong", noAtts); - vAllowed.put("i", noAtts); - vAllowed.put("em", noAtts); - - vSelfClosingTags = new String[] { "img" }; - vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" }; - vDisallowed = new String[] {}; - vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp. - vProtocolAtts = new String[] { "src", "href" }; - vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" }; - vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" }; - stripComment = true; - encodeQuotes = true; - alwaysMakeTags = false; - } - - /** - * Map-parameter configurable constructor. - * - * @param conf map containing configuration. keys match field names. - */ - @SuppressWarnings("unchecked") - public HTMLFilter(final Map conf) - { - - assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; - assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; - assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags"; - assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed"; - assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols"; - assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts"; - assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks"; - assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities"; - - vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed")); - vSelfClosingTags = (String[]) conf.get("vSelfClosingTags"); - vNeedClosingTags = (String[]) conf.get("vNeedClosingTags"); - vDisallowed = (String[]) conf.get("vDisallowed"); - vAllowedProtocols = (String[]) conf.get("vAllowedProtocols"); - vProtocolAtts = (String[]) conf.get("vProtocolAtts"); - vRemoveBlanks = (String[]) conf.get("vRemoveBlanks"); - vAllowedEntities = (String[]) conf.get("vAllowedEntities"); - stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true; - encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true; - alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; - } - - private void reset() - { - vTagCounts.clear(); - } - - // --------------------------------------------------------------- - // my versions of some PHP library functions - public static String chr(final int decimal) - { - return String.valueOf((char) decimal); - } - - public static String htmlSpecialChars(final String s) - { - String result = s; - result = regexReplace(P_AMP, "&", result); - result = regexReplace(P_QUOTE, """, result); - result = regexReplace(P_LEFT_ARROW, "<", result); - result = regexReplace(P_RIGHT_ARROW, ">", result); - return result; - } - - // --------------------------------------------------------------- - - /** - * given a user submitted input String, filter out any invalid or restricted html. - * - * @param input text (i.e. submitted by a user) than may contain html - * @return "clean" version of input, with only valid, whitelisted html elements allowed - */ - public String filter(final String input) - { - reset(); - String s = input; - - s = escapeComments(s); - - s = balanceHtml(s); - - s = checkTags(s); - - s = processRemoveBlanks(s); - - // s = validateEntities(s); - - return s; - } - - public boolean isAlwaysMakeTags() - { - return alwaysMakeTags; - } - - public boolean isStripComments() - { - return stripComment; - } - - private String escapeComments(final String s) - { - final Matcher m = P_COMMENTS.matcher(s); - final StringBuffer buf = new StringBuffer(); - if (m.find()) - { - final String match = m.group(1); // (.*?) - m.appendReplacement(buf, Matcher.quoteReplacement("")); - } - m.appendTail(buf); - - return buf.toString(); - } - - private String balanceHtml(String s) - { - if (alwaysMakeTags) - { - // - // try and form html - // - s = regexReplace(P_END_ARROW, "", s); - // 不追加结束标签 - s = regexReplace(P_BODY_TO_END, "<$1>", s); - s = regexReplace(P_XML_CONTENT, "$1<$2", s); - - } - else - { - // - // escape stray brackets - // - s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s); - s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s); - - // - // the last regexp causes '<>' entities to appear - // (we need to do a lookahead assertion so that the last bracket can - // be used in the next pass of the regexp) - // - s = regexReplace(P_BOTH_ARROWS, "", s); - } - - return s; - } - - private String checkTags(String s) - { - Matcher m = P_TAGS.matcher(s); - - final StringBuffer buf = new StringBuffer(); - while (m.find()) - { - String replaceStr = m.group(1); - replaceStr = processTag(replaceStr); - m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr)); - } - m.appendTail(buf); - - // these get tallied in processTag - // (remember to reset before subsequent calls to filter method) - final StringBuilder sBuilder = new StringBuilder(buf.toString()); - for (String key : vTagCounts.keySet()) - { - for (int ii = 0; ii < vTagCounts.get(key); ii++) - { - sBuilder.append(""); - } - } - s = sBuilder.toString(); - - return s; - } - - private String processRemoveBlanks(final String s) - { - String result = s; - for (String tag : vRemoveBlanks) - { - if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) - { - P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>")); - } - result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result); - if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) - { - P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>")); - } - result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result); - } - - return result; - } - - private static String regexReplace(final Pattern regexPattern, final String replacement, final String s) - { - Matcher m = regexPattern.matcher(s); - return m.replaceAll(replacement); - } - - private String processTag(final String s) - { - // ending tags - Matcher m = P_END_TAG.matcher(s); - if (m.find()) - { - final String name = m.group(1).toLowerCase(); - if (allowed(name)) - { - if (false == inArray(name, vSelfClosingTags)) - { - if (vTagCounts.containsKey(name)) - { - vTagCounts.put(name, vTagCounts.get(name) - 1); - return ""; - } - } - } - } - - // starting tags - m = P_START_TAG.matcher(s); - if (m.find()) - { - final String name = m.group(1).toLowerCase(); - final String body = m.group(2); - String ending = m.group(3); - - // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); - if (allowed(name)) - { - final StringBuilder params = new StringBuilder(); - - final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body); - final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body); - final List paramNames = new ArrayList<>(); - final List paramValues = new ArrayList<>(); - while (m2.find()) - { - paramNames.add(m2.group(1)); // ([a-z0-9]+) - paramValues.add(m2.group(3)); // (.*?) - } - while (m3.find()) - { - paramNames.add(m3.group(1)); // ([a-z0-9]+) - paramValues.add(m3.group(3)); // ([^\"\\s']+) - } - - String paramName, paramValue; - for (int ii = 0; ii < paramNames.size(); ii++) - { - paramName = paramNames.get(ii).toLowerCase(); - paramValue = paramValues.get(ii); - - // debug( "paramName='" + paramName + "'" ); - // debug( "paramValue='" + paramValue + "'" ); - // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) ); - - if (allowedAttribute(name, paramName)) - { - if (inArray(paramName, vProtocolAtts)) - { - paramValue = processParamProtocol(paramValue); - } - params.append(' ').append(paramName).append("=\"").append(paramValue).append("\""); - } - } - - if (inArray(name, vSelfClosingTags)) - { - ending = " /"; - } - - if (inArray(name, vNeedClosingTags)) - { - ending = ""; - } - - if (ending == null || ending.length() < 1) - { - if (vTagCounts.containsKey(name)) - { - vTagCounts.put(name, vTagCounts.get(name) + 1); - } - else - { - vTagCounts.put(name, 1); - } - } - else - { - ending = " /"; - } - return "<" + name + params + ending + ">"; - } - else - { - return ""; - } - } - - // comments - m = P_COMMENT.matcher(s); - if (!stripComment && m.find()) - { - return "<" + m.group() + ">"; - } - - return ""; - } - - private String processParamProtocol(String s) - { - s = decodeEntities(s); - final Matcher m = P_PROTOCOL.matcher(s); - if (m.find()) - { - final String protocol = m.group(1); - if (!inArray(protocol, vAllowedProtocols)) - { - // bad protocol, turn into local anchor link instead - s = "#" + s.substring(protocol.length() + 1); - if (s.startsWith("#//")) - { - s = "#" + s.substring(3); - } - } - } - - return s; - } - - private String decodeEntities(String s) - { - StringBuffer buf = new StringBuffer(); - - Matcher m = P_ENTITY.matcher(s); - while (m.find()) - { - final String match = m.group(1); - final int decimal = Integer.decode(match).intValue(); - m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); - } - m.appendTail(buf); - s = buf.toString(); - - buf = new StringBuffer(); - m = P_ENTITY_UNICODE.matcher(s); - while (m.find()) - { - final String match = m.group(1); - final int decimal = Integer.valueOf(match, 16).intValue(); - m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); - } - m.appendTail(buf); - s = buf.toString(); - - buf = new StringBuffer(); - m = P_ENCODE.matcher(s); - while (m.find()) - { - final String match = m.group(1); - final int decimal = Integer.valueOf(match, 16).intValue(); - m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); - } - m.appendTail(buf); - s = buf.toString(); - - s = validateEntities(s); - return s; - } - - private String validateEntities(final String s) - { - StringBuffer buf = new StringBuffer(); - - // validate entities throughout the string - Matcher m = P_VALID_ENTITIES.matcher(s); - while (m.find()) - { - final String one = m.group(1); // ([^&;]*) - final String two = m.group(2); // (?=(;|&|$)) - m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); - } - m.appendTail(buf); - - return encodeQuotes(buf.toString()); - } - - private String encodeQuotes(final String s) - { - if (encodeQuotes) - { - StringBuffer buf = new StringBuffer(); - Matcher m = P_VALID_QUOTES.matcher(s); - while (m.find()) - { - final String one = m.group(1); // (>|^) - final String two = m.group(2); // ([^<]+?) - final String three = m.group(3); // (<|$) - // 不替换双引号为"，防止json格式无效 regexReplace(P_QUOTE, """, two) - m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three)); - } - m.appendTail(buf); - return buf.toString(); - } - else - { - return s; - } - } - - private String checkEntity(final String preamble, final String term) - { - - return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble; - } - - private boolean isValidEntity(final String entity) - { - return inArray(entity, vAllowedEntities); - } - - private static boolean inArray(final String s, final String[] array) - { - for (String item : array) - { - if (item != null && item.equals(s)) - { - return true; - } - } - return false; - } - - private boolean allowed(final String name) - { - return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); - } - - private boolean allowedAttribute(final String name, final String paramName) - { - return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java deleted file mode 100644 index dac60ad..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.ruoyi.common.utils.http; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; -import javax.servlet.ServletRequest; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * 通用http工具封装 - * - * @author ruoyi - */ -public class HttpHelper -{ - private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class); - - public static String getBodyString(ServletRequest request) - { - StringBuilder sb = new StringBuilder(); - BufferedReader reader = null; - try (InputStream inputStream = request.getInputStream()) - { - reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8"))); - String line = ""; - while ((line = reader.readLine()) != null) - { - sb.append(line); - } - } - catch (IOException e) - { - LOGGER.warn("getBodyString出现问题！"); - } - finally - { - if (reader != null) - { - try - { - reader.close(); - } - catch (IOException e) - { - LOGGER.error(ExceptionUtils.getMessage(e)); - } - } - } - return sb.toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java deleted file mode 100644 index c0d4ec2..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ /dev/null @@ -1,262 +0,0 @@ -package com.ruoyi.common.utils.http; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.net.ConnectException; -import java.net.SocketTimeoutException; -import java.net.URL; -import java.net.URLConnection; -import java.security.cert.X509Certificate; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; - -/** - * 通用http发送方法 - * - * @author ruoyi - */ -public class HttpUtils -{ - private static final Logger log = LoggerFactory.getLogger(HttpUtils.class); - - /** - * 向指定 URL 发送GET方法的请求 - * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * @return 所代表远程资源的响应结果 - */ - public static String sendGet(String url, String param) - { - return sendGet(url, param, Constants.UTF8); - } - - /** - * 向指定 URL 发送GET方法的请求 - * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * @param contentType 编码类型 - * @return 所代表远程资源的响应结果 - */ - public static String sendGet(String url, String param, String contentType) - { - StringBuilder result = new StringBuilder(); - BufferedReader in = null; - try - { - String urlNameString = url + "?" + param; - log.info("sendGet - {}", urlNameString); - URL realUrl = new URL(urlNameString); - URLConnection connection = realUrl.openConnection(); - connection.setRequestProperty("accept", "*/*"); - connection.setRequestProperty("connection", "Keep-Alive"); - connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - connection.connect(); - in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType)); - String line; - while ((line = in.readLine()) != null) - { - result.append(line); - } - log.info("recv - {}", result); - } - catch (ConnectException e) - { - log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e); - } - catch (SocketTimeoutException e) - { - log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e); - } - catch (IOException e) - { - log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e); - } - catch (Exception e) - { - log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e); - } - finally - { - try - { - if (in != null) - { - in.close(); - } - } - catch (Exception ex) - { - log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); - } - } - return result.toString(); - } - - /** - * 向指定 URL 发送POST方法的请求 - * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * @return 所代表远程资源的响应结果 - */ - public static String sendPost(String url, String param) - { - PrintWriter out = null; - BufferedReader in = null; - StringBuilder result = new StringBuilder(); - try - { - String urlNameString = url; - log.info("sendPost - {}", urlNameString); - URL realUrl = new URL(urlNameString); - URLConnection conn = realUrl.openConnection(); - conn.setRequestProperty("accept", "*/*"); - conn.setRequestProperty("connection", "Keep-Alive"); - conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - conn.setRequestProperty("Accept-Charset", "utf-8"); - conn.setRequestProperty("contentType", "utf-8"); - conn.setDoOutput(true); - conn.setDoInput(true); - out = new PrintWriter(conn.getOutputStream()); - out.print(param); - out.flush(); - in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8")); - String line; - while ((line = in.readLine()) != null) - { - result.append(line); - } - log.info("recv - {}", result); - } - catch (ConnectException e) - { - log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e); - } - catch (SocketTimeoutException e) - { - log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e); - } - catch (IOException e) - { - log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e); - } - catch (Exception e) - { - log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e); - } - finally - { - try - { - if (out != null) - { - out.close(); - } - if (in != null) - { - in.close(); - } - } - catch (IOException ex) - { - log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); - } - } - return result.toString(); - } - - public static String sendSslPost(String url, String param) - { - StringBuilder result = new StringBuilder(); - String urlNameString = url + "?" + param; - try - { - log.info("sendSslPost - {}", urlNameString); - SSLContext sc = SSLContext.getInstance("SSL"); - sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom()); - URL console = new URL(urlNameString); - HttpsURLConnection conn = (HttpsURLConnection) console.openConnection(); - conn.setRequestProperty("accept", "*/*"); - conn.setRequestProperty("connection", "Keep-Alive"); - conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - conn.setRequestProperty("Accept-Charset", "utf-8"); - conn.setRequestProperty("contentType", "utf-8"); - conn.setDoOutput(true); - conn.setDoInput(true); - - conn.setSSLSocketFactory(sc.getSocketFactory()); - conn.setHostnameVerifier(new TrustAnyHostnameVerifier()); - conn.connect(); - InputStream is = conn.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(is)); - String ret = ""; - while ((ret = br.readLine()) != null) - { - if (ret != null && !"".equals(ret.trim())) - { - result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8")); - } - } - log.info("recv - {}", result); - conn.disconnect(); - br.close(); - } - catch (ConnectException e) - { - log.error("调用HttpUtils.sendSslPost ConnectException, url=" + url + ",param=" + param, e); - } - catch (SocketTimeoutException e) - { - log.error("调用HttpUtils.sendSslPost SocketTimeoutException, url=" + url + ",param=" + param, e); - } - catch (IOException e) - { - log.error("调用HttpUtils.sendSslPost IOException, url=" + url + ",param=" + param, e); - } - catch (Exception e) - { - log.error("调用HttpsUtil.sendSslPost Exception, url=" + url + ",param=" + param, e); - } - return result.toString(); - } - - private static class TrustAnyTrustManager implements X509TrustManager - { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) - { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) - { - } - - @Override - public X509Certificate[] getAcceptedIssuers() - { - return new X509Certificate[] {}; - } - } - - private static class TrustAnyHostnameVerifier implements HostnameVerifier - { - @Override - public boolean verify(String hostname, SSLSession session) - { - return true; - } - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java deleted file mode 100644 index 21bbc7f..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.ruoyi.common.utils.ip; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpUtils; - -/** - * 获取地址类 - * - * @author ruoyi - */ -public class AddressUtils -{ - private static final Logger log = LoggerFactory.getLogger(AddressUtils.class); - - // IP地址查询 - public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp"; - - // 未知地址 - public static final String UNKNOWN = "XX XX"; - - public static String getRealAddressByIp(String ip) - { - String address = UNKNOWN; - // 内网不查询 - if (IpUtils.internalIp(ip)) - { - return "内网IP"; - } - if (RuoYiConfig.isAddressEnabled()) - { - try - { - String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK); - if (StringUtils.isEmpty(rspStr)) - { - log.error("获取地理位置异常 {}", ip); - return UNKNOWN; - } - JSONObject obj = JSONObject.parseObject(rspStr); - String region = obj.getString("pro"); - String city = obj.getString("city"); - return String.format("%s %s", region, city); - } - catch (Exception e) - { - log.error("获取地理位置异常 {}", ip); - } - } - return address; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java deleted file mode 100644 index 18dc374..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.ruoyi.common.utils.ip; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; - -/** - * 获取IP方法 - * - * @author ruoyi - */ -public class IpUtils -{ - public static String getIpAddr(HttpServletRequest request) - { - if (request == null) - { - return "unknown"; - } - String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { - ip = request.getHeader("Proxy-Client-IP"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { - ip = request.getHeader("X-Forwarded-For"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { - ip = request.getHeader("X-Real-IP"); - } - - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { - ip = request.getRemoteAddr(); - } - return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : EscapeUtil.clean(ip); - } - - public static boolean internalIp(String ip) - { - byte[] addr = textToNumericFormatV4(ip); - return internalIp(addr) || "127.0.0.1".equals(ip); - } - - private static boolean internalIp(byte[] addr) - { - if (StringUtils.isNull(addr) || addr.length < 2) - { - return true; - } - final byte b0 = addr[0]; - final byte b1 = addr[1]; - // 10.x.x.x/8 - final byte section1 = 0x0A; - // 172.16.x.x/12 - final byte section2 = (byte) 0xAC; - final byte section3 = (byte) 0x10; - final byte section4 = (byte) 0x1F; - // 192.168.x.x/16 - final byte section5 = (byte) 0xC0; - final byte section6 = (byte) 0xA8; - switch (b0) - { - case section1: - return true; - case section2: - if (b1 >= section3 && b1 <= section4) - { - return true; - } - case section5: - switch (b1) - { - case section6: - return true; - default: - return false; - } - default: - return false; - } - } - - /** - * 将IPv4地址转换成字节 - * - * @param text IPv4地址 - * @return byte 字节 - */ - public static byte[] textToNumericFormatV4(String text) - { - if (text.length() == 0) - { - return null; - } - - byte[] bytes = new byte[4]; - String[] elements = text.split("\\.", -1); - try - { - long l; - int i; - switch (elements.length) - { - case 1: - l = Long.parseLong(elements[0]); - if ((l < 0L) || (l > 4294967295L)) { - return null; - } - bytes[0] = (byte) (int) (l >> 24 & 0xFF); - bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF); - bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); - bytes[3] = (byte) (int) (l & 0xFF); - break; - case 2: - l = Integer.parseInt(elements[0]); - if ((l < 0L) || (l > 255L)) { - return null; - } - bytes[0] = (byte) (int) (l & 0xFF); - l = Integer.parseInt(elements[1]); - if ((l < 0L) || (l > 16777215L)) { - return null; - } - bytes[1] = (byte) (int) (l >> 16 & 0xFF); - bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); - bytes[3] = (byte) (int) (l & 0xFF); - break; - case 3: - for (i = 0; i < 2; ++i) - { - l = Integer.parseInt(elements[i]); - if ((l < 0L) || (l > 255L)) { - return null; - } - bytes[i] = (byte) (int) (l & 0xFF); - } - l = Integer.parseInt(elements[2]); - if ((l < 0L) || (l > 65535L)) { - return null; - } - bytes[2] = (byte) (int) (l >> 8 & 0xFF); - bytes[3] = (byte) (int) (l & 0xFF); - break; - case 4: - for (i = 0; i < 4; ++i) - { - l = Integer.parseInt(elements[i]); - if ((l < 0L) || (l > 255L)) { - return null; - } - bytes[i] = (byte) (int) (l & 0xFF); - } - break; - default: - return null; - } - } - catch (NumberFormatException e) - { - return null; - } - return bytes; - } - - public static String getHostIp() - { - try - { - return InetAddress.getLocalHost().getHostAddress(); - } - catch (UnknownHostException e) - { - } - return "127.0.0.1"; - } - - public static String getHostName() - { - try - { - return InetAddress.getLocalHost().getHostName(); - } - catch (UnknownHostException e) - { - } - return "未知"; - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java deleted file mode 100644 index 01e41f5..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ /dev/null @@ -1,1100 +0,0 @@ -package com.ruoyi.common.utils.poi; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import org.apache.poi.ss.usermodel.BorderStyle; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.ClientAnchor; -import org.apache.poi.ss.usermodel.DataValidation; -import org.apache.poi.ss.usermodel.DataValidationConstraint; -import org.apache.poi.ss.usermodel.DataValidationHelper; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.Drawing; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.IndexedColors; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFClientAnchor; -import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileTypeUtils; -import com.ruoyi.common.utils.file.ImageUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; - -/** - * Excel相关处理 - * - * @author ruoyi - */ -public class ExcelUtil -{ - private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); - - /** - * Excel sheet最大行数，默认65536 - */ - public static final int SHEETSIZE = 65536; - - /** - * 工作表名称 - */ - private String sheetName; - - /** - * 导出类型（EXPORT:导出数据；IMPORT：导入模板） - */ - private Type type; - - /** - * 工作薄对象 - */ - private Workbook wb; - - /** - * 工作表对象 - */ - private Sheet sheet; - - /** - * 样式列表 - */ - private Map styles; - - /** - * 导入导出数据列表 - */ - private List list; - - /** - * 注解列表 - */ - private List fields; - - /** - * 最大高度 - */ - private short maxHeight; - - /** - * 统计列表 - */ - private Map statistics = new HashMap(); - - /** - * 数字格式 - */ - private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); - - /** - * 实体对象 - */ - public Class clazz; - - public ExcelUtil(Class clazz) - { - this.clazz = clazz; - } - - public void init(List list, String sheetName, Type type) - { - if (list == null) - { - list = new ArrayList(); - } - this.list = list; - this.sheetName = sheetName; - this.type = type; - createExcelField(); - createWorkbook(); - } - - /** - * 对excel表单默认第一个索引名转换成list - * - * @param is 输入流 - * @return 转换后集合 - */ - public List importExcel(InputStream is) throws Exception - { - return importExcel(StringUtils.EMPTY, is); - } - - /** - * 对excel表单指定表格索引名转换成list - * - * @param sheetName 表格索引名 - * @param is 输入流 - * @return 转换后集合 - */ - public List importExcel(String sheetName, InputStream is) throws Exception - { - this.type = Type.IMPORT; - this.wb = WorkbookFactory.create(is); - List list = new ArrayList(); - Sheet sheet = null; - if (StringUtils.isNotEmpty(sheetName)) - { - // 如果指定sheet名,则取指定sheet中的内容. - sheet = wb.getSheet(sheetName); - } - else - { - // 如果传入的sheet名不存在则默认指向第1个sheet. - sheet = wb.getSheetAt(0); - } - - if (sheet == null) - { - throw new IOException("文件sheet不存在"); - } - - int rows = sheet.getPhysicalNumberOfRows(); - - if (rows > 0) - { - // 定义一个map用于存放excel列的序号和field. - Map cellMap = new HashMap(); - // 获取表头 - Row heard = sheet.getRow(0); - for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) - { - Cell cell = heard.getCell(i); - if (StringUtils.isNotNull(cell)) - { - String value = this.getCellValue(heard, i).toString(); - cellMap.put(value, i); - } - else - { - cellMap.put(null, i); - } - } - // 有数据时才处理 得到类的所有field. - Field[] allFields = clazz.getDeclaredFields(); - // 定义一个map用于存放列的序号和field. - Map fieldsMap = new HashMap(); - for (int col = 0; col < allFields.length; col++) - { - Field field = allFields[col]; - Excel attr = field.getAnnotation(Excel.class); - if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) - { - // 设置类的私有字段属性可访问. - field.setAccessible(true); - Integer column = cellMap.get(attr.name()); - if (column != null) - { - fieldsMap.put(column, field); - } - } - } - for (int i = 1; i < rows; i++) - { - // 从第2行开始取数据,默认第一行是表头. - Row row = sheet.getRow(i); - if(row == null) - { - continue; - } - T entity = null; - for (Map.Entry entry : fieldsMap.entrySet()) - { - Object val = this.getCellValue(row, entry.getKey()); - - // 如果不存在实例则新建. - entity = (entity == null ? clazz.newInstance() : entity); - // 从map中得到对应列的field. - Field field = fieldsMap.get(entry.getKey()); - // 取得类型,并根据对象类型设置值. - Class fieldType = field.getType(); - if (String.class == fieldType) - { - String s = Convert.toStr(val); - if (StringUtils.endsWith(s, ".0")) - { - val = StringUtils.substringBefore(s, ".0"); - } - else - { - String dateFormat = field.getAnnotation(Excel.class).dateFormat(); - if (StringUtils.isNotEmpty(dateFormat)) - { - val = DateUtils.parseDateToStr(dateFormat, (Date) val); - } - else - { - val = Convert.toStr(val); - } - } - } - else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) - { - val = Convert.toInt(val); - } - else if (Long.TYPE == fieldType || Long.class == fieldType) - { - val = Convert.toLong(val); - } - else if (Double.TYPE == fieldType || Double.class == fieldType) - { - val = Convert.toDouble(val); - } - else if (Float.TYPE == fieldType || Float.class == fieldType) - { - val = Convert.toFloat(val); - } - else if (BigDecimal.class == fieldType) - { - val = Convert.toBigDecimal(val); - } - else if (Date.class == fieldType) - { - if (val instanceof String) - { - val = DateUtils.parseDate(val); - } - else if (val instanceof Double) - { - val = DateUtil.getJavaDate((Double) val); - } - } - else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) - { - val = Convert.toBool(val, false); - } - if (StringUtils.isNotNull(fieldType)) - { - Excel attr = field.getAnnotation(Excel.class); - String propertyName = field.getName(); - if (StringUtils.isNotEmpty(attr.targetAttr())) - { - propertyName = field.getName() + "." + attr.targetAttr(); - } - else if (StringUtils.isNotEmpty(attr.readConverterExp())) - { - val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); - } - else if (StringUtils.isNotEmpty(attr.dictType())) - { - val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator()); - } - ReflectUtils.invokeSetter(entity, propertyName, val); - } - } - list.add(entity); - } - } - return list; - } - - /** - * 对list数据源将其里面的数据导入到excel表单 - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @return 结果 - */ - public AjaxResult exportExcel(List list, String sheetName) - { - this.init(list, sheetName, Type.EXPORT); - return exportExcel(); - } - - /** - * 对list数据源将其里面的数据导入到excel表单 - * - * @param sheetName 工作表的名称 - * @return 结果 - */ - public AjaxResult importTemplateExcel(String sheetName) - { - this.init(null, sheetName, Type.IMPORT); - return exportExcel(); - } - - /** - * 对list数据源将其里面的数据导入到excel表单 - * - * @return 结果 - */ - public AjaxResult exportExcel() - { - OutputStream out = null; - try - { - // 取出一共有多少个sheet. - double sheetNo = Math.ceil(list.size() / SHEETSIZE); - for (int index = 0; index <= sheetNo; index++) - { - createSheet(sheetNo, index); - - // 产生一行 - Row row = sheet.createRow(0); - int column = 0; - // 写入各个字段的列头名称 - for (Object[] os : fields) - { - Excel excel = (Excel) os[1]; - this.createCell(excel, row, column++); - } - if (Type.EXPORT.equals(type)) - { - fillExcelData(index, row); - addStatisticsRow(); - } - } - String filename = encodingFilename(sheetName); - out = new FileOutputStream(getAbsoluteFile(filename)); - wb.write(out); - return AjaxResult.success(filename); - } - catch (Exception e) - { - log.error("导出Excel异常{}", e.getMessage()); - throw new CustomException("导出Excel失败，请联系网站管理员！"); - } - finally - { - if (wb != null) - { - try - { - wb.close(); - } - catch (IOException e1) - { - e1.printStackTrace(); - } - } - if (out != null) - { - try - { - out.close(); - } - catch (IOException e1) - { - e1.printStackTrace(); - } - } - } - } - - /** - * 填充excel数据 - * - * @param index 序号 - * @param row 单元格行 - */ - public void fillExcelData(int index, Row row) - { - int startNo = index * SHEETSIZE; - int endNo = Math.min(startNo + SHEETSIZE, list.size()); - for (int i = startNo; i < endNo; i++) - { - row = sheet.createRow(i + 1 - startNo); - // 得到导出对象. - T vo = (T) list.get(i); - int column = 0; - for (Object[] os : fields) - { - Field field = (Field) os[0]; - Excel excel = (Excel) os[1]; - // 设置实体类私有属性可访问 - field.setAccessible(true); - this.addCell(excel, row, vo, field, column++); - } - } - } - - /** - * 创建表格样式 - * - * @param wb 工作薄对象 - * @return 样式列表 - */ - private Map createStyles(Workbook wb) - { - // 写入各条记录,每条记录对应excel表中的一行 - Map styles = new HashMap(); - CellStyle style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - style.setBorderRight(BorderStyle.THIN); - style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderLeft(BorderStyle.THIN); - style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderTop(BorderStyle.THIN); - style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderBottom(BorderStyle.THIN); - style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - Font dataFont = wb.createFont(); - dataFont.setFontName("Arial"); - dataFont.setFontHeightInPoints((short) 10); - style.setFont(dataFont); - styles.put("data", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setFillPattern(FillPatternType.SOLID_FOREGROUND); - Font headerFont = wb.createFont(); - headerFont.setFontName("Arial"); - headerFont.setFontHeightInPoints((short) 10); - headerFont.setBold(true); - headerFont.setColor(IndexedColors.WHITE.getIndex()); - style.setFont(headerFont); - styles.put("header", style); - - style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - Font totalFont = wb.createFont(); - totalFont.setFontName("Arial"); - totalFont.setFontHeightInPoints((short) 10); - style.setFont(totalFont); - styles.put("total", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.LEFT); - styles.put("data1", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.CENTER); - styles.put("data2", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.RIGHT); - styles.put("data3", style); - - return styles; - } - - /** - * 创建单元格 - */ - public Cell createCell(Excel attr, Row row, int column) - { - // 创建列 - Cell cell = row.createCell(column); - // 写入列信息 - cell.setCellValue(attr.name()); - setDataValidation(attr, row, column); - cell.setCellStyle(styles.get("header")); - return cell; - } - - /** - * 设置单元格信息 - * - * @param value 单元格值 - * @param attr 注解相关 - * @param cell 单元格信息 - */ - public void setCellVo(Object value, Excel attr, Cell cell) - { - if (ColumnType.STRING == attr.cellType()) - { - cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix()); - } - else if (ColumnType.NUMERIC == attr.cellType()) - { - if (StringUtils.isNotNull(value)) - { - cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); - } - } - else if (ColumnType.IMAGE == attr.cellType()) - { - ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), - cell.getRow().getRowNum() + 1); - String imagePath = Convert.toStr(value); - if (StringUtils.isNotEmpty(imagePath)) - { - byte[] data = ImageUtils.getImage(imagePath); - getDrawingPatriarch(cell.getSheet()).createPicture(anchor, - cell.getSheet().getWorkbook().addPicture(data, getImageType(data))); - } - } - } - - /** - * 获取画布 - */ - public static Drawing getDrawingPatriarch(Sheet sheet) - { - if (sheet.getDrawingPatriarch() == null) - { - sheet.createDrawingPatriarch(); - } - return sheet.getDrawingPatriarch(); - } - - /** - * 获取图片类型,设置图片插入类型 - */ - public int getImageType(byte[] value) - { - String type = FileTypeUtils.getFileExtendName(value); - if ("JPG".equalsIgnoreCase(type)) - { - return Workbook.PICTURE_TYPE_JPEG; - } - else if ("PNG".equalsIgnoreCase(type)) - { - return Workbook.PICTURE_TYPE_PNG; - } - return Workbook.PICTURE_TYPE_JPEG; - } - - /** - * 创建表格样式 - */ - public void setDataValidation(Excel attr, Row row, int column) - { - if (attr.name().indexOf("注：") >= 0) - { - sheet.setColumnWidth(column, 6000); - } - else - { - // 设置列宽 - sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); - } - // 如果设置了提示信息则鼠标放上去提示. - if (StringUtils.isNotEmpty(attr.prompt())) - { - // 这里默认设了2-101列提示. - setXssfPrompt(sheet, "", attr.prompt(), 1, 100, column, column); - } - // 如果设置了combo属性则本列只能选择不能输入 - if (attr.combo().length > 0) - { - // 这里默认设了2-101列只能选择不能输入. - setXssfValidation(sheet, attr.combo(), 1, 100, column, column); - } - } - - /** - * 添加单元格 - */ - public Cell addCell(Excel attr, Row row, T vo, Field field, int column) - { - Cell cell = null; - try - { - // 设置行高 - row.setHeight(maxHeight); - // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列. - if (attr.isExport()) - { - // 创建cell - cell = row.createCell(column); - int align = attr.align().value(); - cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : ""))); - - // 用于读取对象中的属性 - Object value = getTargetValue(vo, field, attr); - String dateFormat = attr.dateFormat(); - String readConverterExp = attr.readConverterExp(); - String separator = attr.separator(); - String dictType = attr.dictType(); - if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) - { - cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value)); - } - else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) - { - cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); - } - else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) - { - cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator)); - } - else if (value instanceof BigDecimal && -1 != attr.scale()) - { - cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString()); - } - else - { - // 设置列类型 - setCellVo(value, attr, cell); - } - addStatisticsData(column, Convert.toStr(value), attr); - } - } - catch (Exception e) - { - log.error("导出Excel失败{}", e); - } - return cell; - } - - /** - * 设置 POI XSSFSheet 单元格提示 - * - * @param sheet 表单 - * @param promptTitle 提示标题 - * @param promptContent 提示内容 - * @param firstRow 开始行 - * @param endRow 结束行 - * @param firstCol 开始列 - * @param endCol 结束列 - */ - public void setXssfPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow, - int firstCol, int endCol) - { - DataValidationHelper helper = sheet.getDataValidationHelper(); - DataValidationConstraint constraint = helper.createCustomConstraint("DD1"); - CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); - DataValidation dataValidation = helper.createValidation(constraint, regions); - dataValidation.createPromptBox(promptTitle, promptContent); - dataValidation.setShowPromptBox(true); - sheet.addValidationData(dataValidation); - } - - /** - * 设置某些列的值只能输入预制的数据,显示下拉框. - * - * @param sheet 要设置的sheet. - * @param textlist 下拉框显示的内容 - * @param firstRow 开始行 - * @param endRow 结束行 - * @param firstCol 开始列 - * @param endCol 结束列 - * @return 设置好的sheet. - */ - public void setXssfValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) - { - DataValidationHelper helper = sheet.getDataValidationHelper(); - // 加载下拉列表内容 - DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist); - // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列 - CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); - // 数据有效性对象 - DataValidation dataValidation = helper.createValidation(constraint, regions); - // 处理Excel兼容性问题 - if (dataValidation instanceof XSSFDataValidation) - { - dataValidation.setSuppressDropDownArrow(true); - dataValidation.setShowErrorBox(true); - } - else - { - dataValidation.setSuppressDropDownArrow(false); - } - - sheet.addValidationData(dataValidation); - } - - /** - * 解析导出值 0=男,1=女,2=未知 - * - * @param propertyValue 参数值 - * @param converterExp 翻译注解 - * @param separator 分隔符 - * @return 解析后值 - */ - public static String convertByExp(String propertyValue, String converterExp, String separator) - { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) - { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) - { - for (String value : propertyValue.split(separator)) - { - if (itemArray[0].equals(value)) - { - propertyString.append(itemArray[1] + separator); - break; - } - } - } - else - { - if (itemArray[0].equals(propertyValue)) - { - return itemArray[1]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 反向解析值 男=0,女=1,未知=2 - * - * @param propertyValue 参数值 - * @param converterExp 翻译注解 - * @param separator 分隔符 - * @return 解析后值 - */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) - { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) - { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) - { - for (String value : propertyValue.split(separator)) - { - if (itemArray[1].equals(value)) - { - propertyString.append(itemArray[0] + separator); - break; - } - } - } - else - { - if (itemArray[1].equals(propertyValue)) - { - return itemArray[0]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 解析字典值 - * - * @param dictValue 字典值 - * @param dictType 字典类型 - * @param separator 分隔符 - * @return 字典标签 - */ - public static String convertDictByExp(String dictValue, String dictType, String separator) - { - return DictUtils.getDictLabel(dictType, dictValue, separator); - } - - /** - * 反向解析值字典值 - * - * @param dictLabel 字典标签 - * @param dictType 字典类型 - * @param separator 分隔符 - * @return 字典值 - */ - public static String reverseDictByExp(String dictLabel, String dictType, String separator) - { - return DictUtils.getDictValue(dictType, dictLabel, separator); - } - - /** - * 合计统计信息 - */ - private void addStatisticsData(Integer index, String text, Excel entity) - { - if (entity != null && entity.isStatistics()) - { - Double temp = 0D; - if (!statistics.containsKey(index)) - { - statistics.put(index, temp); - } - try - { - temp = Double.valueOf(text); - } - catch (NumberFormatException e) - { - } - statistics.put(index, statistics.get(index) + temp); - } - } - - /** - * 创建统计行 - */ - public void addStatisticsRow() - { - if (statistics.size() > 0) - { - Cell cell = null; - Row row = sheet.createRow(sheet.getLastRowNum() + 1); - Set keys = statistics.keySet(); - cell = row.createCell(0); - cell.setCellStyle(styles.get("total")); - cell.setCellValue("合计"); - - for (Integer key : keys) - { - cell = row.createCell(key); - cell.setCellStyle(styles.get("total")); - cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); - } - statistics.clear(); - } - } - - /** - * 编码文件名 - */ - public String encodingFilename(String filename) - { - filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; - return filename; - } - - /** - * 获取下载路径 - * - * @param filename 文件名称 - */ - public String getAbsoluteFile(String filename) - { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; - File desc = new File(downloadPath); - if (!desc.getParentFile().exists()) - { - desc.getParentFile().mkdirs(); - } - return downloadPath; - } - - /** - * 获取bean中的属性值 - * - * @param vo 实体对象 - * @param field 字段 - * @param excel 注解 - * @return 最终的属性值 - * @throws Exception - */ - private Object getTargetValue(T vo, Field field, Excel excel) throws Exception - { - Object o = field.get(vo); - if (StringUtils.isNotEmpty(excel.targetAttr())) - { - String target = excel.targetAttr(); - if (target.indexOf(".") > -1) - { - String[] targets = target.split("[.]"); - for (String name : targets) - { - o = getValue(o, name); - } - } - else - { - o = getValue(o, target); - } - } - return o; - } - - /** - * 以类的属性的get方法方法形式获取值 - * - * @param o - * @param name - * @return value - * @throws Exception - */ - private Object getValue(Object o, String name) throws Exception - { - if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) - { - Class clazz = o.getClass(); - Field field = clazz.getDeclaredField(name); - field.setAccessible(true); - o = field.get(o); - } - return o; - } - - /** - * 得到所有定义字段 - */ - private void createExcelField() - { - this.fields = new ArrayList(); - List tempFields = new ArrayList<>(); - tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); - tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); - for (Field field : tempFields) - { - // 单注解 - if (field.isAnnotationPresent(Excel.class)) - { - putToField(field, field.getAnnotation(Excel.class)); - } - - // 多注解 - if (field.isAnnotationPresent(Excels.class)) - { - Excels attrs = field.getAnnotation(Excels.class); - Excel[] excels = attrs.value(); - for (Excel excel : excels) - { - putToField(field, excel); - } - } - } - this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); - this.maxHeight = getRowHeight(); - } - - /** - * 根据注解获取最大行高 - */ - public short getRowHeight() - { - double maxHeight = 0; - for (Object[] os : this.fields) - { - Excel excel = (Excel) os[1]; - maxHeight = maxHeight > excel.height() ? maxHeight : excel.height(); - } - return (short) (maxHeight * 20); - } - - /** - * 放到字段集合中 - */ - private void putToField(Field field, Excel attr) - { - if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) - { - this.fields.add(new Object[] { field, attr }); - } - } - - /** - * 创建一个工作簿 - */ - public void createWorkbook() - { - this.wb = new SXSSFWorkbook(500); - } - - /** - * 创建工作表 - * - * @param sheetNo sheet数量 - * @param index 序号 - */ - public void createSheet(double sheetNo, int index) - { - this.sheet = wb.createSheet(); - this.styles = createStyles(wb); - // 设置工作表的名称. - if (sheetNo == 0) - { - wb.setSheetName(index, sheetName); - } - else - { - wb.setSheetName(index, sheetName + index); - } - } - - /** - * 获取单元格值 - * - * @param row 获取的行 - * @param column 获取单元格列号 - * @return 单元格值 - */ - public Object getCellValue(Row row, int column) - { - if (row == null) - { - return row; - } - Object val = ""; - try - { - Cell cell = row.getCell(column); - if (StringUtils.isNotNull(cell)) - { - if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) - { - val = cell.getNumericCellValue(); - if (DateUtil.isCellDateFormatted(cell)) - { - val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换 - } - else - { - if ((Double) val % 1 != 0) - { - val = new BigDecimal(val.toString()); - } - else - { - val = new DecimalFormat("0").format(val); - } - } - } - else if (cell.getCellType() == CellType.STRING) - { - val = cell.getStringCellValue(); - } - else if (cell.getCellType() == CellType.BOOLEAN) - { - val = cell.getBooleanCellValue(); - } - else if (cell.getCellType() == CellType.ERROR) - { - val = cell.getErrorCellValue(); - } - - } - } - catch (Exception e) - { - return val; - } - return val; - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java deleted file mode 100644 index b19953e..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ /dev/null @@ -1,410 +0,0 @@ -package com.ruoyi.common.utils.reflect; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.Date; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Validate; -import org.apache.poi.ss.usermodel.DateUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; - -/** - * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. - * - * @author ruoyi - */ -@SuppressWarnings("rawtypes") -public class ReflectUtils -{ - private static final String SETTER_PREFIX = "set"; - - private static final String GETTER_PREFIX = "get"; - - private static final String CGLIB_CLASS_SEPARATOR = "$$"; - - private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); - - /** - * 调用Getter方法. - * 支持多级，如：对象名.对象名.方法 - */ - @SuppressWarnings("unchecked") - public static E invokeGetter(Object obj, String propertyName) - { - Object object = obj; - for (String name : StringUtils.split(propertyName, ".")) - { - String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); - object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); - } - return (E) object; - } - - /** - * 调用Setter方法, 仅匹配方法名。 - * 支持多级，如：对象名.对象名.方法 - */ - public static void invokeSetter(Object obj, String propertyName, E value) - { - Object object = obj; - String[] names = StringUtils.split(propertyName, "."); - for (int i = 0; i < names.length; i++) - { - if (i < names.length - 1) - { - String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); - object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); - } - else - { - String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); - invokeMethodByName(object, setterMethodName, new Object[] { value }); - } - } - } - - /** - * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数. - */ - @SuppressWarnings("unchecked") - public static E getFieldValue(final Object obj, final String fieldName) - { - Field field = getAccessibleField(obj, fieldName); - if (field == null) - { - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); - return null; - } - E result = null; - try - { - result = (E) field.get(obj); - } - catch (IllegalAccessException e) - { - logger.error("不可能抛出的异常{}", e.getMessage()); - } - return result; - } - - /** - * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数. - */ - public static void setFieldValue(final Object obj, final String fieldName, final E value) - { - Field field = getAccessibleField(obj, fieldName); - if (field == null) - { - // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); - return; - } - try - { - field.set(obj, value); - } - catch (IllegalAccessException e) - { - logger.error("不可能抛出的异常: {}", e.getMessage()); - } - } - - /** - * 直接调用对象方法, 无视private/protected修饰符. - * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用. - * 同时匹配方法名+参数类型， - */ - @SuppressWarnings("unchecked") - public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes, - final Object[] args) - { - if (obj == null || methodName == null) - { - return null; - } - Method method = getAccessibleMethod(obj, methodName, parameterTypes); - if (method == null) - { - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); - return null; - } - try - { - return (E) method.invoke(obj, args); - } - catch (Exception e) - { - String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; - throw convertReflectionExceptionToUnchecked(msg, e); - } - } - - /** - * 直接调用对象方法, 无视private/protected修饰符， - * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用. - * 只匹配函数名，如果有多个同名函数调用第一个。 - */ - @SuppressWarnings("unchecked") - public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) - { - Method method = getAccessibleMethodByName(obj, methodName, args.length); - if (method == null) - { - // 如果为空不报错，直接返回空。 - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); - return null; - } - try - { - // 类型转换（将参数数据类型转换为目标方法参数类型） - Class[] cs = method.getParameterTypes(); - for (int i = 0; i < cs.length; i++) - { - if (args[i] != null && !args[i].getClass().equals(cs[i])) - { - if (cs[i] == String.class) - { - args[i] = Convert.toStr(args[i]); - if (StringUtils.endsWith((String) args[i], ".0")) - { - args[i] = StringUtils.substringBefore((String) args[i], ".0"); - } - } - else if (cs[i] == Integer.class) - { - args[i] = Convert.toInt(args[i]); - } - else if (cs[i] == Long.class) - { - args[i] = Convert.toLong(args[i]); - } - else if (cs[i] == Double.class) - { - args[i] = Convert.toDouble(args[i]); - } - else if (cs[i] == Float.class) - { - args[i] = Convert.toFloat(args[i]); - } - else if (cs[i] == Date.class) - { - if (args[i] instanceof String) - { - args[i] = DateUtils.parseDate(args[i]); - } - else - { - args[i] = DateUtil.getJavaDate((Double) args[i]); - } - } - else if (cs[i] == boolean.class || cs[i] == Boolean.class) - { - args[i] = Convert.toBool(args[i]); - } - } - } - return (E) method.invoke(obj, args); - } - catch (Exception e) - { - String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; - throw convertReflectionExceptionToUnchecked(msg, e); - } - } - - /** - * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问. - * 如向上转型到Object仍无法找到, 返回null. - */ - public static Field getAccessibleField(final Object obj, final String fieldName) - { - // 为空不报错。直接返回 null - if (obj == null) - { - return null; - } - Validate.notBlank(fieldName, "fieldName can't be blank"); - for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) - { - try - { - Field field = superClass.getDeclaredField(fieldName); - makeAccessible(field); - return field; - } - catch (NoSuchFieldException e) - { - continue; - } - } - return null; - } - - /** - * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问. - * 如向上转型到Object仍无法找到, 返回null. - * 匹配函数名+参数类型。 - * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) - */ - public static Method getAccessibleMethod(final Object obj, final String methodName, - final Class... parameterTypes) - { - // 为空不报错。直接返回 null - if (obj == null) - { - return null; - } - Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) - { - try - { - Method method = searchType.getDeclaredMethod(methodName, parameterTypes); - makeAccessible(method); - return method; - } - catch (NoSuchMethodException e) - { - continue; - } - } - return null; - } - - /** - * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问. - * 如向上转型到Object仍无法找到, 返回null. - * 只匹配函数名。 - * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) - */ - public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) - { - // 为空不报错。直接返回 null - if (obj == null) - { - return null; - } - Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) - { - Method[] methods = searchType.getDeclaredMethods(); - for (Method method : methods) - { - if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) - { - makeAccessible(method); - return method; - } - } - } - return null; - } - - /** - * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。 - */ - public static void makeAccessible(Method method) - { - if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) - && !method.isAccessible()) - { - method.setAccessible(true); - } - } - - /** - * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。 - */ - public static void makeAccessible(Field field) - { - if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) - || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) - { - field.setAccessible(true); - } - } - - /** - * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处 - * 如无法找到, 返回Object.class. - */ - @SuppressWarnings("unchecked") - public static Class getClassGenricType(final Class clazz) - { - return getClassGenricType(clazz, 0); - } - - /** - * 通过反射, 获得Class定义中声明的父类的泛型参数的类型. - * 如无法找到, 返回Object.class. - */ - public static Class getClassGenricType(final Class clazz, final int index) - { - Type genType = clazz.getGenericSuperclass(); - - if (!(genType instanceof ParameterizedType)) - { - logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType"); - return Object.class; - } - - Type[] params = ((ParameterizedType) genType).getActualTypeArguments(); - - if (index >= params.length || index < 0) - { - logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " - + params.length); - return Object.class; - } - if (!(params[index] instanceof Class)) - { - logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter"); - return Object.class; - } - - return (Class) params[index]; - } - - public static Class getUserClass(Object instance) - { - if (instance == null) - { - throw new RuntimeException("Instance must not be null"); - } - Class clazz = instance.getClass(); - if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) - { - Class superClass = clazz.getSuperclass(); - if (superClass != null && !Object.class.equals(superClass)) - { - return superClass; - } - } - return clazz; - - } - - /** - * 将反射时的checked exception转换为unchecked exception. - */ - public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) - { - if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException - || e instanceof NoSuchMethodException) - { - return new IllegalArgumentException(msg, e); - } - else if (e instanceof InvocationTargetException) - { - return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException()); - } - return new RuntimeException(msg, e); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java deleted file mode 100644 index c6eab52..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ /dev/null @@ -1,291 +0,0 @@ -package com.ruoyi.common.utils.sign; - -/** - * Base64工具类 - * - * @author ruoyi - */ -public final class Base64 -{ - static private final int BASELENGTH = 128; - static private final int LOOKUPLENGTH = 64; - static private final int TWENTYFOURBITGROUP = 24; - static private final int EIGHTBIT = 8; - static private final int SIXTEENBIT = 16; - static private final int FOURBYTE = 4; - static private final int SIGN = -128; - static private final char PAD = '='; - static final private byte[] BASE64ALPHABET = new byte[BASELENGTH]; - static final private char[] LOOKUPBASE64ALPHABET= new char[LOOKUPLENGTH]; - - static - { - for (int i = 0; i < BASELENGTH; ++i) - { - BASE64ALPHABET[i] = -1; - } - for (int i = 'Z'; i >= 'A'; i--) - { - BASE64ALPHABET[i] = (byte) (i - 'A'); - } - for (int i = 'z'; i >= 'a'; i--) - { - BASE64ALPHABET[i] = (byte) (i - 'a' + 26); - } - - for (int i = '9'; i >= '0'; i--) - { - BASE64ALPHABET[i] = (byte) (i - '0' + 52); - } - - BASE64ALPHABET['+'] = 62; - BASE64ALPHABET['/'] = 63; - - for (int i = 0; i <= 25; i++) - { - LOOKUPBASE64ALPHABET[i] = (char) ('A' + i); - } - - for (int i = 26, j = 0; i <= 51; i++, j++) - { - LOOKUPBASE64ALPHABET[i] = (char) ('a' + j); - } - - for (int i = 52, j = 0; i <= 61; i++, j++) - { - LOOKUPBASE64ALPHABET[i] = (char) ('0' + j); - } - LOOKUPBASE64ALPHABET[62] = (char) '+'; - LOOKUPBASE64ALPHABET[63] = (char) '/'; - } - - private static boolean isWhiteSpace(char octect) - { - return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9); - } - - private static boolean isPad(char octect) - { - return (octect == PAD); - } - - private static boolean isData(char octect) - { - return (octect < BASELENGTH && BASE64ALPHABET[octect] != -1); - } - - /** - * Encodes hex octects into Base64 - * - * @param binaryData Array containing binaryData - * @return Encoded Base64 array - */ - public static String encode(byte[] binaryData) - { - if (binaryData == null) - { - return null; - } - - int lengthDataBits = binaryData.length * EIGHTBIT; - if (lengthDataBits == 0) - { - return ""; - } - - int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP; - int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP; - int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets; - char encodedData[] = null; - - encodedData = new char[numberQuartet * 4]; - - byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0; - - int encodedIndex = 0; - int dataIndex = 0; - - for (int i = 0; i < numberTriplets; i++) - { - b1 = binaryData[dataIndex++]; - b2 = binaryData[dataIndex++]; - b3 = binaryData[dataIndex++]; - - l = (byte) (b2 & 0x0f); - k = (byte) (b1 & 0x03); - - byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); - byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); - byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc); - - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[val1]; - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[val2 | (k << 4)]; - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[(l << 2) | val3]; - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[b3 & 0x3f]; - } - - // form integral number of 6-bit groups - if (fewerThan24bits == EIGHTBIT) - { - b1 = binaryData[dataIndex]; - k = (byte) (b1 & 0x03); - byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[val1]; - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[k << 4]; - encodedData[encodedIndex++] = PAD; - encodedData[encodedIndex++] = PAD; - } - else if (fewerThan24bits == SIXTEENBIT) - { - b1 = binaryData[dataIndex]; - b2 = binaryData[dataIndex + 1]; - l = (byte) (b2 & 0x0f); - k = (byte) (b1 & 0x03); - - byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); - byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); - - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[val1]; - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[val2 | (k << 4)]; - encodedData[encodedIndex++] = LOOKUPBASE64ALPHABET[l << 2]; - encodedData[encodedIndex++] = PAD; - } - return new String(encodedData); - } - - /** - * Decodes Base64 data into octects - * - * @param encoded string containing Base64 data - * @return Array containind decoded data. - */ - public static byte[] decode(String encoded) - { - if (encoded == null) - { - return null; - } - - char[] base64Data = encoded.toCharArray(); - // remove white spaces - int len = removeWhiteSpace(base64Data); - - if (len % FOURBYTE != 0) - { - return null;// should be divisible by four - } - - int numberQuadruple = (len / FOURBYTE); - - if (numberQuadruple == 0) - { - return new byte[0]; - } - - byte decodedData[] = null; - byte b1 = 0, b2 = 0, b3 = 0, b4 = 0; - char d1 = 0, d2 = 0, d3 = 0, d4 = 0; - - int i = 0; - int encodedIndex = 0; - int dataIndex = 0; - decodedData = new byte[(numberQuadruple) * 3]; - - for (; i < numberQuadruple - 1; i++) - { - - if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])) - || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) - { - return null; - } // if found "no data" just return null - - b1 = BASE64ALPHABET[d1]; - b2 = BASE64ALPHABET[d2]; - b3 = BASE64ALPHABET[d3]; - b4 = BASE64ALPHABET[d4]; - - decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); - decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); - decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); - } - - if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) - { - return null;// if found "no data" just return null - } - - b1 = BASE64ALPHABET[d1]; - b2 = BASE64ALPHABET[d2]; - - d3 = base64Data[dataIndex++]; - d4 = base64Data[dataIndex++]; - if (!isData((d3)) || !isData((d4))) - {// Check if they are PAD characters - if (isPad(d3) && isPad(d4)) - { - if ((b2 & 0xf) != 0)// last 4 bits should be zero - { - return null; - } - byte[] tmp = new byte[i * 3 + 1]; - System.arraycopy(decodedData, 0, tmp, 0, i * 3); - tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4); - return tmp; - } - else if (!isPad(d3) && isPad(d4)) - { - b3 = BASE64ALPHABET[d3]; - if ((b3 & 0x3) != 0)// last 2 bits should be zero - { - return null; - } - byte[] tmp = new byte[i * 3 + 2]; - System.arraycopy(decodedData, 0, tmp, 0, i * 3); - tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); - tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); - return tmp; - } - else - { - return null; - } - } - else - { // No PAD e.g 3cQl - b3 = BASE64ALPHABET[d3]; - b4 = BASE64ALPHABET[d4]; - decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); - decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); - decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); - - } - return decodedData; - } - - /** - * remove WhiteSpace from MIME containing encoded Base64 data. - * - * @param data the byte array of base64 data (with WS) - * @return the new length - */ - private static int removeWhiteSpace(char[] data) - { - if (data == null) - { - return 0; - } - - // count characters that's not whitespace - int newSize = 0; - int len = data.length; - for (int i = 0; i < len; i++) - { - if (!isWhiteSpace(data[i])) - { - data[newSize++] = data[i]; - } - } - return newSize; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java deleted file mode 100644 index de77ee8..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.ruoyi.common.utils.sign; - -import java.security.MessageDigest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Md5加密方法 - * - * @author ruoyi - */ -public class Md5Utils -{ - private static final Logger log = LoggerFactory.getLogger(Md5Utils.class); - - private static byte[] md5(String s) - { - MessageDigest algorithm; - try - { - algorithm = MessageDigest.getInstance("MD5"); - algorithm.reset(); - algorithm.update(s.getBytes("UTF-8")); - byte[] messageDigest = algorithm.digest(); - return messageDigest; - } - catch (Exception e) - { - log.error("MD5 Error...", e); - } - return null; - } - - private static final String toHex(byte hash[]) - { - if (hash == null) - { - return null; - } - StringBuffer buf = new StringBuffer(hash.length * 2); - int i; - - for (i = 0; i < hash.length; i++) - { - if ((hash[i] & 0xff) < 0x10) - { - buf.append("0"); - } - buf.append(Long.toString(hash[i] & 0xff, 16)); - } - return buf.toString(); - } - - public static String hash(String s) - { - try - { - return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8"); - } - catch (Exception e) - { - log.error("not supported charset...{}", e); - return s; - } - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java deleted file mode 100644 index 9993b98..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.ruoyi.common.utils.spring; - -import org.springframework.aop.framework.AopContext; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; - -/** - * spring工具类 方便在非spring管理环境中获取bean - * - * @author ruoyi - */ -@Component -public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware -{ - /** Spring应用上下文环境 */ - private static ConfigurableListableBeanFactory beanFactory; - - private static ApplicationContext applicationContext; - - @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException - { - SpringUtils.beanFactory = beanFactory; - } - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException - { - SpringUtils.applicationContext = applicationContext; - } - - /** - * 获取对象 - * - * @param name - * @return Object 一个以所给名字注册的bean的实例 - * @throws org.springframework.beans.BeansException - * - */ - @SuppressWarnings("unchecked") - public static T getBean(String name) throws BeansException - { - return (T) beanFactory.getBean(name); - } - - /** - * 获取类型为requiredType的对象 - * - * @param clz - * @return - * @throws org.springframework.beans.BeansException - * - */ - public static T getBean(Class clz) throws BeansException - { - T result = (T) beanFactory.getBean(clz); - return result; - } - - /** - * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true - * - * @param name - * @return boolean - */ - public static boolean containsBean(String name) - { - return beanFactory.containsBean(name); - } - - /** - * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException） - * - * @param name - * @return boolean - * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException - * - */ - public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException - { - return beanFactory.isSingleton(name); - } - - /** - * @param name - * @return Class 注册对象的类型 - * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException - * - */ - public static Class getType(String name) throws NoSuchBeanDefinitionException - { - return beanFactory.getType(name); - } - - /** - * 如果给定的bean名字在bean定义中有别名，则返回这些别名 - * - * @param name - * @return - * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException - * - */ - public static String[] getAliases(String name) throws NoSuchBeanDefinitionException - { - return beanFactory.getAliases(name); - } - - /** - * 获取aop代理对象 - * - * @param invoker - * @return - */ - @SuppressWarnings("unchecked") - public static T getAopProxy(T invoker) - { - return (T) AopContext.currentProxy(); - } - - /** - * 获取当前的环境配置，无配置返回null - * - * @return 当前的环境配置 - */ - public static String[] getActiveProfiles() - { - return applicationContext.getEnvironment().getActiveProfiles(); - } - - /** - * 获取当前的环境配置，当有多个环境配置时，只获取第一个 - * - * @return 当前的环境配置 - */ - public static String getActiveProfile() - { - final String[] activeProfiles = getActiveProfiles(); - return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null; - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java deleted file mode 100644 index 0b06dd9..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ruoyi.common.utils.sql; - -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.utils.StringUtils; - -/** - * sql操作工具类 - * - * @author ruoyi - */ -public class SqlUtil -{ - /** - * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） - */ - public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; - - /** - * 检查字符，防止注入绕过 - */ - public static String escapeOrderBySql(String value) - { - if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) - { - throw new BaseException("参数不符合规范，不能进行查询"); - } - return value; - } - - /** - * 验证 order by 语法是否符合规范 - */ - public static boolean isValidOrderBySql(String value) - { - return value.matches(SQL_PATTERN); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java deleted file mode 100644 index b7c6e6b..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ruoyi.common.utils.uuid; - -/** - * ID生成器工具类 - * - * @author ruoyi - */ -public class IdUtils -{ - /** - * 获取随机UUID - * - * @return 随机UUID - */ - public static String randomUuid() - { - return UUID.randomUuid().toString(); - } - - /** - * 简化的UUID，去掉了横线 - * - * @return 简化的UUID，去掉了横线 - */ - public static String simpleUuid() - { - return UUID.randomUuid().toString(true); - } - - /** - * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID - * - * @return 随机UUID - */ - public static String fastUuid() - { - return UUID.fastUuid().toString(); - } - - /** - * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID - * - * @return 简化的UUID，去掉了横线 - */ - public static String fastSimpleUuid() - { - return UUID.fastUuid().toString(true); - } -} diff --git a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java deleted file mode 100644 index 113d0b6..0000000 --- a/exam-online-api-DEL/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java +++ /dev/null @@ -1,484 +0,0 @@ -package com.ruoyi.common.utils.uuid; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.exception.UtilException; - -/** - * 提供通用唯一识别码（universally unique identifier）（UUID）实现 - * - * @author ruoyi - */ -public final class UUID implements java.io.Serializable, Comparable -{ - private static final long serialVersionUID = -1185015143654744140L; - - /** - * SecureRandom 的单例 - * - */ - private static class Holder - { - static final SecureRandom NUMBERGENERATOR = getSecureRandom(); - } - - /** 此UUID的最高64有效位 */ - private final long mostSigBits; - - /** 此UUID的最低64有效位 */ - private final long leastSigBits; - - /** - * 私有构造 - * - * @param data 数据 - */ - private UUID(byte[] data) - { - long msb = 0; - long lsb = 0; - assert data.length == 16 : "data must be 16 bytes in length"; - for (int i = 0; i < 8; i++) - { - msb = (msb << 8) | (data[i] & 0xff); - } - for (int i = 8; i < 16; i++) - { - lsb = (lsb << 8) | (data[i] & 0xff); - } - this.mostSigBits = msb; - this.leastSigBits = lsb; - } - - /** - * 使用指定的数据构造新的 UUID。 - * - * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位 - * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位 - */ - public UUID(long mostSigBits, long leastSigBits) - { - this.mostSigBits = mostSigBits; - this.leastSigBits = leastSigBits; - } - - /** - * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。 - * - * @return 随机生成的 {@code UUID} - */ - public static UUID fastUuid() - { - return randomUuid(false); - } - - /** - * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。 - * - * @return 随机生成的 {@code UUID} - */ - public static UUID randomUuid() - { - return randomUuid(true); - } - - /** - * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。 - * - * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能 - * @return 随机生成的 {@code UUID} - */ - public static UUID randomUuid(boolean isSecure) - { - final Random ng = isSecure ? Holder.NUMBERGENERATOR : getRandom(); - - byte[] randomBytes = new byte[16]; - ng.nextBytes(randomBytes); - randomBytes[6] &= 0x0f; /* clear version */ - randomBytes[6] |= 0x40; /* set to version 4 */ - randomBytes[8] &= 0x3f; /* clear variant */ - randomBytes[8] |= 0x80; /* set to IETF variant */ - return new UUID(randomBytes); - } - - /** - * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。 - * - * @param name 用于构造 UUID 的字节数组。 - * - * @return 根据指定数组生成的 {@code UUID} - */ - public static UUID nameUuidFromBytes(byte[] name) - { - MessageDigest md; - try - { - md = MessageDigest.getInstance("MD5"); - } - catch (NoSuchAlgorithmException nsae) - { - throw new InternalError("MD5 not supported"); - } - byte[] md5Bytes = md.digest(name); - md5Bytes[6] &= 0x0f; /* clear version */ - md5Bytes[6] |= 0x30; /* set to version 3 */ - md5Bytes[8] &= 0x3f; /* clear variant */ - md5Bytes[8] |= 0x80; /* set to IETF variant */ - return new UUID(md5Bytes); - } - - /** - * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。 - * - * @param name 指定 {@code UUID} 字符串 - * @return 具有指定值的 {@code UUID} - * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常 - * - */ - public static UUID fromString(String name) - { - String[] components = name.split("-"); - if (components.length != 5) - { - throw new IllegalArgumentException("Invalid UUID string: " + name); - } - for (int i = 0; i < 5; i++) - { - components[i] = "0x" + components[i]; - } - - long mostSigBits = Long.decode(components[0]).longValue(); - mostSigBits <<= 16; - mostSigBits |= Long.decode(components[1]).longValue(); - mostSigBits <<= 16; - mostSigBits |= Long.decode(components[2]).longValue(); - - long leastSigBits = Long.decode(components[3]).longValue(); - leastSigBits <<= 48; - leastSigBits |= Long.decode(components[4]).longValue(); - - return new UUID(mostSigBits, leastSigBits); - } - - /** - * 返回此 UUID 的 128 位值中的最低有效 64 位。 - * - * @return 此 UUID 的 128 位值中的最低有效 64 位。 - */ - public long getLeastSignificantBits() - { - return leastSigBits; - } - - /** - * 返回此 UUID 的 128 位值中的最高有效 64 位。 - * - * @return 此 UUID 的 128 位值中最高有效 64 位。 - */ - public long getMostSignificantBits() - { - return mostSigBits; - } - - /** - * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。 - *

- * 版本号具有以下含意: - *

    - *
  • 1 基于时间的 UUID - *
  • 2 DCE 安全 UUID - *
  • 3 基于名称的 UUID - *
  • 4 随机生成的 UUID - *
- * - * @return 此 {@code UUID} 的版本号 - */ - public int version() - { - // Version is bits masked by 0x000000000000F000 in MS long - return (int) ((mostSigBits >> 12) & 0x0f); - } - - /** - * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。 - *

- * 变体号具有以下含意： - *

    - *
  • 0 为 NCS 向后兼容保留 - *
  • 2 IETF RFC 4122(Leach-Salz), 用于此类 - *
  • 6 保留，微软向后兼容 - *
  • 7 保留供以后定义使用 - *
- * - * @return 此 {@code UUID} 相关联的变体号 - */ - public int variant() - { - // This field is composed of a varying number of bits. - // 0 - - Reserved for NCS backward compatibility - // 1 0 - The IETF aka Leach-Salz variant (used by this class) - // 1 1 0 Reserved, Microsoft backward compatibility - // 1 1 1 Reserved for future definition. - return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63)); - } - - /** - * 与此 UUID 相关联的时间戳值。 - * - *

- * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。
- * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。 - * - *

- * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。
- * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。 - * - * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。 - */ - public long timestamp() throws UnsupportedOperationException - { - checkTimeBase(); - return (mostSigBits & 0x0FFFL) << 48// - | ((mostSigBits >> 16) & 0x0FFFFL) << 32// - | mostSigBits >>> 32; - } - - /** - * 与此 UUID 相关联的时钟序列值。 - * - *

- * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。 - *

- * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出 - * UnsupportedOperationException。 - * - * @return 此 {@code UUID} 的时钟序列 - * - * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 - */ - public int clockSequence() throws UnsupportedOperationException - { - checkTimeBase(); - return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48); - } - - /** - * 与此 UUID 相关的节点值。 - * - *

- * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。 - *

- * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。
- * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。 - * - * @return 此 {@code UUID} 的节点值 - * - * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 - */ - public long node() throws UnsupportedOperationException - { - checkTimeBase(); - return leastSigBits & 0x0000FFFFFFFFFFFFL; - } - - /** - * 返回此{@code UUID} 的字符串表现形式。 - * - *

- * UUID 的字符串表示形式由此 BNF 描述： - * - * 

-     * {@code
-     * UUID                   = ----
-     * time_low               = 4*
-     * time_mid               = 2*
-     * time_high_and_version  = 2*
-     * variant_and_sequence   = 2*
-     * node                   = 6*
-     * hexOctet               = 
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     *
- * - * - * - * @return 此{@code UUID} 的字符串表现形式 - * @see #toString(boolean) - */ - @Override - public String toString() - { - return toString(false); - } - - /** - * 返回此{@code UUID} 的字符串表现形式。 - * - *

- * UUID 的字符串表示形式由此 BNF 描述： - * - * 

-     * {@code
-     * UUID                   = ----
-     * time_low               = 4*
-     * time_mid               = 2*
-     * time_high_and_version  = 2*
-     * variant_and_sequence   = 2*
-     * node                   = 6*
-     * hexOctet               = 
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     *
- * - * - * - * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串 - * @return 此{@code UUID} 的字符串表现形式 - */ - public String toString(boolean isSimple) - { - final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36); - // time_low - builder.append(digits(mostSigBits >> 32, 8)); - if (false == isSimple) - { - builder.append('-'); - } - // time_mid - builder.append(digits(mostSigBits >> 16, 4)); - if (false == isSimple) - { - builder.append('-'); - } - // time_high_and_version - builder.append(digits(mostSigBits, 4)); - if (false == isSimple) - { - builder.append('-'); - } - // variant_and_sequence - builder.append(digits(leastSigBits >> 48, 4)); - if (false == isSimple) - { - builder.append('-'); - } - // node - builder.append(digits(leastSigBits, 12)); - - return builder.toString(); - } - - /** - * 返回此 UUID 的哈希码。 - * - * @return UUID 的哈希码值。 - */ - @Override - public int hashCode() - { - long hilo = mostSigBits ^ leastSigBits; - return ((int) (hilo >> 32)) ^ (int) hilo; - } - - /** - * 将此对象与指定对象比较。 - *

- * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。 - * - * @param obj 要与之比较的对象 - * - * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false} - */ - @Override - public boolean equals(Object obj) - { - if ((null == obj) || (obj.getClass() != UUID.class)) - { - return false; - } - UUID id = (UUID) obj; - return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits); - } - - // Comparison Operations - - /** - * 将此 UUID 与指定的 UUID 比较。 - * - *

- * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。 - * - * @param val 与此 UUID 比较的 UUID - * - * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。 - * - */ - @Override - public int compareTo(UUID val) - { - // The ordering is intentionally set up so that the UUIDs - // can simply be numerically compared as two numbers - return (this.mostSigBits < val.mostSigBits ? -1 : // - (this.mostSigBits > val.mostSigBits ? 1 : // - (this.leastSigBits < val.leastSigBits ? -1 : // - (this.leastSigBits > val.leastSigBits ? 1 : // - 0)))); - } - - // ------------------------------------------------------------------------------------------------------------------- - // Private method start - /** - * 返回指定数字对应的hex值 - * - * @param val 值 - * @param digits 位 - * @return 值 - */ - private static String digits(long val, int digits) - { - long hi = 1L << (digits * 4); - return Long.toHexString(hi | (val & (hi - 1))).substring(1); - } - - /** - * 检查是否为time-based版本UUID - */ - private void checkTimeBase() - { - if (version() != 1) - { - throw new UnsupportedOperationException("Not a time-based UUID"); - } - } - - /** - * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG) - * - * @return {@link SecureRandom} - */ - public static SecureRandom getSecureRandom() - { - try - { - return SecureRandom.getInstance("SHA1PRNG"); - } - catch (NoSuchAlgorithmException e) - { - throw new UtilException(e); - } - } - - /** - * 获取随机数生成器对象
- * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。 - * - * @return {@link ThreadLocalRandom} - */ - public static ThreadLocalRandom getRandom() - { - return ThreadLocalRandom.current(); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/pom.xml b/exam-online-api-DEL/ruoyi-framework/pom.xml deleted file mode 100644 index 165f1f6..0000000 --- a/exam-online-api-DEL/ruoyi-framework/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.8.6 - - 4.0.0 - - ruoyi-framework - - - framework框架核心 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-aop - - - - - com.alibaba - druid-spring-boot-starter - - - - - com.github.penggle - kaptcha - - - javax.servlet-api - javax.servlet - - - - - - - com.github.binarywang - weixin-java-mp - - - - - com.google.zxing - javase - 3.5.3 - - - - - com.github.oshi - oshi-core - - - - - com.ruoyi - ruoyi-system - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java deleted file mode 100644 index 92425c2..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.ruoyi.framework.aspectj; - -import java.lang.reflect.Method; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.Signature; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.web.service.TokenService; - -/** - * 数据过滤处理 - * - * @author ruoyi - */ -@Aspect -@Component -public class DataScopeAspect -{ - /** - * 全部数据权限 - */ - public static final String DATA_SCOPE_ALL = "1"; - - /** - * 自定数据权限 - */ - public static final String DATA_SCOPE_CUSTOM = "2"; - - /** - * 部门数据权限 - */ - public static final String DATA_SCOPE_DEPT = "3"; - - /** - * 部门及以下数据权限 - */ - public static final String DATA_SCOPE_DEPT_AND_CHILD = "4"; - - /** - * 仅本人数据权限 - */ - public static final String DATA_SCOPE_SELF = "5"; - - /** - * 数据权限过滤关键字 - */ - public static final String DATA_SCOPE = "dataScope"; - - // 配置织入点 - @Pointcut("@annotation(com.ruoyi.common.annotation.DataScope)") - public void dataScopePointCut() - { - } - - @Before("dataScopePointCut()") - public void doBefore(JoinPoint point) throws Throwable - { - clearDataScope(point); - handleDataScope(point); - } - - protected void handleDataScope(final JoinPoint joinPoint) - { - // 获得注解 - DataScope controllerDataScope = getAnnotationLog(joinPoint); - if (controllerDataScope == null) - { - return; - } - // 获取当前的用户 - LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest()); - if (StringUtils.isNotNull(loginUser)) - { - SysUser currentUser = loginUser.getUser(); - // 如果是超级管理员，则不过滤数据 - if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) - { - dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), - controllerDataScope.userAlias()); - } - } - } - - /** - * 数据范围过滤 - * - * @param joinPoint 切点 - * @param user 用户 - * @param userAlias 别名 - */ - public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) - { - StringBuilder sqlString = new StringBuilder(); - - for (SysRole role : user.getRoles()) - { - String dataScope = role.getDataScope(); - if (DATA_SCOPE_ALL.equals(dataScope)) - { - sqlString = new StringBuilder(); - break; - } - else if (DATA_SCOPE_CUSTOM.equals(dataScope)) - { - sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, - role.getRoleId())); - } - else if (DATA_SCOPE_DEPT.equals(dataScope)) - { - sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); - } - else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) - { - sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} )", - deptAlias, user.getDeptId(), user.getDeptId())); - } - else if (DATA_SCOPE_SELF.equals(dataScope)) - { - if (StringUtils.isNotBlank(userAlias)) - { - sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); - } - else - { - // 数据权限为仅本人且没有userAlias别名不查询任何数据 - sqlString.append(" OR 1=0 "); - } - } - } - - if (StringUtils.isNotBlank(sqlString.toString())) - { - Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) - { - BaseEntity baseEntity = (BaseEntity) params; - baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); - } - } - } - - /** - * 是否存在注解，如果存在就获取 - */ - private DataScope getAnnotationLog(JoinPoint joinPoint) - { - Signature signature = joinPoint.getSignature(); - MethodSignature methodSignature = (MethodSignature) signature; - Method method = methodSignature.getMethod(); - - if (method != null) - { - return method.getAnnotation(DataScope.class); - } - return null; - } - - /** - * 拼接权限sql前先清空params.dataScope参数防止注入 - */ - private void clearDataScope(final JoinPoint joinPoint) - { - Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) - { - BaseEntity baseEntity = (BaseEntity) params; - baseEntity.getParams().put(DATA_SCOPE, ""); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java deleted file mode 100644 index 8c2c9f4..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.ruoyi.framework.aspectj; - -import java.util.Objects; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; - -/** - * 多数据源处理 - * - * @author ruoyi - */ -@Aspect -@Order(1) -@Component -public class DataSourceAspect -{ - protected Logger logger = LoggerFactory.getLogger(getClass()); - - @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" - + "|| @within(com.ruoyi.common.annotation.DataSource)") - public void dsPointCut() - { - - } - - @Around("dsPointCut()") - public Object around(ProceedingJoinPoint point) throws Throwable - { - DataSource dataSource = getDataSource(point); - - if (StringUtils.isNotNull(dataSource)) - { - DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name()); - } - - try - { - return point.proceed(); - } - finally - { - // 销毁数据源 在执行方法之后 - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } - - /** - * 获取需要切换的数据源 - */ - public DataSource getDataSource(ProceedingJoinPoint point) - { - MethodSignature signature = (MethodSignature) point.getSignature(); - DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class); - if (Objects.nonNull(dataSource)) - { - return dataSource; - } - - return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java deleted file mode 100644 index 73f8a30..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ /dev/null @@ -1,256 +0,0 @@ -package com.ruoyi.framework.aspectj; - -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.Signature; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.HandlerMapping; -import com.alibaba.fastjson.JSON; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.domain.SysOperLog; - -/** - * 操作日志记录处理 - * - * @author ruoyi - */ -@Aspect -@Component -public class LogAspect -{ - private static final Logger log = LoggerFactory.getLogger(LogAspect.class); - - // 配置织入点 - @Pointcut("@annotation(com.ruoyi.common.annotation.Log)") - public void logPointCut() - { - } - - /** - * 处理完请求后执行 - * - * @param joinPoint 切点 - */ - @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult") - public void doAfterReturning(JoinPoint joinPoint, Object jsonResult) - { - handleLog(joinPoint, null, jsonResult); - } - - /** - * 拦截异常操作 - * - * @param joinPoint 切点 - * @param e 异常 - */ - @AfterThrowing(value = "logPointCut()", throwing = "e") - public void doAfterThrowing(JoinPoint joinPoint, Exception e) - { - handleLog(joinPoint, e, null); - - } - - protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult) - { - try - { - // 获得注解 - Log controllerLog = getAnnotationLog(joinPoint); - if (controllerLog == null) - { - return; - } - - // 获取当前的用户 - LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest()); - - - // *========数据库日志=========*// - SysOperLog operLog = new SysOperLog(); - operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); - // 请求的地址 - String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); - operLog.setOperIp(ip); - // 返回参数 - operLog.setJsonResult(JSON.toJSONString(jsonResult)); - - operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); - if (loginUser != null) - { - operLog.setOperName(loginUser.getUsername()); - } - - - if (e != null) - { - operLog.setStatus(BusinessStatus.FAIL.ordinal()); - operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); - } - else - { - // operLog.setStatus(BusinessStatus.FAIL.); - operLog.setErrorMsg(""); - } - - // 这里把部门名称置空串 - operLog.setDeptName(""); - // 设置方法名称 - String className = joinPoint.getTarget().getClass().getName(); - String methodName = joinPoint.getSignature().getName(); - operLog.setMethod(className + "." + methodName + "()"); - // 设置请求方式 - operLog.setRequestMethod(ServletUtils.getRequest().getMethod()); - // 处理设置注解上的参数 - getControllerMethodDescription(joinPoint, controllerLog, operLog); - // 保存数据库 - - AsyncManager.me().execute(AsyncFactory.recordOper(operLog)); - } - catch (Exception exp) - { - // 记录本地异常日志 - log.error("==前置通知异常=="); - log.error("异常信息:{}", exp.getMessage()); - exp.printStackTrace(); - } - } - - /** - * 获取注解中对方法的描述信息 用于Controller层注解 - * - * @param log 日志 - * @param operLog 操作日志 - * @throws Exception - */ - public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception - { - // 设置action动作 - operLog.setBusinessType(log.businessType().ordinal()); - // 设置标题 - operLog.setTitle(log.title()); - // 设置操作人类别 - operLog.setOperatorType(log.operatorType().ordinal()); - // 是否需要保存request，参数和值 - if (log.isSaveRequestData()) - { - // 获取参数的信息，传入到数据库中。 - setRequestValue(joinPoint, operLog); - } - } - - /** - * 获取请求的参数，放到log中 - * - * @param operLog 操作日志 - * @throws Exception 异常 - */ - private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception - { - String requestMethod = operLog.getRequestMethod(); - if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) - { - String params = argsArrayToString(joinPoint.getArgs()); - operLog.setOperParam(StringUtils.substring(params, 0, 2000)); - } - else - { - Map paramsMap = (Map) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); - operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000)); - } - } - - /** - * 是否存在注解，如果存在就获取 - */ - private Log getAnnotationLog(JoinPoint joinPoint) throws Exception - { - Signature signature = joinPoint.getSignature(); - MethodSignature methodSignature = (MethodSignature) signature; - Method method = methodSignature.getMethod(); - - if (method != null) - { - return method.getAnnotation(Log.class); - } - return null; - } - - /** - * 参数拼装 - */ - private String argsArrayToString(Object[] paramsArray) - { - String params = ""; - if (paramsArray != null && paramsArray.length > 0) - { - for (int i = 0; i < paramsArray.length; i++) - { - if (StringUtils.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i])) - { - Object jsonObj = JSON.toJSON(paramsArray[i]); - params += jsonObj.toString() + " "; - } - } - } - return params.trim(); - } - - /** - * 判断是否需要过滤的对象。 - * - * @param o 对象信息。 - * @return 如果是需要过滤的对象，则返回true；否则返回false。 - */ - @SuppressWarnings("rawtypes") - public boolean isFilterObject(final Object o) - { - Class clazz = o.getClass(); - if (clazz.isArray()) - { - return clazz.getComponentType().isAssignableFrom(MultipartFile.class); - } - else if (Collection.class.isAssignableFrom(clazz)) - { - Collection collection = (Collection) o; - for (Iterator iter = collection.iterator(); iter.hasNext();) - { - return iter.next() instanceof MultipartFile; - } - } - else if (Map.class.isAssignableFrom(clazz)) - { - Map map = (Map) o; - for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) - { - Map.Entry entry = (Map.Entry) iter.next(); - return entry.getValue() instanceof MultipartFile; - } - } - return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse - || o instanceof BindingResult; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java deleted file mode 100644 index ef5d960..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.TimeZone; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.EnableAspectJAutoProxy; - -/** - * 程序注解配置 - * - * @author ruoyi - */ -@Configuration -// 表示通过aop框架暴露该代理对象,AopContext能够访问 -@EnableAspectJAutoProxy(exposeProxy = true) -// 指定要扫描的Mapper类的包的路径 -@MapperScan({"com.ruoyi.**.mapper","com.hig.**.mapper"}) -public class ApplicationConfig -{ - /** - * 时区配置 - */ - @Bean - public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() - { - return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java deleted file mode 100644 index 43e78ae..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.Properties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import com.google.code.kaptcha.impl.DefaultKaptcha; -import com.google.code.kaptcha.util.Config; -import static com.google.code.kaptcha.Constants.*; - -/** - * 验证码配置 - * - * @author ruoyi - */ -@Configuration -public class CaptchaConfig -{ - @Bean(name = "captchaProducer") - public DefaultKaptcha getKaptchaBean() - { - DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); - Properties properties = new Properties(); - // 是否有边框 默认为true 我们可以自己设置yes，no - properties.setProperty(KAPTCHA_BORDER, "yes"); - // 验证码文本字符颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black"); - // 验证码图片宽度 默认为200 - properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); - // 验证码图片高度 默认为50 - properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); - // 验证码文本字符大小 默认为40 - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38"); - // KAPTCHA_SESSION_KEY - properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode"); - // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); - // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); - // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy - properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); - Config config = new Config(properties); - defaultKaptcha.setConfig(config); - return defaultKaptcha; - } - - @Bean(name = "captchaProducerMath") - public DefaultKaptcha getKaptchaBeanMath() - { - DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); - Properties properties = new Properties(); - // 是否有边框 默认为true 我们可以自己设置yes，no - properties.setProperty(KAPTCHA_BORDER, "yes"); - // 边框颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90"); - // 验证码文本字符颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue"); - // 验证码图片宽度 默认为200 - properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); - // 验证码图片高度 默认为50 - properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); - // 验证码文本字符大小 默认为40 - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35"); - // KAPTCHA_SESSION_KEY - properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); - // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator"); - // 验证码文本字符间距 默认为2 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); - // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6"); - // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); - // 验证码噪点颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_NOISE_COLOR, "white"); - // 干扰实现类 - properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise"); - // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy - properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); - Config config = new Config(properties); - defaultKaptcha.setConfig(config); - return defaultKaptcha; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java deleted file mode 100644 index f6abac1..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.ruoyi.framework.config; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.sql.DataSource; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; -import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; -import com.alibaba.druid.util.Utils; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; - -/** - * druid 配置多数据源 - * - * @author ruoyi - */ -@Configuration -public class DruidConfig -{ - @Bean - @ConfigurationProperties("spring.datasource.druid.master") - public DataSource masterDataSource(DruidProperties druidProperties) - { - DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); - return druidProperties.dataSource(dataSource); - } - - @Bean - @ConfigurationProperties("spring.datasource.druid.slave") - @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true") - public DataSource slaveDataSource(DruidProperties druidProperties) - { - DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); - return druidProperties.dataSource(dataSource); - } - - @Bean(name = "dynamicDataSource") - @Primary - public DynamicDataSource dataSource(DataSource masterDataSource) - { - Map targetDataSources = new HashMap<>(); - targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource); - setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource"); - return new DynamicDataSource(masterDataSource, targetDataSources); - } - - /** - * 设置数据源 - * - * @param targetDataSources 备选数据源集合 - * @param sourceName 数据源名称 - * @param beanName bean名称 - */ - public void setDataSource(Map targetDataSources, String sourceName, String beanName) - { - try - { - DataSource dataSource = SpringUtils.getBean(beanName); - targetDataSources.put(sourceName, dataSource); - } - catch (Exception e) - { - } - } - - /** - * 去除监控页面底部的广告 - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Bean - @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true") - public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) - { - // 获取web监控页面的参数 - DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); - // 提取common.js的配置路径 - String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*"; - String commonJsPattern = pattern.replaceAll("\\*", "js/common.js"); - final String filePath = "support/http/resources/js/common.js"; - // 创建filter进行过滤 - Filter filter = new Filter() - { - @Override - public void init(javax.servlet.FilterConfig filterConfig) throws ServletException - { - } - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException - { - chain.doFilter(request, response); - // 重置缓冲区，响应头不会被重置 - response.resetBuffer(); - // 获取common.js - String text = Utils.readFromResource(filePath); - // 正则替换banner, 除去底部的广告信息 - text = text.replaceAll("
", ""); - text = text.replaceAll("powered.*?shrek.wang", ""); - response.getWriter().write(text); - } - @Override - public void destroy() - { - } - }; - FilterRegistrationBean registrationBean = new FilterRegistrationBean(); - registrationBean.setFilter(filter); - registrationBean.addUrlPatterns(commonJsPattern); - return registrationBean; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java deleted file mode 100644 index 59812ea..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.ruoyi.framework.config; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.type.TypeFactory; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.data.redis.serializer.SerializationException; -import com.alibaba.fastjson.parser.ParserConfig; -import org.springframework.util.Assert; -import java.nio.charset.Charset; - -/** - * Redis使用FastJson序列化 - * - * @author ruoyi - */ -public class FastJson2JsonRedisSerializer implements RedisSerializer -{ - @SuppressWarnings("unused") - private ObjectMapper objectMapper = new ObjectMapper(); - - public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); - - private Class clazz; - - static - { - ParserConfig.getGlobalInstance().setAutoTypeSupport(true); - } - - public FastJson2JsonRedisSerializer(Class clazz) - { - super(); - this.clazz = clazz; - } - - @Override - public byte[] serialize(T t) throws SerializationException - { - if (t == null) - { - return new byte[0]; - } - return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET); - } - - @Override - public T deserialize(byte[] bytes) throws SerializationException - { - if (bytes == null || bytes.length <= 0) - { - return null; - } - String str = new String(bytes, DEFAULT_CHARSET); - - return JSON.parseObject(str, clazz); - } - - public void setObjectMapper(ObjectMapper objectMapper) - { - Assert.notNull(objectMapper, "'objectMapper' must not be null"); - this.objectMapper = objectMapper; - } - - protected JavaType getJavaType(Class clazz) - { - return TypeFactory.defaultInstance().constructType(clazz); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java deleted file mode 100644 index b5f03ec..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.HashMap; -import java.util.Map; -import javax.servlet.DispatcherType; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; - -/** - * Filter配置 - * - * @author ruoyi - */ -@Configuration -public class FilterConfig -{ - @Value("${xss.enabled}") - private String enabled; - - @Value("${xss.excludes}") - private String excludes; - - @Value("${xss.urlPatterns}") - private String urlPatterns; - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Bean - public FilterRegistrationBean xssFilterRegistration() - { - FilterRegistrationBean registration = new FilterRegistrationBean(); - registration.setDispatcherTypes(DispatcherType.REQUEST); - registration.setFilter(new XssFilter()); - registration.addUrlPatterns(StringUtils.split(urlPatterns, ",")); - registration.setName("xssFilter"); - registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE); - Map initParameters = new HashMap(); - initParameters.put("excludes", excludes); - initParameters.put("enabled", enabled); - registration.setInitParameters(initParameters); - return registration; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Bean - public FilterRegistrationBean someFilterRegistration() - { - FilterRegistrationBean registration = new FilterRegistrationBean(); - registration.setFilter(new RepeatableFilter()); - registration.addUrlPatterns("/*"); - registration.setName("repeatableFilter"); - registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE); - return registration; - } - -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java deleted file mode 100644 index 3e74580..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.Random; -import com.google.code.kaptcha.text.impl.DefaultTextCreator; - -/** - * 验证码文本生成器 - * - * @author ruoyi - */ -public class KaptchaTextCreator extends DefaultTextCreator -{ - private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(","); - - @Override - public String getText() - { - Integer result = 0; - Random random = new Random(); - int x = random.nextInt(10); - int y = random.nextInt(10); - StringBuilder suChinese = new StringBuilder(); - int randomoperands = (int) Math.round(Math.random() * 2); - if (randomoperands == 0) - { - result = x * y; - suChinese.append(CNUMBERS[x]); - suChinese.append("*"); - suChinese.append(CNUMBERS[y]); - } - else if (randomoperands == 1) - { - if (!(x == 0) && y % x == 0) - { - result = y / x; - suChinese.append(CNUMBERS[y]); - suChinese.append("/"); - suChinese.append(CNUMBERS[x]); - } - else - { - result = x + y; - suChinese.append(CNUMBERS[x]); - suChinese.append("+"); - suChinese.append(CNUMBERS[y]); - } - } - else if (randomoperands == 2) - { - if (x >= y) - { - result = x - y; - suChinese.append(CNUMBERS[x]); - suChinese.append("-"); - suChinese.append(CNUMBERS[y]); - } - else - { - result = y - x; - suChinese.append(CNUMBERS[y]); - suChinese.append("-"); - suChinese.append(CNUMBERS[x]); - } - } - else - { - result = x + y; - suChinese.append(CNUMBERS[x]); - suChinese.append("+"); - suChinese.append(CNUMBERS[y]); - } - suChinese.append("=?@" + result); - return suChinese.toString(); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java deleted file mode 100644 index 057c941..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.ruoyi.framework.config; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import javax.sql.DataSource; -import org.apache.ibatis.io.VFS; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.util.ClassUtils; -import com.ruoyi.common.utils.StringUtils; - -/** - * Mybatis支持*匹配扫描包 - * - * @author ruoyi - */ -@Configuration -public class MyBatisConfig -{ - @Autowired - private Environment env; - - static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; - - public static String setTypeAliasesPackage(String typeAliasesPackage) - { - ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); - MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); - List allResult = new ArrayList(); - try - { - for (String aliasesPackage : typeAliasesPackage.split(",")) - { - List result = new ArrayList(); - aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; - Resource[] resources = resolver.getResources(aliasesPackage); - if (resources != null && resources.length > 0) - { - MetadataReader metadataReader = null; - for (Resource resource : resources) - { - if (resource.isReadable()) - { - metadataReader = metadataReaderFactory.getMetadataReader(resource); - try - { - result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - } - } - } - } - if (result.size() > 0) - { - HashSet hashResult = new HashSet(result); - allResult.addAll(hashResult); - } - } - if (allResult.size() > 0) - { - typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); - } - else - { - throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); - } - } - catch (IOException e) - { - e.printStackTrace(); - } - return typeAliasesPackage; - } - - public Resource[] resolveMapperLocations(String[] mapperLocations) - { - ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); - List resources = new ArrayList(); - if (mapperLocations != null) - { - for (String mapperLocation : mapperLocations) - { - try - { - Resource[] mappers = resourceResolver.getResources(mapperLocation); - resources.addAll(Arrays.asList(mappers)); - } - catch (IOException e) - { - // ignore - } - } - } - return resources.toArray(new Resource[resources.size()]); - } - - @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception - { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java deleted file mode 100644 index f97aa65..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ruoyi.framework.config; - -import org.springframework.cache.annotation.CachingConfigurerSupport; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; - -/** - * redis配置 - * - * @author ruoyi - */ -@Configuration -@EnableCaching -public class RedisConfig extends CachingConfigurerSupport -{ - @Bean - @SuppressWarnings(value = { "unchecked", "rawtypes" }) - public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) - { - RedisTemplate template = new RedisTemplate<>(); - template.setConnectionFactory(connectionFactory); - - FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class); - - ObjectMapper mapper = new ObjectMapper(); - mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); - serializer.setObjectMapper(mapper); - - template.setValueSerializer(serializer); - // 使用StringRedisSerializer来序列化和反序列化redis的key值 - template.setKeySerializer(new StringRedisSerializer()); - template.afterPropertiesSet(); - return template; - } - -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java deleted file mode 100644 index 13b844c..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.ruoyi.framework.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.interceptor.AbstractRepeatSubmitInterceptor; - -/** - * 通用配置 - * - * @author ruoyi - */ -@Configuration -public class ResourcesConfig implements WebMvcConfigurer -{ - @Autowired - private AbstractRepeatSubmitInterceptor repeatSubmitInterceptor; - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) - { - /** 本地文件上传路径 */ - registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); - - /** 轮播图上传路径 */ - registry.addResourceHandler("/photo/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/photo/"); - - /** swagger配置 */ - registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/"); - } - - /** - * 自定义拦截规则 - */ - @Override - public void addInterceptors(InterceptorRegistry registry) - { - registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**"); - } - - /** - * 跨域配置 - */ - @Bean - public CorsFilter corsFilter() - { - CorsConfiguration config = new CorsConfiguration(); - config.setAllowCredentials(true); - // 设置访问源地址 - config.addAllowedOriginPattern("*"); - // 设置访问源请求头 - config.addAllowedHeader("*"); - // 设置访问源请求方法 - config.addAllowedMethod("*"); - // 有效期 1800秒 - config.setMaxAge(1800L); - // 添加映射路径，拦截一切请求 - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", config); - // 返回新的CorsFilter - return new CorsFilter(source); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java deleted file mode 100644 index 68d6b0a..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.ruoyi.framework.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.security.web.authentication.logout.LogoutFilter; -import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; - -/** - * spring security配置 - * - * @author ruoyi - */ -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) -public class SecurityConfig extends WebSecurityConfigurerAdapter -{ - /** - * 自定义用户认证逻辑 - */ - @Autowired - private UserDetailsService userDetailsService; - - /** - * 认证失败处理类 - */ - @Autowired - private AuthenticationEntryPointImpl unauthorizedHandler; - - /** - * 退出处理类 - */ - @Autowired - private LogoutSuccessHandlerImpl logoutSuccessHandler; - - /** - * token认证过滤器 - */ - @Autowired - private JwtAuthenticationTokenFilter authenticationTokenFilter; - - /** - * 跨域过滤器 - */ - @Autowired - private CorsFilter corsFilter; - - /** - * 解决 无法直接注入 AuthenticationManager - * - * @return - * @throws Exception - */ - @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception - { - return super.authenticationManagerBean(); - } - - /** - * anyRequest | 匹配所有请求路径 - * access | SpringEl表达式结果为true时可以访问 - * anonymous | 匿名可以访问 - * denyAll | 用户不能访问 - * fullyAuthenticated | 用户完全认证可以访问（非remember-me下自动登录） - * hasAnyAuthority | 如果有参数，参数表示权限，则其中任何一个权限可以访问 - * hasAnyRole | 如果有参数，参数表示角色，则其中任何一个角色可以访问 - * hasAuthority | 如果有参数，参数表示权限，则其权限可以访问 - * hasIpAddress | 如果有参数，参数表示IP地址，如果用户IP和参数匹配，则可以访问 - * hasRole | 如果有参数，参数表示角色，则其角色可以访问 - * permitAll | 用户可以任意访问 - * rememberMe | 允许通过remember-me登录的用户访问 - * authenticated | 用户登录后可访问 - */ - @Override - protected void configure(HttpSecurity httpSecurity) throws Exception - { - httpSecurity - // CSRF禁用，因为不使用session - .csrf().disable() - // 认证失败处理类 - .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and() - // 基于token，所以不需要session - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() - // 过滤请求 - .authorizeRequests() - // 对于登录login 验证码captchaImage 允许匿名访问 - .antMatchers("/login", "/captchaImage").anonymous() - // 微信登录相关接口允许匿名访问 - .antMatchers("/wechat/**").anonymous() - .antMatchers( - HttpMethod.GET, - "/", - "/*.html", - "/**/*.html", - "/**/*.css", - "/**/*.js", - "/profile/**" - ).permitAll() - .antMatchers("/photo/**").anonymous() - .antMatchers("/ueditor/**").anonymous() - .antMatchers("/fms/photo/add/**").anonymous() - .antMatchers("/fms/files/chunkupload/**").anonymous() - .antMatchers("/common/download**").anonymous() - .antMatchers("/common/download/resource**").anonymous() - .antMatchers("/swagger-ui.html").anonymous() - .antMatchers("/swagger-resources/**").anonymous() - .antMatchers("/webjars/**").anonymous() - .antMatchers("/*/api-docs").anonymous() - .antMatchers("/druid/**").anonymous() - // 除上面外的所有请求全部需要鉴权认证 - .anyRequest().authenticated() - .and() - .headers().frameOptions().disable(); - httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler); - // 添加JWT filter - httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class); - // 添加CORS filter - httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class); - httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class); - } - - - /** - * 强散列哈希加密实现 - */ - @Bean - public BCryptPasswordEncoder bCryptPasswordEncoder() - { - return new BCryptPasswordEncoder(); - } - - /** - * 身份认证接口 - */ - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception - { - auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder()); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java deleted file mode 100644 index b5b7de3..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.ruoyi.framework.config; - -import javax.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; - -/** - * 服务相关配置 - * - * @author ruoyi - */ -@Component -public class ServerConfig -{ - /** - * 获取完整的请求路径，包括：域名，端口，上下文访问路径 - * - * @return 服务地址 - */ - public String getUrl() - { - HttpServletRequest request = ServletUtils.getRequest(); - return getDomain(request); - } - - public static String getDomain(HttpServletRequest request) - { - StringBuffer url = request.getRequestURL(); - String contextPath = request.getServletContext().getContextPath(); - return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java deleted file mode 100644 index 0d67c22..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.ThreadPoolExecutor; -import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import com.ruoyi.common.utils.Threads; - -/** - * 线程池配置 - * - * @author ruoyi - **/ -@Configuration -public class ThreadPoolConfig -{ - // 核心线程池大小 - private int corePoolSize = 50; - - // 最大可创建的线程数 - private int maxPoolSize = 200; - - // 队列最大长度 - private int queueCapacity = 1000; - - // 线程池维护线程所允许的空闲时间 - private int keepAliveSeconds = 300; - - @Bean(name = "threadPoolTaskExecutor") - public ThreadPoolTaskExecutor threadPoolTaskExecutor() - { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setMaxPoolSize(maxPoolSize); - executor.setCorePoolSize(corePoolSize); - executor.setQueueCapacity(queueCapacity); - executor.setKeepAliveSeconds(keepAliveSeconds); - // 线程池对拒绝任务(无线程可用)的处理策略 - executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); - return executor; - } - - /** - * 执行周期性或定时任务 - */ - @Bean(name = "scheduledExecutorService") - protected ScheduledExecutorService scheduledExecutorService() - { - return new ScheduledThreadPoolExecutor(corePoolSize, - new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build()) - { - @Override - protected void afterExecute(Runnable r, Throwable t) - { - super.afterExecute(r, t); - Threads.printException(r, t); - } - }; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/WechatConfig.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/WechatConfig.java deleted file mode 100644 index 3e22581..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/WechatConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.framework.config; - -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; -import me.chanjar.weixin.mp.config.WxMpConfigStorage; -import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 微信配置 - * - * @author ruoyi - */ -@Configuration -@EnableConfigurationProperties(WechatProperties.class) -public class WechatConfig -{ - @Autowired - private WechatProperties wechatProperties; - - @Bean - public WxMpConfigStorage wxMpConfigStorage() - { - WxMpDefaultConfigImpl configStorage = new WxMpDefaultConfigImpl(); - configStorage.setAppId(wechatProperties.getAppId()); - configStorage.setSecret(wechatProperties.getAppSecret()); - return configStorage; - } - - @Bean - public WxMpService wxMpService(WxMpConfigStorage configStorage) - { - WxMpService wxMpService = new WxMpServiceImpl(); - wxMpService.setWxMpConfigStorage(configStorage); - return wxMpService; - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/WechatProperties.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/WechatProperties.java deleted file mode 100644 index 62c6f81..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/WechatProperties.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.ruoyi.framework.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * 微信配置属性 - * - * @author ruoyi - */ -@Component -@ConfigurationProperties(prefix = "wechat") -public class WechatProperties -{ - /** 微信公众号AppId */ - private String appId; - - /** 微信公众号AppSecret */ - private String appSecret; - - /** 授权回调地址 */ - private String redirectUri; - - /** 二维码场景值前缀 */ - private String qrScenePrefix = "LOGIN_"; - - /** 二维码有效期（秒） */ - private Integer qrExpireTime = 600; - - /** 登录状态检查间隔（毫秒） */ - private Long statusCheckInterval = 2000L; - - public String getAppId() - { - return appId; - } - - public void setAppId(String appId) - { - this.appId = appId; - } - - public String getAppSecret() - { - return appSecret; - } - - public void setAppSecret(String appSecret) - { - this.appSecret = appSecret; - } - - public String getRedirectUri() - { - return redirectUri; - } - - public void setRedirectUri(String redirectUri) - { - this.redirectUri = redirectUri; - } - - public String getQrScenePrefix() - { - return qrScenePrefix; - } - - public void setQrScenePrefix(String qrScenePrefix) - { - this.qrScenePrefix = qrScenePrefix; - } - - public Integer getQrExpireTime() - { - return qrExpireTime; - } - - public void setQrExpireTime(Integer qrExpireTime) - { - this.qrExpireTime = qrExpireTime; - } - - public Long getStatusCheckInterval() - { - return statusCheckInterval; - } - - public void setStatusCheckInterval(Long statusCheckInterval) - { - this.statusCheckInterval = statusCheckInterval; - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java deleted file mode 100644 index 84f7e00..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.ruoyi.framework.config.properties; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import com.alibaba.druid.pool.DruidDataSource; - -/** - * druid 配置属性 - * - * @author ruoyi - */ -@Configuration -public class DruidProperties -{ - @Value("${spring.datasource.druid.initialSize}") - private int initialSize; - - @Value("${spring.datasource.druid.minIdle}") - private int minIdle; - - @Value("${spring.datasource.druid.maxActive}") - private int maxActive; - - @Value("${spring.datasource.druid.maxWait}") - private int maxWait; - - @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}") - private int timeBetweenEvictionRunsMillis; - - @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}") - private int minEvictableIdleTimeMillis; - - @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}") - private int maxEvictableIdleTimeMillis; - - @Value("${spring.datasource.druid.validationQuery}") - private String validationQuery; - - @Value("${spring.datasource.druid.testWhileIdle}") - private boolean testWhileIdle; - - @Value("${spring.datasource.druid.testOnBorrow}") - private boolean testOnBorrow; - - @Value("${spring.datasource.druid.testOnReturn}") - private boolean testOnReturn; - - public DruidDataSource dataSource(DruidDataSource datasource) - { - /** 配置初始化大小、最小、最大 */ - datasource.setInitialSize(initialSize); - datasource.setMaxActive(maxActive); - datasource.setMinIdle(minIdle); - - /** 配置获取连接等待超时的时间 */ - datasource.setMaxWait(maxWait); - - /** 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 */ - datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); - - /** 配置一个连接在池中最小、最大生存的时间，单位是毫秒 */ - datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); - datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis); - - /** - * 用来检测连接是否有效的sql，要求是一个查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。 - */ - datasource.setValidationQuery(validationQuery); - /** 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 */ - datasource.setTestWhileIdle(testWhileIdle); - /** 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */ - datasource.setTestOnBorrow(testOnBorrow); - /** 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */ - datasource.setTestOnReturn(testOnReturn); - return datasource; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java deleted file mode 100644 index e70b8cf..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ruoyi.framework.datasource; - -import java.util.Map; -import javax.sql.DataSource; -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; - -/** - * 动态数据源 - * - * @author ruoyi - */ -public class DynamicDataSource extends AbstractRoutingDataSource -{ - public DynamicDataSource(DataSource defaultTargetDataSource, Map targetDataSources) - { - super.setDefaultTargetDataSource(defaultTargetDataSource); - super.setTargetDataSources(targetDataSources); - super.afterPropertiesSet(); - } - - @Override - protected Object determineCurrentLookupKey() - { - return DynamicDataSourceContextHolder.getDataSourceType(); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java deleted file mode 100644 index 3572db9..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ruoyi.framework.datasource; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * 数据源切换处理 - * - * @author ruoyi - */ -public class DynamicDataSourceContextHolder -{ - public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class); - - /** - * 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本， - * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。 - */ - private static final ThreadLocal CONTEXT_HOLDER = new ThreadLocal<>(); - - /** - * 设置数据源的变量 - */ - public static void setDataSourceType(String dsType) - { - log.info("切换到{}数据源", dsType); - CONTEXT_HOLDER.set(dsType); - } - - /** - * 获得数据源的变量 - */ - public static String getDataSourceType() - { - return CONTEXT_HOLDER.get(); - } - - /** - * 清空数据源变量 - */ - public static void clearDataSourceType() - { - CONTEXT_HOLDER.remove(); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/AbstractRepeatSubmitInterceptor.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/AbstractRepeatSubmitInterceptor.java deleted file mode 100644 index 8a388b4..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/AbstractRepeatSubmitInterceptor.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.ruoyi.framework.interceptor; - -import java.lang.reflect.Method; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.stereotype.Component; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; - -/** - * 防止重复提交拦截器 - * - * @author ruoyi - */ -@Component -public abstract class AbstractRepeatSubmitInterceptor extends HandlerInterceptorAdapter -{ - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception - { - if (handler instanceof HandlerMethod) - { - HandlerMethod handlerMethod = (HandlerMethod) handler; - Method method = handlerMethod.getMethod(); - RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class); - if (annotation != null) - { - if (this.isRepeatSubmit(request)) - { - AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试"); - ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult)); - return false; - } - } - return true; - } - else - { - return super.preHandle(request, response, handler); - } - } - - /** - * 验证是否重复提交由子类实现具体的防重复提交的规则 - * - * @param request - * @return - * @throws Exception - */ - public abstract boolean isRepeatSubmit(HttpServletRequest request); -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java deleted file mode 100644 index ed93df6..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.ruoyi.framework.interceptor.impl; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.framework.interceptor.AbstractRepeatSubmitInterceptor; - -/** - * 判断请求url和数据是否和上一次相同， - * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 - * - * @author ruoyi - */ -@Component -public class SameUrlDataInterceptor extends AbstractRepeatSubmitInterceptor -{ - public final String REPEAT_PARAMS = "repeatParams"; - - public final String REPEAT_TIME = "repeatTime"; - - // 令牌自定义标识 - @Value("${token.header}") - private String header; - - @Autowired - private RedisCache redisCache; - - /** - * 间隔时间，单位:秒 默认10秒 - * - * 两次相同参数的请求，如果间隔时间大于该参数，系统不会认定为重复提交的数据 - */ - private int intervalTime = 10; - - public void setIntervalTime(int intervalTime) - { - this.intervalTime = intervalTime; - } - - @SuppressWarnings("unchecked") - @Override - public boolean isRepeatSubmit(HttpServletRequest request) - { - String nowParams = ""; - if (request instanceof RepeatedlyRequestWrapper) - { - RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request; - nowParams = HttpHelper.getBodyString(repeatedlyRequest); - } - - // body参数为空，获取Parameter的数据 - if (StringUtils.isEmpty(nowParams)) - { - nowParams = JSONObject.toJSONString(request.getParameterMap()); - } - Map nowDataMap = new HashMap(); - nowDataMap.put(REPEAT_PARAMS, nowParams); - nowDataMap.put(REPEAT_TIME, System.currentTimeMillis()); - - // 请求地址（作为存放cache的key值） - String url = request.getRequestURI(); - - // 唯一值（没有消息头则使用请求地址） - String submitKey = request.getHeader(header); - if (StringUtils.isEmpty(submitKey)) - { - submitKey = url; - } - - // 唯一标识（指定key + 消息头） - String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey; - - Object sessionObj = redisCache.getCacheObject(cacheRepeatKey); - if (sessionObj != null) - { - Map sessionMap = (Map) sessionObj; - if (sessionMap.containsKey(url)) - { - Map preDataMap = (Map) sessionMap.get(url); - if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap)) - { - return true; - } - } - } - Map cacheMap = new HashMap(); - cacheMap.put(url, nowDataMap); - redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS); - return false; - } - - /** - * 判断参数是否相同 - */ - private boolean compareParams(Map nowMap, Map preMap) - { - String nowParams = (String) nowMap.get(REPEAT_PARAMS); - String preParams = (String) preMap.get(REPEAT_PARAMS); - return nowParams.equals(preParams); - } - - /** - * 判断两次间隔时间 - */ - private boolean compareTime(Map nowMap, Map preMap) - { - long time1 = (Long) nowMap.get(REPEAT_TIME); - long time2 = (Long) preMap.get(REPEAT_TIME); - if ((time1 - time2) < (this.intervalTime * 1000)) - { - return true; - } - return false; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java deleted file mode 100644 index 7387a02..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.ruoyi.framework.manager; - -import java.util.TimerTask; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.spring.SpringUtils; - -/** - * 异步任务管理器 - * - * @author ruoyi - */ -public class AsyncManager -{ - /** - * 操作延迟10毫秒 - */ - private final int OPERATE_DELAY_TIME = 10; - - /** - * 异步操作任务调度线程池 - */ - private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService"); - - /** - * 单例模式 - */ - private AsyncManager(){} - - private static AsyncManager me = new AsyncManager(); - - public static AsyncManager me() - { - return me; - } - - /** - * 执行任务 - * - * @param task 任务 - */ - public void execute(TimerTask task) - { - executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS); - } - - /** - * 停止任务线程池 - */ - public void shutdown() - { - Threads.shutdownAndAwaitTermination(executor); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java deleted file mode 100644 index e36ca3c..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ruoyi.framework.manager; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import javax.annotation.PreDestroy; - -/** - * 确保应用退出时能关闭后台线程 - * - * @author ruoyi - */ -@Component -public class ShutdownManager -{ - private static final Logger logger = LoggerFactory.getLogger("sys-user"); - - @PreDestroy - public void destroy() - { - shutdownAsyncManager(); - } - - /** - * 停止异步执行任务 - */ - private void shutdownAsyncManager() - { - try - { - logger.info("====关闭后台任务任务线程池===="); - AsyncManager.me().shutdown(); - } - catch (Exception e) - { - logger.error(e.getMessage(), e); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java deleted file mode 100644 index 306ff22..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.framework.manager.factory; - -import java.util.TimerTask; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.LogUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysLogininforService; -import com.ruoyi.system.service.ISysOperLogService; -import eu.bitwalker.useragentutils.UserAgent; - -/** - * 异步工厂（产生任务用） - * - * @author ruoyi - */ -public class AsyncFactory -{ - private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user"); - - /** - * 记录登录信息 - * - * @param username 用户名 - * @param status 状态 - * @param message 消息 - * @param args 列表 - * @return 任务task - */ - public static TimerTask recordLogininfor(final String username, final String status, final String message, - final Object... args) - { - final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); - final String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); - return new TimerTask() - { - @Override - public void run() - { - String address = AddressUtils.getRealAddressByIp(ip); - StringBuilder s = new StringBuilder(); - s.append(LogUtils.getBlock(ip)); - s.append(address); - s.append(LogUtils.getBlock(username)); - s.append(LogUtils.getBlock(status)); - s.append(LogUtils.getBlock(message)); - // 打印信息到日志 - sys_user_logger.info(s.toString(), args); - // 获取客户端操作系统 - String os = userAgent.getOperatingSystem().getName(); - // 获取客户端浏览器 - String browser = userAgent.getBrowser().getName(); - // 封装对象 - SysLogininfor logininfor = new SysLogininfor(); - logininfor.setUserName(username); - logininfor.setIpaddr(ip); - logininfor.setLoginLocation(address); - logininfor.setBrowser(browser); - logininfor.setOs(os); - logininfor.setMsg(message); - // 日志状态 - if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status)) - { - logininfor.setStatus(Constants.SUCCESS); - } - else if (Constants.LOGIN_FAIL.equals(status)) - { - logininfor.setStatus(Constants.FAIL); - } - // 插入数据 - SpringUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor); - - } - }; - } - - /** - * 操作日志记录 - * - * @param operLog 操作日志信息 - * @return 任务task - */ - public static TimerTask recordOper(final SysOperLog operLog) - { - return new TimerTask() - { - @Override - public void run() - { - // 远程查询操作地点 - operLog.setOperLocation(AddressUtils.getRealAddressByIp(operLog.getOperIp())); - // System.out.println("开始写工作日志"); - - SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog); - } - }; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java deleted file mode 100644 index 3eb2495..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ruoyi.framework.security.filter; - -import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; - -/** - * token过滤器 验证token有效性 - * - * @author ruoyi - */ -@Component -public class JwtAuthenticationTokenFilter extends OncePerRequestFilter -{ - @Autowired - private TokenService tokenService; - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException - { - LoginUser loginUser = tokenService.getLoginUser(request); - if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) - { - tokenService.verifyToken(loginUser); - UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities()); - authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); - SecurityContextHolder.getContext().setAuthentication(authenticationToken); - } - chain.doFilter(request, response); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java deleted file mode 100644 index c22dd32..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.ruoyi.framework.security.handle; - -import java.io.IOException; -import java.io.Serializable; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.stereotype.Component; -import com.alibaba.fastjson.JSON; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; - -/** - * 认证失败处理类 返回未授权 - * - * @author ruoyi - */ -@Component -public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable -{ - private static final long serialVersionUID = -8970718410437077606L; - - @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) - throws IOException - { - int code = HttpStatus.UNAUTHORIZED; - String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI()); - ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg))); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java deleted file mode 100644 index e5fc11d..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.ruoyi.framework.security.handle; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.core.Authentication; -import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; -import com.alibaba.fastjson.JSON; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.web.service.TokenService; - -/** - * 自定义退出处理类 返回成功 - * - * @author ruoyi - */ -@Configuration -public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler -{ - @Autowired - private TokenService tokenService; - - /** - * 退出处理 - * - * @return - */ - @Override - public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) - throws IOException, ServletException - { - LoginUser loginUser = tokenService.getLoginUser(request); - if (StringUtils.isNotNull(loginUser)) - { - String userName = loginUser.getUsername(); - // 删除用户缓存记录 - tokenService.delLoginUser(loginUser.getToken()); - // 记录用户退出日志 - AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功")); - } - ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "退出成功"))); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java deleted file mode 100644 index 63b03da..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ /dev/null @@ -1,240 +0,0 @@ -package com.ruoyi.framework.web.domain; - -import java.net.UnknownHostException; -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.web.domain.server.Cpu; -import com.ruoyi.framework.web.domain.server.Jvm; -import com.ruoyi.framework.web.domain.server.Mem; -import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.framework.web.domain.server.SysFile; -import oshi.SystemInfo; -import oshi.hardware.CentralProcessor; -import oshi.hardware.CentralProcessor.TickType; -import oshi.hardware.GlobalMemory; -import oshi.hardware.HardwareAbstractionLayer; -import oshi.software.os.FileSystem; -import oshi.software.os.OSFileStore; -import oshi.software.os.OperatingSystem; -import oshi.util.Util; - -/** - * 服务器相关信息 - * - * @author ruoyi - */ -public class Server -{ - private static final int OSHI_WAIT_SECOND = 1000; - - /** - * CPU相关信息 - */ - private Cpu cpu = new Cpu(); - - /** - * 內存相关信息 - */ - private Mem mem = new Mem(); - - /** - * JVM相关信息 - */ - private Jvm jvm = new Jvm(); - - /** - * 服务器相关信息 - */ - private Sys sys = new Sys(); - - /** - * 磁盘相关信息 - */ - private List sysFiles = new LinkedList(); - - public Cpu getCpu() - { - return cpu; - } - - public void setCpu(Cpu cpu) - { - this.cpu = cpu; - } - - public Mem getMem() - { - return mem; - } - - public void setMem(Mem mem) - { - this.mem = mem; - } - - public Jvm getJvm() - { - return jvm; - } - - public void setJvm(Jvm jvm) - { - this.jvm = jvm; - } - - public Sys getSys() - { - return sys; - } - - public void setSys(Sys sys) - { - this.sys = sys; - } - - public List getSysFiles() - { - return sysFiles; - } - - public void setSysFiles(List sysFiles) - { - this.sysFiles = sysFiles; - } - - public void copyTo() throws Exception - { - SystemInfo si = new SystemInfo(); - HardwareAbstractionLayer hal = si.getHardware(); - - setCpuInfo(hal.getProcessor()); - - setMemInfo(hal.getMemory()); - - setSysInfo(); - - setJvmInfo(); - - setSysFiles(si.getOperatingSystem()); - } - - /** - * 设置CPU信息 - */ - private void setCpuInfo(CentralProcessor processor) - { - // CPU信息 - long[] prevTicks = processor.getSystemCpuLoadTicks(); - Util.sleep(OSHI_WAIT_SECOND); - long[] ticks = processor.getSystemCpuLoadTicks(); - long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()]; - long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()]; - long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()]; - long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()]; - long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()]; - long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()]; - long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()]; - long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()]; - long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal; - cpu.setCpuNum(processor.getLogicalProcessorCount()); - cpu.setTotal(totalCpu); - cpu.setSys(cSys); - cpu.setUsed(user); - cpu.setWait(iowait); - cpu.setFree(idle); - } - - /** - * 设置内存信息 - */ - private void setMemInfo(GlobalMemory memory) - { - mem.setTotal(memory.getTotal()); - mem.setUsed(memory.getTotal() - memory.getAvailable()); - mem.setFree(memory.getAvailable()); - } - - /** - * 设置服务器信息 - */ - private void setSysInfo() - { - Properties props = System.getProperties(); - sys.setComputerName(IpUtils.getHostName()); - sys.setComputerIp(IpUtils.getHostIp()); - sys.setOsName(props.getProperty("os.name")); - sys.setOsArch(props.getProperty("os.arch")); - sys.setUserDir(props.getProperty("user.dir")); - } - - /** - * 设置Java虚拟机 - */ - private void setJvmInfo() throws UnknownHostException - { - Properties props = System.getProperties(); - jvm.setTotal(Runtime.getRuntime().totalMemory()); - jvm.setMax(Runtime.getRuntime().maxMemory()); - jvm.setFree(Runtime.getRuntime().freeMemory()); - jvm.setVersion(props.getProperty("java.version")); - jvm.setHome(props.getProperty("java.home")); - } - - /** - * 设置磁盘信息 - */ - private void setSysFiles(OperatingSystem os) - { - FileSystem fileSystem = os.getFileSystem(); - List fsArray = fileSystem.getFileStores(); - for (OSFileStore fs : fsArray) - { - long free = fs.getUsableSpace(); - long total = fs.getTotalSpace(); - long used = total - free; - SysFile sysFile = new SysFile(); - sysFile.setDirName(fs.getMount()); - sysFile.setSysTypeName(fs.getType()); - sysFile.setTypeName(fs.getName()); - sysFile.setTotal(convertFileSize(total)); - sysFile.setFree(convertFileSize(free)); - sysFile.setUsed(convertFileSize(used)); - sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100)); - sysFiles.add(sysFile); - } - } - - /** - * 字节转换 - * - * @param size 字节大小 - * @return 转换后值 - */ - public String convertFileSize(long size) - { - long kb = 1024; - long mb = kb * 1024; - long gb = mb * 1024; - if (size >= gb) - { - return String.format("%.1f GB", (float) size / gb); - } - else if (size >= mb) - { - float f = (float) size / mb; - return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f); - } - else if (size >= kb) - { - float f = (float) size / kb; - return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f); - } - else - { - return String.format("%d B", size); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java deleted file mode 100644 index a13a66c..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.ruoyi.framework.web.domain.server; - -import com.ruoyi.common.utils.Arith; - -/** - * CPU相关信息 - * - * @author ruoyi - */ -public class Cpu -{ - /** - * 核心数 - */ - private int cpuNum; - - /** - * CPU总的使用率 - */ - private double total; - - /** - * CPU系统使用率 - */ - private double sys; - - /** - * CPU用户使用率 - */ - private double used; - - /** - * CPU当前等待率 - */ - private double wait; - - /** - * CPU当前空闲率 - */ - private double free; - - public int getCpuNum() - { - return cpuNum; - } - - public void setCpuNum(int cpuNum) - { - this.cpuNum = cpuNum; - } - - public double getTotal() - { - return Arith.round(Arith.mul(total, 100), 2); - } - - public void setTotal(double total) - { - this.total = total; - } - - public double getSys() - { - return Arith.round(Arith.mul(sys / total, 100), 2); - } - - public void setSys(double sys) - { - this.sys = sys; - } - - public double getUsed() - { - return Arith.round(Arith.mul(used / total, 100), 2); - } - - public void setUsed(double used) - { - this.used = used; - } - - public double getWait() - { - return Arith.round(Arith.mul(wait / total, 100), 2); - } - - public void setWait(double wait) - { - this.wait = wait; - } - - public double getFree() - { - return Arith.round(Arith.mul(free / total, 100), 2); - } - - public void setFree(double free) - { - this.free = free; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java deleted file mode 100644 index 485d201..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.ruoyi.framework.web.domain.server; - -import java.lang.management.ManagementFactory; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.DateUtils; - -/** - * JVM相关信息 - * - * @author ruoyi - */ -public class Jvm -{ - /** - * 当前JVM占用的内存总数(M) - */ - private double total; - - /** - * JVM最大可用内存总数(M) - */ - private double max; - - /** - * JVM空闲内存(M) - */ - private double free; - - /** - * JDK版本 - */ - private String version; - - /** - * JDK路径 - */ - private String home; - - public double getTotal() - { - return Arith.div(total, (1024 * 1024), 2); - } - - public void setTotal(double total) - { - this.total = total; - } - - public double getMax() - { - return Arith.div(max, (1024 * 1024), 2); - } - - public void setMax(double max) - { - this.max = max; - } - - public double getFree() - { - return Arith.div(free, (1024 * 1024), 2); - } - - public void setFree(double free) - { - this.free = free; - } - - public double getUsed() - { - return Arith.div(total - free, (1024 * 1024), 2); - } - - public double getUsage() - { - return Arith.mul(Arith.div(total - free, total, 4), 100); - } - - /** - * 获取JDK名称 - */ - public String getName() - { - return ManagementFactory.getRuntimeMXBean().getVmName(); - } - - public String getVersion() - { - return version; - } - - public void setVersion(String version) - { - this.version = version; - } - - public String getHome() - { - return home; - } - - public void setHome(String home) - { - this.home = home; - } - - /** - * JDK启动时间 - */ - public String getStartTime() - { - return DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.getServerStartDate()); - } - - /** - * JDK运行时间 - */ - public String getRunTime() - { - return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate()); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java deleted file mode 100644 index 13eec52..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.framework.web.domain.server; - -import com.ruoyi.common.utils.Arith; - -/** - * 內存相关信息 - * - * @author ruoyi - */ -public class Mem -{ - /** - * 内存总量 - */ - private double total; - - /** - * 已用内存 - */ - private double used; - - /** - * 剩余内存 - */ - private double free; - - public double getTotal() - { - return Arith.div(total, (1024 * 1024 * 1024), 2); - } - - public void setTotal(long total) - { - this.total = total; - } - - public double getUsed() - { - return Arith.div(used, (1024 * 1024 * 1024), 2); - } - - public void setUsed(long used) - { - this.used = used; - } - - public double getFree() - { - return Arith.div(free, (1024 * 1024 * 1024), 2); - } - - public void setFree(long free) - { - this.free = free; - } - - public double getUsage() - { - return Arith.mul(Arith.div(used, total, 4), 100); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java deleted file mode 100644 index 45d64d9..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.ruoyi.framework.web.domain.server; - -/** - * 系统相关信息 - * - * @author ruoyi - */ -public class Sys -{ - /** - * 服务器名称 - */ - private String computerName; - - /** - * 服务器Ip - */ - private String computerIp; - - /** - * 项目路径 - */ - private String userDir; - - /** - * 操作系统 - */ - private String osName; - - /** - * 系统架构 - */ - private String osArch; - - public String getComputerName() - { - return computerName; - } - - public void setComputerName(String computerName) - { - this.computerName = computerName; - } - - public String getComputerIp() - { - return computerIp; - } - - public void setComputerIp(String computerIp) - { - this.computerIp = computerIp; - } - - public String getUserDir() - { - return userDir; - } - - public void setUserDir(String userDir) - { - this.userDir = userDir; - } - - public String getOsName() - { - return osName; - } - - public void setOsName(String osName) - { - this.osName = osName; - } - - public String getOsArch() - { - return osArch; - } - - public void setOsArch(String osArch) - { - this.osArch = osArch; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java deleted file mode 100644 index 1320cde..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.ruoyi.framework.web.domain.server; - -/** - * 系统文件相关信息 - * - * @author ruoyi - */ -public class SysFile -{ - /** - * 盘符路径 - */ - private String dirName; - - /** - * 盘符类型 - */ - private String sysTypeName; - - /** - * 文件类型 - */ - private String typeName; - - /** - * 总大小 - */ - private String total; - - /** - * 剩余大小 - */ - private String free; - - /** - * 已经使用量 - */ - private String used; - - /** - * 资源的使用率 - */ - private double usage; - - public String getDirName() - { - return dirName; - } - - public void setDirName(String dirName) - { - this.dirName = dirName; - } - - public String getSysTypeName() - { - return sysTypeName; - } - - public void setSysTypeName(String sysTypeName) - { - this.sysTypeName = sysTypeName; - } - - public String getTypeName() - { - return typeName; - } - - public void setTypeName(String typeName) - { - this.typeName = typeName; - } - - public String getTotal() - { - return total; - } - - public void setTotal(String total) - { - this.total = total; - } - - public String getFree() - { - return free; - } - - public void setFree(String free) - { - this.free = free; - } - - public String getUsed() - { - return used; - } - - public void setUsed(String used) - { - this.used = used; - } - - public double getUsage() - { - return usage; - } - - public void setUsage(double usage) - { - this.usage = usage; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java deleted file mode 100644 index 845c6f2..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.ruoyi.framework.web.exception; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.authentication.AccountExpiredException; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.validation.BindException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.servlet.NoHandlerFoundException; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.utils.StringUtils; - -/** - * 全局异常处理器 - * - * @author ruoyi - */ -@RestControllerAdvice -public class GlobalExceptionHandler -{ - private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); - - /** - * 基础异常 - */ - @ExceptionHandler(BaseException.class) - public AjaxResult baseException(BaseException e) - { - return AjaxResult.error(e.getMessage()); - } - - /** - * 业务异常 - */ - @ExceptionHandler(CustomException.class) - public AjaxResult businessException(CustomException e) - { - if (StringUtils.isNull(e.getCode())) - { - return AjaxResult.error(e.getMessage()); - } - return AjaxResult.error(e.getCode(), e.getMessage()); - } - - @ExceptionHandler(NoHandlerFoundException.class) - public AjaxResult handlerNoFoundException(Exception e) - { - log.error(e.getMessage(), e); - return AjaxResult.error(HttpStatus.NOT_FOUND, "路径不存在，请检查路径是否正确"); - } - - @ExceptionHandler(AccessDeniedException.class) - public AjaxResult handleAuthorizationException(AccessDeniedException e) - { - log.error(e.getMessage()); - return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权"); - } - - @ExceptionHandler(AccountExpiredException.class) - public AjaxResult handleAccountExpiredException(AccountExpiredException e) - { - log.error(e.getMessage(), e); - return AjaxResult.error(e.getMessage()); - } - - @ExceptionHandler(UsernameNotFoundException.class) - public AjaxResult handleUsernameNotFoundException(UsernameNotFoundException e) - { - log.error(e.getMessage(), e); - return AjaxResult.error(e.getMessage()); - } - - @ExceptionHandler(Exception.class) - public AjaxResult handleException(Exception e) - { - log.error(e.getMessage(), e); - return AjaxResult.error(e.getMessage()); - } - - /** - * 自定义验证异常 - */ - @ExceptionHandler(BindException.class) - public AjaxResult validatedBindException(BindException e) - { - log.error(e.getMessage(), e); - String message = e.getAllErrors().get(0).getDefaultMessage(); - return AjaxResult.error(message); - } - - /** - * 自定义验证异常 - */ - @ExceptionHandler(MethodArgumentNotValidException.class) - public Object validExceptionHandler(MethodArgumentNotValidException e) - { - log.error(e.getMessage(), e); - String message = e.getBindingResult().getFieldError().getDefaultMessage(); - return AjaxResult.error(message); - } - - /** - * 演示模式异常 - */ - @ExceptionHandler(DemoModeException.class) - public AjaxResult demoModeException(DemoModeException e) - { - return AjaxResult.error("演示模式，不允许操作"); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java deleted file mode 100644 index 277e4b9..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.ruoyi.framework.web.service; - -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; - -/** - * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 - * - * @author ruoyi - */ -@Service("ss") -public class PermissionService -{ - /** 所有权限标识 */ - private static final String ALL_PERMISSION = "*:*:*"; - - /** 管理员角色权限标识 */ - private static final String SUPER_ADMIN = "admin"; - - private static final String ROLE_DELIMETER = ","; - - private static final String PERMISSION_DELIMETER = ","; - - @Autowired - private TokenService tokenService; - - /** - * 验证用户是否具备某权限 - * - * @param permission 权限字符串 - * @return 用户是否具备某权限 - */ - public boolean hasPermi(String permission) - { - if (StringUtils.isEmpty(permission)) - { - return false; - } - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) - { - return false; - } - return hasPermissions(loginUser.getPermissions(), permission); - } - - /** - * 验证用户是否不具备某权限，与 hasPermi逻辑相反 - * - * @param permission 权限字符串 - * @return 用户是否不具备某权限 - */ - public boolean lacksPermi(String permission) - { - return hasPermi(permission) != true; - } - - /** - * 验证用户是否具有以下任意一个权限 - * - * @param permissions 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表 - * @return 用户是否具有以下任意一个权限 - */ - public boolean hasAnyPermi(String permissions) - { - if (StringUtils.isEmpty(permissions)) - { - return false; - } - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) - { - return false; - } - Set authorities = loginUser.getPermissions(); - for (String permission : permissions.split(PERMISSION_DELIMETER)) - { - if (permission != null && hasPermissions(authorities, permission)) - { - return true; - } - } - return false; - } - - /** - * 判断用户是否拥有某个角色 - * - * @param role 角色字符串 - * @return 用户是否具备某角色 - */ - public boolean hasRole(String role) - { - if (StringUtils.isEmpty(role)) - { - return false; - } - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) - { - return false; - } - for (SysRole sysRole : loginUser.getUser().getRoles()) - { - String roleKey = sysRole.getRoleKey(); - if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) - { - return true; - } - } - return false; - } - - /** - * 验证用户是否不具备某角色，与 isRole逻辑相反。 - * - * @param role 角色名称 - * @return 用户是否不具备某角色 - */ - public boolean lacksRole(String role) - { - return hasRole(role) != true; - } - - /** - * 验证用户是否具有以下任意一个角色 - * - * @param roles 以 ROLE_NAMES_DELIMETER 为分隔符的角色列表 - * @return 用户是否具有以下任意一个角色 - */ - public boolean hasAnyRoles(String roles) - { - if (StringUtils.isEmpty(roles)) - { - return false; - } - LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) - { - return false; - } - for (String role : roles.split(ROLE_DELIMETER)) - { - if (hasRole(role)) - { - return true; - } - } - return false; - } - - /** - * 判断是否包含权限 - * - * @param permissions 权限列表 - * @param permission 权限字符串 - * @return 用户是否具备某权限 - */ - private boolean hasPermissions(Set permissions, String permission) - { - return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission)); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java deleted file mode 100644 index ca58821..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.ruoyi.framework.web.service; -import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 登录校验方法 - * - * @author ruoyi - */ -@Component -public class SysLoginService -{ - @Autowired - private TokenService tokenService; - - @Resource - private AuthenticationManager authenticationManager; - - @Autowired - private RedisCache redisCache; - - @Autowired - public RedisTemplate redisTemplate; - - @Autowired - private ISysUserService userService; - - @Autowired - private ISysConfigService configService; - - - - /** - * 登录验证 - * - * @param username 用户名 - * @param password 密码 - * @param code 验证码 - * @param uuid 唯一标识 - * @return 结果 - */ - /*public String login(String username, String password, String code, String uuid) - { - boolean captchaOnOff = configService.selectCaptchaOnOff(); - // 验证码开关 - if (captchaOnOff) - { - validateCapcha(username, code, uuid); - } - // 用户验证 - Authentication authentication = null; - try - { - // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername - authentication = authenticationManager - .authenticate(new UsernamePasswordAuthenticationToken(username, password)); - } - catch (Exception e) - { - if (e instanceof BadCredentialsException) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); - throw new UserPasswordNotMatchException(); - } - else - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage())); - throw new CustomException(e.getMessage()); - } - } - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); - LoginUser loginUser = (LoginUser) authentication.getPrincipal(); - recordLoginInfo(loginUser.getUser()); - // 生成token - return tokenService.createToken(loginUser); - }*/ - - public String login(String username, String password, String code, String uuid) - { - // 在此加入密码输入次数校验 - - /*try - { - System.out.println("username:" + username); - System.out.println("password:" + password); - System.out.println("code:" + code); - System.out.println("uuid:" + uuid); - System.out.println("TimeUnit.MINUTES:" + TimeUnit.MINUTES); - } - catch(Exception e) { - throw new CustomException("密码输入错误超过五次"); - }*/ - Object obj = redisTemplate.opsForValue().get(Constants.LOGIN_ERROR_COUNT + username); - // LoginErrorData loginErrorData = redisCache.getCacheObject(Constants.LOGIN_ERROR_COUNT + username); - - - if (obj != null) { - if (Integer.parseInt(obj.toString()) >= 5) { - throw new CustomException("密码输入错误超过五次，系统锁定十分钟"); - } - } - - boolean captchaOnOff = configService.selectCaptchaOnOff(); - // 验证码开关 - if (captchaOnOff) - { - validateCapcha(username, code, uuid); - } - // 用户验证 - Authentication authentication = null; - try - { - // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername - authentication = authenticationManager - .authenticate(new UsernamePasswordAuthenticationToken(username, password)); - } - catch (Exception e) - { - if (e instanceof BadCredentialsException) - { - // System.out.println("这里报口令不匹配错误"); - int count = 1; - if (obj != null) { - count = Integer.parseInt(obj.toString()); - count ++; - // loginErrorData = new LoginErrorData(username, count, System.currentTimeMillis()); - } /*else { - loginErrorData = new LoginErrorData(username, 1, System.currentTimeMillis()); - - }*/ - // System.out.println("loginErrorData:" + loginErrorData.toString()); - // redisCache.setCacheObject(Constants.LOGIN_ERROR_COUNT + username, loginErrorData, 10, TimeUnit.MINUTES); - redisTemplate.opsForValue().set(Constants.LOGIN_ERROR_COUNT + username, count, 10, TimeUnit.MINUTES); - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); - throw new UserPasswordNotMatchException(); - } - else - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage())); - throw new CustomException(e.getMessage()); - } - } - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); - LoginUser loginUser = (LoginUser) authentication.getPrincipal(); - recordLoginInfo(loginUser.getUser()); - // 生成token - return tokenService.createToken(loginUser); - } - - /** - * 校验验证码 - * - * @param username 用户名 - * @param code 验证码 - * @param uuid 唯一标识 - * @return 结果 - */ - public void validateCapcha(String username, String code, String uuid) - { - String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; - String captcha = redisCache.getCacheObject(verifyKey); - redisCache.deleteObject(verifyKey); - if (captcha == null) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"))); - throw new CaptchaExpireException(); - } - if (!code.equalsIgnoreCase(captcha)) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); - throw new CaptchaException(); - } - } - - /** - * 记录登录信息 - */ - public void recordLoginInfo(SysUser user) - { - user.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest())); - user.setLoginDate(DateUtils.getNowDate()); - userService.updateUserProfile(user); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java deleted file mode 100644 index feb8038..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.ruoyi.framework.web.service; - -import java.util.HashSet; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysRoleService; - -/** - * 用户权限处理 - * - * @author ruoyi - */ -@Component -public class SysPermissionService -{ - @Autowired - private ISysRoleService roleService; - - @Autowired - private ISysMenuService menuService; - - /** - * 获取角色数据权限 - * - * @param user 用户信息 - * @return 角色权限信息 - */ - public Set getRolePermission(SysUser user) - { - Set roles = new HashSet(); - // 管理员拥有所有权限 - if (user.isAdmin()) - { - roles.add("admin"); - } - else - { - roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId())); - } - return roles; - } - - /** - * 获取菜单数据权限 - * - * @param user 用户信息 - * @return 菜单权限信息 - */ - public Set getMenuPermission(SysUser user) - { - Set perms = new HashSet(); - // 管理员拥有所有权限 - if (user.isAdmin()) - { - perms.add("*:*:*"); - } - else - { - perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId())); - } - return perms; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java deleted file mode 100644 index e9a9e5d..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ /dev/null @@ -1,219 +0,0 @@ -package com.ruoyi.framework.web.service; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import eu.bitwalker.useragentutils.UserAgent; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; - -/** - * token验证处理 - * - * @author ruoyi - */ -@Component -public class TokenService -{ - // 令牌自定义标识 - @Value("${token.header}") - private String header; - - // 令牌秘钥 - @Value("${token.secret}") - private String secret; - - // 令牌有效期（默认30分钟） - @Value("${token.expireTime}") - private int expireTime; - - protected static final long MILLIS_SECOND = 1000; - - protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; - - private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L; - - @Autowired - private RedisCache redisCache; - - /** - * 获取用户身份信息 - * - * @return 用户信息 - */ - public LoginUser getLoginUser(HttpServletRequest request) - { - // 获取请求携带的令牌 - String token = getToken(request); - if (StringUtils.isNotEmpty(token)) - { - Claims claims = parseToken(token); - // 解析对应的权限以及用户信息 - String uuid = (String) claims.get(Constants.LOGIN_USER_KEY); - String userKey = getTokenKey(uuid); - LoginUser user = redisCache.getCacheObject(userKey); - return user; - } - return null; - } - - /** - * 设置用户身份信息 - */ - public void setLoginUser(LoginUser loginUser) - { - if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) - { - refreshToken(loginUser); - } - } - - /** - * 删除用户身份信息 - */ - public void delLoginUser(String token) - { - if (StringUtils.isNotEmpty(token)) - { - String userKey = getTokenKey(token); - redisCache.deleteObject(userKey); - } - } - - /** - * 创建令牌 - * - * @param loginUser 用户信息 - * @return 令牌 - */ - public String createToken(LoginUser loginUser) - { - String token = IdUtils.fastUuid(); - loginUser.setToken(token); - setUserAgent(loginUser); - refreshToken(loginUser); - - Map claims = new HashMap<>(); - claims.put(Constants.LOGIN_USER_KEY, token); - return createToken(claims); - } - - /** - * 验证令牌有效期，相差不足20分钟，自动刷新缓存 - * - * @param loginUser - * @return 令牌 - */ - public void verifyToken(LoginUser loginUser) - { - long expireTime = loginUser.getExpireTime(); - long currentTime = System.currentTimeMillis(); - if (expireTime - currentTime <= MILLIS_MINUTE_TEN) - { - refreshToken(loginUser); - } - } - - /** - * 刷新令牌有效期 - * - * @param loginUser 登录信息 - */ - public void refreshToken(LoginUser loginUser) - { - loginUser.setLoginTime(System.currentTimeMillis()); - loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); - // 根据uuid将loginUser缓存 - String userKey = getTokenKey(loginUser.getToken()); - redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); - } - - /** - * 设置用户代理信息 - * - * @param loginUser 登录信息 - */ - public void setUserAgent(LoginUser loginUser) - { - UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); - String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); - loginUser.setIpaddr(ip); - loginUser.setLoginLocation(AddressUtils.getRealAddressByIp(ip)); - loginUser.setBrowser(userAgent.getBrowser().getName()); - loginUser.setOs(userAgent.getOperatingSystem().getName()); - } - - /** - * 从数据声明生成令牌 - * - * @param claims 数据声明 - * @return 令牌 - */ - private String createToken(Map claims) - { - String token = Jwts.builder() - .setClaims(claims) - .signWith(SignatureAlgorithm.HS512, secret).compact(); - return token; - } - - /** - * 从令牌中获取数据声明 - * - * @param token 令牌 - * @return 数据声明 - */ - private Claims parseToken(String token) - { - return Jwts.parser() - .setSigningKey(secret) - .parseClaimsJws(token) - .getBody(); - } - - /** - * 从令牌中获取用户名 - * - * @param token 令牌 - * @return 用户名 - */ - public String getUsernameFromToken(String token) - { - Claims claims = parseToken(token); - return claims.getSubject(); - } - - /** - * 获取请求token - * - * @param request - * @return token - */ - private String getToken(HttpServletRequest request) - { - String token = request.getHeader(header); - if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) - { - token = token.replace(Constants.TOKEN_PREFIX, ""); - } - return token; - } - - private String getTokenKey(String uuid) - { - return Constants.LOGIN_TOKEN_KEY + uuid; - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java deleted file mode 100644 index 35fd05e..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ruoyi.framework.web.service; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; - -/** - * 用户验证处理 - * - * @author ruoyi - */ -@Service -public class UserDetailsServiceImpl implements UserDetailsService -{ - private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class); - - @Autowired - private ISysUserService userService; - - @Autowired - private SysPermissionService permissionService; - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException - { - SysUser user = userService.selectUserByUserName(username); - if (StringUtils.isNull(user)) - { - log.info("登录用户：{} 不存在.", username); - throw new UsernameNotFoundException("登录用户：" + username + " 不存在"); - } - else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) - { - log.info("登录用户：{} 已被删除.", username); - throw new BaseException("对不起，您的账号：" + username + " 已被删除"); - } - else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) - { - log.info("登录用户：{} 已被停用.", username); - throw new BaseException("对不起，您的账号：" + username + " 已停用"); - } - - return createLoginUser(user); - } - - public UserDetails createLoginUser(SysUser user) - { - return new LoginUser(user, permissionService.getMenuPermission(user)); - } -} diff --git a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/WechatService.java b/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/WechatService.java deleted file mode 100644 index e21f150..0000000 --- a/exam-online-api-DEL/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/WechatService.java +++ /dev/null @@ -1,294 +0,0 @@ -package com.ruoyi.framework.web.service; - -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import javax.imageio.ImageIO; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.client.j2se.MatrixToImageWriter; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.QRCodeWriter; - -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.entity.WechatLoginStatus; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.WechatProperties; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.WechatLoginStatusMapper; - -import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; -import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; -import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; - -/** - * 微信服务 - * - * @author ruoyi - */ -@Service -public class WechatService -{ - private static final Logger log = LoggerFactory.getLogger(WechatService.class); - - @Autowired - private WxMpService wxMpService; - - @Autowired - private WechatProperties wechatProperties; - - @Autowired - private WechatLoginStatusMapper wechatLoginStatusMapper; - - @Autowired - private SysUserMapper userMapper; - - /** - * 生成微信登录二维码 - * - * @return 包含二维码信息的Map - */ - public Map generateLoginQrCode() throws WxErrorException, IOException, com.google.zxing.WriterException - { - // 生成唯一的登录状态ID - String loginId = UUID.randomUUID().toString().replace("-", ""); - String sceneStr = wechatProperties.getQrScenePrefix() + loginId; - - // 创建临时二维码 - WxMpQrCodeTicket ticket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(sceneStr, wechatProperties.getQrExpireTime()); - String qrCodeUrl = wxMpService.getQrcodeService().qrCodePictureUrl(ticket.getTicket()); - - // 生成本地二维码图片 - try { - QRCodeWriter qrCodeWriter = new QRCodeWriter(); - BitMatrix bitMatrix = qrCodeWriter.encode(qrCodeUrl, BarcodeFormat.QR_CODE, 200, 200); - BufferedImage qrCodeImage = MatrixToImageWriter.toBufferedImage(bitMatrix); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ImageIO.write(qrCodeImage, "png", baos); - String base64Image = "data:image/png;base64," + java.util.Base64.getEncoder().encodeToString(baos.toByteArray()); - - // 保存登录状态到数据库 - WechatLoginStatus loginStatus = new WechatLoginStatus(); - loginStatus.setId(loginId); - loginStatus.setQrCodeUrl(qrCodeUrl); - loginStatus.setStatus("0"); // 待扫码 - - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.SECOND, wechatProperties.getQrExpireTime()); - loginStatus.setExpireTime(calendar.getTime()); - loginStatus.setCreateTime(new Date()); - loginStatus.setUpdateTime(new Date()); - - wechatLoginStatusMapper.insertWechatLoginStatus(loginStatus); - - // 返回结果 - Map result = new HashMap<>(); - result.put("loginId", loginId); - result.put("qrCodeUrl", qrCodeUrl); - result.put("qrCodeImage", base64Image); - result.put("expireTime", wechatProperties.getQrExpireTime()); - - return result; - } catch (com.google.zxing.WriterException e) { - log.error("生成二维码失败", e); - throw e; - } - } - - /** - * 获取微信OAuth2授权URL - * - * @param state 状态参数 - * @return 授权URL - */ - public String getOAuth2AuthorizeUrl(String state) - { - return wxMpService.getOAuth2Service().buildAuthorizationUrl( - wechatProperties.getRedirectUri(), - "snsapi_userinfo", - state - ); - } - - /** - * 通过授权码获取用户信息 - * - * @param code 授权码 - * @return 用户信息 - */ - public WxOAuth2UserInfo getUserInfo(String code) throws WxErrorException - { - WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(code); - return wxMpService.getOAuth2Service().getUserInfo(accessToken, null); - } - - /** - * 检查登录状态 - * - * @param loginId 登录ID - * @return 登录状态信息 - */ - public Map checkLoginStatus(String loginId) - { - WechatLoginStatus loginStatus = wechatLoginStatusMapper.selectWechatLoginStatusById(loginId); - Map result = new HashMap<>(); - - if (loginStatus == null) { - result.put("status", "3"); // 已过期 - result.put("message", "登录状态不存在或已过期"); - return result; - } - - // 检查是否过期 - if (new Date().after(loginStatus.getExpireTime())) { - result.put("status", "3"); // 已过期 - result.put("message", "二维码已过期"); - return result; - } - - result.put("status", loginStatus.getStatus()); - result.put("userId", loginStatus.getUserId()); - - switch (loginStatus.getStatus()) { - case "0": - result.put("message", "等待扫码"); - break; - case "1": - result.put("message", "已扫码，等待确认"); - break; - case "2": - result.put("message", "登录成功"); - break; - default: - result.put("message", "未知状态"); - break; - } - - return result; - } - - /** - * 更新登录状态 - * - * @param loginId 登录ID - * @param status 状态 - * @param userId 用户ID - * @param openid 微信openid - */ - public void updateLoginStatus(String loginId, String status, Long userId, String openid) - { - WechatLoginStatus loginStatus = new WechatLoginStatus(); - loginStatus.setId(loginId); - loginStatus.setStatus(status); - loginStatus.setUserId(userId); - loginStatus.setOpenid(openid); - loginStatus.setUpdateTime(new Date()); - - wechatLoginStatusMapper.updateWechatLoginStatus(loginStatus); - } - - /** - * 根据场景值解析登录ID - * - * @param sceneStr 场景值 - * @return 登录ID - */ - public String parseLoginIdFromScene(String sceneStr) - { - if (StringUtils.isNotEmpty(sceneStr) && sceneStr.startsWith(wechatProperties.getQrScenePrefix())) { - return sceneStr.substring(wechatProperties.getQrScenePrefix().length()); - } - return null; - } - - /** - * 微信回调处理 - * - * @param code 授权码 - * @param state 状态参数 - * @return 处理结果 - */ - public AjaxResult handleWechatCallback(String code, String state) - { - try { - if (StringUtils.isEmpty(code)) { - return AjaxResult.error("授权码不能为空"); - } - - // 获取用户信息 - WxOAuth2UserInfo userInfo = getUserInfo(code); - - // 解析登录ID - String loginId = parseLoginIdFromScene(state); - if (StringUtils.isEmpty(loginId)) { - return AjaxResult.error("无效的登录状态"); - } - - // 查询登录状态 - WechatLoginStatus loginStatus = wechatLoginStatusMapper.selectWechatLoginStatusById(loginId); - if (loginStatus == null) { - return AjaxResult.error("登录状态不存在或已过期"); - } - - // 检查是否过期 - if (new Date().after(loginStatus.getExpireTime())) { - return AjaxResult.error("二维码已过期"); - } - - // 更新登录状态为已扫码 - updateLoginStatus(loginId, "1", null, userInfo.getOpenid()); - - // 查询用户是否已绑定 - SysUser user = userMapper.selectUserByWechatOpenid(userInfo.getOpenid()); - Long userId = null; - - if (user != null) { - // 用户已绑定，直接更新用户微信信息 - user.setWechatNickname(userInfo.getNickname()); - user.setWechatAvatar(userInfo.getHeadImgUrl()); - userMapper.updateUser(user); - userId = user.getUserId(); - } else { - // 用户未绑定，创建新用户或提示绑定 - // 这里可以根据业务需求决定是自动创建用户还是提示用户绑定 - // 为了演示，我们创建一个新用户 - user = new SysUser(); - user.setUserName("wechat_" + userInfo.getOpenid().substring(0, 10)); - user.setNickName(userInfo.getNickname()); - user.setWechatOpenid(userInfo.getOpenid()); - user.setWechatUnionid(userInfo.getUnionId()); - user.setWechatNickname(userInfo.getNickname()); - user.setWechatAvatar(userInfo.getHeadImgUrl()); - user.setBindWechat("1"); - user.setStatus("0"); // 正常状态 - user.setDelFlag("0"); // 未删除 - user.setPassword("123456"); // 默认密码 - userMapper.insertUser(user); - userId = user.getUserId(); - } - - // 更新登录状态为已确认 - updateLoginStatus(loginId, "2", userId, userInfo.getOpenid()); - - return AjaxResult.success("登录成功"); - } catch (WxErrorException e) { - log.error("微信回调处理失败", e); - return AjaxResult.error("微信回调处理失败: " + e.getMessage()); - } - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/pom.xml b/exam-online-api-DEL/ruoyi-generator/pom.xml deleted file mode 100644 index 1180284..0000000 --- a/exam-online-api-DEL/ruoyi-generator/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.8.6 - - 4.0.0 - - ruoyi-generator - - - generator代码生成 - - - - - - - org.apache.velocity - velocity-engine-core - - - - - commons-collections - commons-collections - - - - - com.ruoyi - ruoyi-common - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java deleted file mode 100644 index cc4cd14..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.ruoyi.generator.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.PropertySource; -import org.springframework.stereotype.Component; - -/** - * 读取代码生成相关配置 - * - * @author ruoyi - */ -@Component -@ConfigurationProperties(prefix = "gen") -@PropertySource(value = { "classpath:generator.yml" }) -public class GenConfig -{ - /** 作者 */ - public static String author; - - /** 生成包路径 */ - public static String packageName; - - /** 自动去除表前缀，默认是false */ - public static boolean autoRemovePre; - - /** 表前缀(类名不会包含表前缀) */ - public static String tablePrefix; - - public static String getAuthor() - { - return author; - } - - @Value("${author}") - public void setAuthor(String author) - { - GenConfig.author = author; - } - - public static String getPackageName() - { - return packageName; - } - - @Value("${packageName}") - public void setPackageName(String packageName) - { - GenConfig.packageName = packageName; - } - - public static boolean getAutoRemovePre() - { - return autoRemovePre; - } - - @Value("${autoRemovePre}") - public void setAutoRemovePre(boolean autoRemovePre) - { - GenConfig.autoRemovePre = autoRemovePre; - } - - public static String getTablePrefix() - { - return tablePrefix; - } - - @Value("${tablePrefix}") - public void setTablePrefix(String tablePrefix) - { - GenConfig.tablePrefix = tablePrefix; - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java deleted file mode 100644 index 85828f7..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ /dev/null @@ -1,216 +0,0 @@ -package com.ruoyi.generator.controller; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableColumnService; -import com.ruoyi.generator.service.IGenTableService; - -/** - * 代码生成 操作处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/tool/gen") -public class GenController extends BaseController -{ - @Autowired - private IGenTableService genTableService; - - @Autowired - private IGenTableColumnService genTableColumnService; - - /** - * 查询代码生成列表 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:list')") - @GetMapping("/list") - public TableDataInfo genList(GenTable genTable) - { - startPage(); - List list = genTableService.selectGenTableList(genTable); - return getDataTable(list); - } - - /** - * 修改代码生成业务 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:query')") - @GetMapping(value = "/{talbleId}") - public AjaxResult getInfo(@PathVariable Long talbleId) - { - GenTable table = genTableService.selectGenTableById(talbleId); - List tables = genTableService.selectGenTableAll(); - List list = genTableColumnService.selectGenTableColumnListByTableId(talbleId); - Map map = new HashMap(); - map.put("info", table); - map.put("rows", list); - map.put("tables", tables); - return AjaxResult.success(map); - } - - /** - * 查询数据库列表 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:list')") - @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable) - { - startPage(); - List list = genTableService.selectDbTableList(genTable); - return getDataTable(list); - } - - /** - * 查询数据表字段列表 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:list')") - @GetMapping(value = "/column/{talbleId}") - public TableDataInfo columnList(Long tableId) - { - TableDataInfo dataInfo = new TableDataInfo(); - List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); - dataInfo.setRows(list); - dataInfo.setTotal(list.size()); - return dataInfo; - } - - /** - * 导入表结构（保存） - */ - @PreAuthorize("@ss.hasPermi('tool:gen:import')") - @Log(title = "代码生成", businessType = BusinessType.IMPORT) - @PostMapping("/importTable") - public AjaxResult importTableSave(String tables) - { - String[] tableNames = Convert.toStrArray(tables); - // 查询表信息 - List tableList = genTableService.selectDbTableListByNames(tableNames); - genTableService.importGenTable(tableList); - return AjaxResult.success(); - } - - /** - * 修改保存代码生成业务 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:edit')") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) - @PostMapping("/update") - // @PutMapping - public AjaxResult editSave(@Validated @RequestBody GenTable genTable) - { - genTableService.validateEdit(genTable); - genTableService.updateGenTable(genTable); - return AjaxResult.success(); - } - - /** - * 删除代码生成 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:remove')") - @Log(title = "代码生成", businessType = BusinessType.DELETE) - @GetMapping("/batch/{tableIds}") - // @DeleteMapping("/{tableIds}") - public AjaxResult remove(@PathVariable Long[] tableIds) - { - genTableService.deleteGenTableByIds(tableIds); - return AjaxResult.success(); - } - - /** - * 预览代码 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:preview')") - @GetMapping("/preview/{tableId}") - public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException - { - Map dataMap = genTableService.previewCode(tableId); - return AjaxResult.success(dataMap); - } - - /** - * 生成代码（下载方式） - */ - @PreAuthorize("@ss.hasPermi('tool:gen:code')") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/download/{tableName}") - public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException - { - byte[] data = genTableService.downloadCode(tableName); - genCode(response, data); - } - - /** - * 生成代码（自定义路径） - */ - @PreAuthorize("@ss.hasPermi('tool:gen:code')") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/genCode/{tableName}") - public AjaxResult genCode(@PathVariable("tableName") String tableName) - { - genTableService.generatorCode(tableName); - return AjaxResult.success(); - } - - /** - * 同步数据库 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:edit')") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) - @GetMapping("/synchDb/{tableName}") - public AjaxResult synchDb(@PathVariable("tableName") String tableName) - { - genTableService.synchDb(tableName); - return AjaxResult.success(); - } - - /** - * 批量生成代码 - */ - @PreAuthorize("@ss.hasPermi('tool:gen:code')") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/batchGenCode") - public void batchGenCode(HttpServletResponse response, String tables) throws IOException - { - String[] tableNames = Convert.toStrArray(tables); - byte[] data = genTableService.downloadCode(tableNames); - genCode(response, data); - } - - /** - * 生成zip文件 - */ - private void genCode(HttpServletResponse response, byte[] data) throws IOException - { - response.reset(); - response.addHeader("Access-Control-Allow-Origin", "*"); - response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); - response.addHeader("Content-Length", "" + data.length); - response.setContentType("application/octet-stream; charset=UTF-8"); - IOUtils.write(data, response.getOutputStream()); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java deleted file mode 100644 index 269779c..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ /dev/null @@ -1,372 +0,0 @@ -package com.ruoyi.generator.domain; - -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; - -/** - * 业务表 gen_table - * - * @author ruoyi - */ -public class GenTable extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 编号 */ - private Long tableId; - - /** 表名称 */ - @NotBlank(message = "表名称不能为空") - private String tableName; - - /** 表描述 */ - @NotBlank(message = "表描述不能为空") - private String tableComment; - - /** 关联父表的表名 */ - private String subTableName; - - /** 本表关联父表的外键名 */ - private String subTableFkName; - - /** 实体类名称(首字母大写) */ - @NotBlank(message = "实体类名称不能为空") - private String className; - - /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */ - private String tplCategory; - - /** 生成包路径 */ - @NotBlank(message = "生成包路径不能为空") - private String packageName; - - /** 生成模块名 */ - @NotBlank(message = "生成模块名不能为空") - private String moduleName; - - /** 生成业务名 */ - @NotBlank(message = "生成业务名不能为空") - private String businessName; - - /** 生成功能名 */ - @NotBlank(message = "生成功能名不能为空") - private String functionName; - - /** 生成作者 */ - @NotBlank(message = "作者不能为空") - private String functionAuthor; - - /** 生成代码方式（0zip压缩包 1自定义路径） */ - private String genType; - - /** 生成路径（不填默认项目路径） */ - private String genPath; - - /** 主键信息 */ - private GenTableColumn pkColumn; - - /** 子表信息 */ - private GenTable subTable; - - /** 表列信息 */ - @Valid - private List columns; - - /** 其它生成选项 */ - private String options; - - /** 树编码字段 */ - private String treeCode; - - /** 树父编码字段 */ - private String treeParentCode; - - /** 树名称字段 */ - private String treeName; - - /** 上级菜单ID字段 */ - private String parentMenuId; - - /** 上级菜单名称字段 */ - private String parentMenuName; - - public Long getTableId() - { - return tableId; - } - - public void setTableId(Long tableId) - { - this.tableId = tableId; - } - - public String getTableName() - { - return tableName; - } - - public void setTableName(String tableName) - { - this.tableName = tableName; - } - - public String getTableComment() - { - return tableComment; - } - - public void setTableComment(String tableComment) - { - this.tableComment = tableComment; - } - - public String getSubTableName() - { - return subTableName; - } - - public void setSubTableName(String subTableName) - { - this.subTableName = subTableName; - } - - public String getSubTableFkName() - { - return subTableFkName; - } - - public void setSubTableFkName(String subTableFkName) - { - this.subTableFkName = subTableFkName; - } - - public String getClassName() - { - return className; - } - - public void setClassName(String className) - { - this.className = className; - } - - public String getTplCategory() - { - return tplCategory; - } - - public void setTplCategory(String tplCategory) - { - this.tplCategory = tplCategory; - } - - public String getPackageName() - { - return packageName; - } - - public void setPackageName(String packageName) - { - this.packageName = packageName; - } - - public String getModuleName() - { - return moduleName; - } - - public void setModuleName(String moduleName) - { - this.moduleName = moduleName; - } - - public String getBusinessName() - { - return businessName; - } - - public void setBusinessName(String businessName) - { - this.businessName = businessName; - } - - public String getFunctionName() - { - return functionName; - } - - public void setFunctionName(String functionName) - { - this.functionName = functionName; - } - - public String getFunctionAuthor() - { - return functionAuthor; - } - - public void setFunctionAuthor(String functionAuthor) - { - this.functionAuthor = functionAuthor; - } - - public String getGenType() - { - return genType; - } - - public void setGenType(String genType) - { - this.genType = genType; - } - - public String getGenPath() - { - return genPath; - } - - public void setGenPath(String genPath) - { - this.genPath = genPath; - } - - public GenTableColumn getPkColumn() - { - return pkColumn; - } - - public void setPkColumn(GenTableColumn pkColumn) - { - this.pkColumn = pkColumn; - } - - public GenTable getSubTable() - { - return subTable; - } - - public void setSubTable(GenTable subTable) - { - this.subTable = subTable; - } - - public List getColumns() - { - return columns; - } - - public void setColumns(List columns) - { - this.columns = columns; - } - - public String getOptions() - { - return options; - } - - public void setOptions(String options) - { - this.options = options; - } - - public String getTreeCode() - { - return treeCode; - } - - public void setTreeCode(String treeCode) - { - this.treeCode = treeCode; - } - - public String getTreeParentCode() - { - return treeParentCode; - } - - public void setTreeParentCode(String treeParentCode) - { - this.treeParentCode = treeParentCode; - } - - public String getTreeName() - { - return treeName; - } - - public void setTreeName(String treeName) - { - this.treeName = treeName; - } - - public String getParentMenuId() - { - return parentMenuId; - } - - public void setParentMenuId(String parentMenuId) - { - this.parentMenuId = parentMenuId; - } - - public String getParentMenuName() - { - return parentMenuName; - } - - public void setParentMenuName(String parentMenuName) - { - this.parentMenuName = parentMenuName; - } - - public boolean isSub() - { - return isSub(this.tplCategory); - } - - public static boolean isSub(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); - } - - public boolean isTree() - { - return isTree(this.tplCategory); - } - - public static boolean isTree(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); - } - - public boolean isCrud() - { - return isCrud(this.tplCategory); - } - - public static boolean isCrud(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); - } - - public boolean isSuperColumn(String javaField) - { - return isSuperColumn(this.tplCategory, javaField); - } - - public static boolean isSuperColumn(String tplCategory, String javaField) - { - if (isTree(tplCategory)) - { - return StringUtils.equalsAnyIgnoreCase(javaField, - ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); - } - return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java deleted file mode 100644 index d1733b6..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ /dev/null @@ -1,373 +0,0 @@ -package com.ruoyi.generator.domain; - -import javax.validation.constraints.NotBlank; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; - -/** - * 代码生成业务字段表 gen_table_column - * - * @author ruoyi - */ -public class GenTableColumn extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 编号 */ - private Long columnId; - - /** 归属表编号 */ - private Long tableId; - - /** 列名称 */ - private String columnName; - - /** 列描述 */ - private String columnComment; - - /** 列类型 */ - private String columnType; - - /** JAVA类型 */ - private String javaType; - - /** JAVA字段名 */ - @NotBlank(message = "Java属性不能为空") - private String javaField; - - /** 是否主键（1是） */ - private String isPk; - - /** 是否自增（1是） */ - private String isIncrement; - - /** 是否必填（1是） */ - private String isRequired; - - /** 是否为插入字段（1是） */ - private String isInsert; - - /** 是否编辑字段（1是） */ - private String isEdit; - - /** 是否列表字段（1是） */ - private String isList; - - /** 是否查询字段（1是） */ - private String isQuery; - - /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */ - private String queryType; - - /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */ - private String htmlType; - - /** 字典类型 */ - private String dictType; - - /** 排序 */ - private Integer sort; - - public void setColumnId(Long columnId) - { - this.columnId = columnId; - } - - public Long getColumnId() - { - return columnId; - } - - public void setTableId(Long tableId) - { - this.tableId = tableId; - } - - public Long getTableId() - { - return tableId; - } - - public void setColumnName(String columnName) - { - this.columnName = columnName; - } - - public String getColumnName() - { - return columnName; - } - - public void setColumnComment(String columnComment) - { - this.columnComment = columnComment; - } - - public String getColumnComment() - { - return columnComment; - } - - public void setColumnType(String columnType) - { - this.columnType = columnType; - } - - public String getColumnType() - { - return columnType; - } - - public void setJavaType(String javaType) - { - this.javaType = javaType; - } - - public String getJavaType() - { - return javaType; - } - - public void setJavaField(String javaField) - { - this.javaField = javaField; - } - - public String getJavaField() - { - return javaField; - } - - public String getCapJavaField() - { - return StringUtils.capitalize(javaField); - } - - public void setIsPk(String isPk) - { - this.isPk = isPk; - } - - public String getIsPk() - { - return isPk; - } - - public boolean isPk() - { - return isPk(this.isPk); - } - - public boolean isPk(String isPk) - { - return isPk != null && StringUtils.equals("1", isPk); - } - - public String getIsIncrement() - { - return isIncrement; - } - - public void setIsIncrement(String isIncrement) - { - this.isIncrement = isIncrement; - } - - public boolean isIncrement() - { - return isIncrement(this.isIncrement); - } - - public boolean isIncrement(String isIncrement) - { - return isIncrement != null && StringUtils.equals("1", isIncrement); - } - - public void setIsRequired(String isRequired) - { - this.isRequired = isRequired; - } - - public String getIsRequired() - { - return isRequired; - } - - public boolean isRequired() - { - return isRequired(this.isRequired); - } - - public boolean isRequired(String isRequired) - { - return isRequired != null && StringUtils.equals("1", isRequired); - } - - public void setIsInsert(String isInsert) - { - this.isInsert = isInsert; - } - - public String getIsInsert() - { - return isInsert; - } - - public boolean isInsert() - { - return isInsert(this.isInsert); - } - - public boolean isInsert(String isInsert) - { - return isInsert != null && StringUtils.equals("1", isInsert); - } - - public void setIsEdit(String isEdit) - { - this.isEdit = isEdit; - } - - public String getIsEdit() - { - return isEdit; - } - - public boolean isEdit() - { - return isInsert(this.isEdit); - } - - public boolean isEdit(String isEdit) - { - return isEdit != null && StringUtils.equals("1", isEdit); - } - - public void setIsList(String isList) - { - this.isList = isList; - } - - public String getIsList() - { - return isList; - } - - public boolean isList() - { - return isList(this.isList); - } - - public boolean isList(String isList) - { - return isList != null && StringUtils.equals("1", isList); - } - - public void setIsQuery(String isQuery) - { - this.isQuery = isQuery; - } - - public String getIsQuery() - { - return isQuery; - } - - public boolean isQuery() - { - return isQuery(this.isQuery); - } - - public boolean isQuery(String isQuery) - { - return isQuery != null && StringUtils.equals("1", isQuery); - } - - public void setQueryType(String queryType) - { - this.queryType = queryType; - } - - public String getQueryType() - { - return queryType; - } - - public String getHtmlType() - { - return htmlType; - } - - public void setHtmlType(String htmlType) - { - this.htmlType = htmlType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - public String getDictType() - { - return dictType; - } - - public void setSort(Integer sort) - { - this.sort = sort; - } - - public Integer getSort() - { - return sort; - } - - public boolean isSuperColumn() - { - return isSuperColumn(this.javaField); - } - - public static boolean isSuperColumn(String javaField) - { - return StringUtils.equalsAnyIgnoreCase(javaField, - // BaseEntity - "createBy", "createTime", "updateBy", "updateTime", "remark", - // TreeEntity - "parentName", "parentId", "orderNum", "ancestors"); - } - - public boolean isUsableColumn() - { - return isUsableColumn(javaField); - } - - public static boolean isUsableColumn(String javaField) - { - // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单 - return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); - } - - public String readConverterExp() - { - String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); - StringBuffer sb = new StringBuffer(); - if (StringUtils.isNotEmpty(remarks)) - { - for (String value : remarks.split(" ")) - { - if (StringUtils.isNotEmpty(value)) - { - Object startStr = value.subSequence(0, 1); - String endStr = value.substring(1); - sb.append("").append(startStr).append("=").append(endStr).append(","); - } - } - return sb.deleteCharAt(sb.length() - 1).toString(); - } - else - { - return this.columnComment; - } - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java deleted file mode 100644 index 951e166..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ruoyi.generator.mapper; - -import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; - -/** - * 业务字段 数据层 - * - * @author ruoyi - */ -public interface GenTableColumnMapper -{ - /** - * 根据表名称查询列信息 - * - * @param tableName 表名称 - * @return 列信息 - */ - public List selectDbTableColumnsByName(String tableName); - - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - public List selectGenTableColumnListByTableId(Long tableId); - - /** - * 新增业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int insertGenTableColumn(GenTableColumn genTableColumn); - - /** - * 修改业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int updateGenTableColumn(GenTableColumn genTableColumn); - - /** - * 删除业务字段 - * - * @param genTableColumns 列数据 - * @return 结果 - */ - public int deleteGenTableColumns(List genTableColumns); - - /** - * 批量删除业务字段 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableColumnByIds(Long[] ids); -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java deleted file mode 100644 index 9b330df..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.ruoyi.generator.mapper; - -import java.util.List; -import com.ruoyi.generator.domain.GenTable; - -/** - * 业务 数据层 - * - * @author ruoyi - */ -public interface GenTableMapper -{ - /** - * 查询业务列表 - * - * @param genTable 业务信息 - * @return 业务集合 - */ - public List selectGenTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param genTable 业务信息 - * @return 数据库表集合 - */ - public List selectDbTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @return 数据库表集合 - */ - public List selectDbTableListByNames(String[] tableNames); - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - public List selectGenTableAll(); - - /** - * 查询表ID业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - public GenTable selectGenTableById(Long id); - - /** - * 查询表名称业务信息 - * - * @param tableName 表名称 - * @return 业务信息 - */ - public GenTable selectGenTableByName(String tableName); - - /** - * 新增业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - public int insertGenTable(GenTable genTable); - - /** - * 修改业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - public int updateGenTable(GenTable genTable); - - /** - * 批量删除业务 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableByIds(Long[] ids); -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java deleted file mode 100644 index 0679689..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.generator.service; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; - -/** - * 业务字段 服务层实现 - * - * @author ruoyi - */ -@Service -public class GenTableColumnServiceImpl implements IGenTableColumnService -{ - @Autowired - private GenTableColumnMapper genTableColumnMapper; - - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - @Override - public List selectGenTableColumnListByTableId(Long tableId) - { - return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); - } - - /** - * 新增业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - @Override - public int insertGenTableColumn(GenTableColumn genTableColumn) - { - return genTableColumnMapper.insertGenTableColumn(genTableColumn); - } - - /** - * 修改业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - @Override - public int updateGenTableColumn(GenTableColumn genTableColumn) - { - return genTableColumnMapper.updateGenTableColumn(genTableColumn); - } - - /** - * 删除业务字段对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteGenTableColumnByIds(String ids) - { - return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java deleted file mode 100644 index 2e2feeb..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ /dev/null @@ -1,500 +0,0 @@ -package com.ruoyi.generator.service; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; - -/** - * 业务 服务层实现 - * - * @author ruoyi - */ -@Service -public class GenTableServiceImpl implements IGenTableService -{ - private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); - - @Autowired - private GenTableMapper genTableMapper; - - @Autowired - private GenTableColumnMapper genTableColumnMapper; - - /** - * 查询业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - @Override - public GenTable selectGenTableById(Long id) - { - GenTable genTable = genTableMapper.selectGenTableById(id); - setTableFromOptions(genTable); - return genTable; - } - - /** - * 查询业务列表 - * - * @param genTable 业务信息 - * @return 业务集合 - */ - @Override - public List selectGenTableList(GenTable genTable) - { - return genTableMapper.selectGenTableList(genTable); - } - - /** - * 查询据库列表 - * - * @param genTable 业务信息 - * @return 数据库表集合 - */ - @Override - public List selectDbTableList(GenTable genTable) - { - return genTableMapper.selectDbTableList(genTable); - } - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @return 数据库表集合 - */ - @Override - public List selectDbTableListByNames(String[] tableNames) - { - return genTableMapper.selectDbTableListByNames(tableNames); - } - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - @Override - public List selectGenTableAll() - { - return genTableMapper.selectGenTableAll(); - } - - /** - * 修改业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - @Override - @Transactional - public void updateGenTable(GenTable genTable) - { - String options = JSON.toJSONString(genTable.getParams()); - genTable.setOptions(options); - int row = genTableMapper.updateGenTable(genTable); - if (row > 0) - { - for (GenTableColumn cenTableColumn : genTable.getColumns()) - { - genTableColumnMapper.updateGenTableColumn(cenTableColumn); - } - } - } - - /** - * 删除业务对象 - * - * @param tableIds 需要删除的数据ID - * @return 结果 - */ - @Override - @Transactional - public void deleteGenTableByIds(Long[] tableIds) - { - genTableMapper.deleteGenTableByIds(tableIds); - genTableColumnMapper.deleteGenTableColumnByIds(tableIds); - } - - /** - * 导入表结构 - * - * @param tableList 导入表列表 - */ - @Override - @Transactional - public void importGenTable(List tableList) - { - String operName = SecurityUtils.getUsername(); - try - { - for (GenTable table : tableList) - { - String tableName = table.getTableName(); - GenUtils.initTable(table, operName); - int row = genTableMapper.insertGenTable(table); - if (row > 0) - { - // 保存列信息 - List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - for (GenTableColumn column : genTableColumns) - { - GenUtils.initColumnField(column, table); - genTableColumnMapper.insertGenTableColumn(column); - } - } - } - } - catch (Exception e) - { - throw new CustomException("导入失败：" + e.getMessage()); - } - } - - /** - * 预览代码 - * - * @param tableId 表编号 - * @return 预览数据列表 - */ - @Override - public Map previewCode(Long tableId) - { - Map dataMap = new LinkedHashMap<>(); - // 查询表信息 - GenTable table = genTableMapper.selectGenTableById(tableId); - // 设置主子表信息 - setSubTable(table); - // 设置主键列信息 - setPkColumn(table); - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - dataMap.put(template, sw.toString()); - } - return dataMap; - } - - /** - * 生成代码（下载方式） - * - * @param tableName 表名称 - * @return 数据 - */ - @Override - public byte[] downloadCode(String tableName) - { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - generatorCode(tableName, zip); - IOUtils.closeQuietly(zip); - return outputStream.toByteArray(); - } - - /** - * 生成代码（自定义路径） - * - * @param tableName 表名称 - */ - @Override - public void generatorCode(String tableName) - { - // 查询表信息 - GenTable table = genTableMapper.selectGenTableByName(tableName); - // 设置主子表信息 - setSubTable(table); - // 设置主键列信息 - setPkColumn(table); - - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) - { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - try - { - String path = getGenPath(table, template); - FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); - } - catch (IOException e) - { - throw new CustomException("渲染模板失败，表名：" + table.getTableName()); - } - } - } - } - - /** - * 同步数据库 - * - * @param tableName 表名称 - */ - @Override - @Transactional - public void synchDb(String tableName) - { - GenTable table = genTableMapper.selectGenTableByName(tableName); - List tableColumns = table.getColumns(); - List tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); - - List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - if (StringUtils.isEmpty(dbTableColumns)) - { - throw new CustomException("同步数据失败，原表结构不存在"); - } - List dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); - - dbTableColumns.forEach(column -> { - if (!tableColumnNames.contains(column.getColumnName())) - { - GenUtils.initColumnField(column, table); - genTableColumnMapper.insertGenTableColumn(column); - } - }); - - List delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); - if (StringUtils.isNotEmpty(delColumns)) - { - genTableColumnMapper.deleteGenTableColumns(delColumns); - } - } - - /** - * 批量生成代码（下载方式） - * - * @param tableNames 表数组 - * @return 数据 - */ - @Override - public byte[] downloadCode(String[] tableNames) - { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - for (String tableName : tableNames) - { - generatorCode(tableName, zip); - } - IOUtils.closeQuietly(zip); - return outputStream.toByteArray(); - } - - /** - * 查询表信息并生成代码 - */ - private void generatorCode(String tableName, ZipOutputStream zip) - { - // 查询表信息 - GenTable table = genTableMapper.selectGenTableByName(tableName); - // 设置主子表信息 - setSubTable(table); - // 设置主键列信息 - setPkColumn(table); - - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - try - { - // 添加到zip - zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); - IOUtils.write(sw.toString(), zip, Constants.UTF8); - IOUtils.closeQuietly(sw); - zip.flush(); - zip.closeEntry(); - } - catch (IOException e) - { - log.error("渲染模板失败，表名：" + table.getTableName(), e); - } - } - } - - /** - * 修改保存参数校验 - * - * @param genTable 业务信息 - */ - @Override - public void validateEdit(GenTable genTable) - { - if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) - { - String options = JSON.toJSONString(genTable.getParams()); - JSONObject paramsObj = JSONObject.parseObject(options); - if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) - { - throw new CustomException("树编码字段不能为空"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) - { - throw new CustomException("树父编码字段不能为空"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) - { - throw new CustomException("树名称字段不能为空"); - } - else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) - { - if (StringUtils.isEmpty(genTable.getSubTableName())) - { - throw new CustomException("关联子表的表名不能为空"); - } - else if (StringUtils.isEmpty(genTable.getSubTableFkName())) - { - throw new CustomException("子表关联的外键名不能为空"); - } - } - } - } - - /** - * 设置主键列信息 - * - * @param table 业务表信息 - */ - public void setPkColumn(GenTable table) - { - for (GenTableColumn column : table.getColumns()) - { - if (column.isPk()) - { - table.setPkColumn(column); - break; - } - } - if (StringUtils.isNull(table.getPkColumn())) - { - table.setPkColumn(table.getColumns().get(0)); - } - if (GenConstants.TPL_SUB.equals(table.getTplCategory())) - { - for (GenTableColumn column : table.getSubTable().getColumns()) - { - if (column.isPk()) - { - table.getSubTable().setPkColumn(column); - break; - } - } - if (StringUtils.isNull(table.getSubTable().getPkColumn())) - { - table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); - } - } - } - - /** - * 设置主子表信息 - * - * @param table 业务表信息 - */ - public void setSubTable(GenTable table) - { - String subTableName = table.getSubTableName(); - if (StringUtils.isNotEmpty(subTableName)) - { - table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); - } - } - - /** - * 设置代码生成其他选项值 - * - * @param genTable 设置后的生成对象 - */ - public void setTableFromOptions(GenTable genTable) - { - JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions()); - if (StringUtils.isNotNull(paramsObj)) - { - String treeCode = paramsObj.getString(GenConstants.TREE_CODE); - String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE); - String treeName = paramsObj.getString(GenConstants.TREE_NAME); - String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID); - String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME); - - genTable.setTreeCode(treeCode); - genTable.setTreeParentCode(treeParentCode); - genTable.setTreeName(treeName); - genTable.setParentMenuId(parentMenuId); - genTable.setParentMenuName(parentMenuName); - } - } - - /** - * 获取代码生成地址 - * - * @param table 业务表信息 - * @param template 模板文件路径 - * @return 生成地址 - */ - public static String getGenPath(GenTable table, String template) - { - String genPath = table.getGenPath(); - if (StringUtils.equals(genPath, "/")) - { - return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); - } - return genPath + File.separator + VelocityUtils.getFileName(template, table); - } -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java deleted file mode 100644 index 3037f70..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ruoyi.generator.service; - -import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; - -/** - * 业务字段 服务层 - * - * @author ruoyi - */ -public interface IGenTableColumnService -{ - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - public List selectGenTableColumnListByTableId(Long tableId); - - /** - * 新增业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int insertGenTableColumn(GenTableColumn genTableColumn); - - /** - * 修改业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int updateGenTableColumn(GenTableColumn genTableColumn); - - /** - * 删除业务字段信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableColumnByIds(String ids); -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java deleted file mode 100644 index 9d53f95..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.ruoyi.generator.service; - -import java.util.List; -import java.util.Map; -import com.ruoyi.generator.domain.GenTable; - -/** - * 业务 服务层 - * - * @author ruoyi - */ -public interface IGenTableService -{ - /** - * 查询业务列表 - * - * @param genTable 业务信息 - * @return 业务集合 - */ - public List selectGenTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param genTable 业务信息 - * @return 数据库表集合 - */ - public List selectDbTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @return 数据库表集合 - */ - public List selectDbTableListByNames(String[] tableNames); - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - public List selectGenTableAll(); - - /** - * 查询业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - public GenTable selectGenTableById(Long id); - - /** - * 修改业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - public void updateGenTable(GenTable genTable); - - /** - * 删除业务信息 - * - * @param tableIds 需要删除的表数据ID - * @return 结果 - */ - public void deleteGenTableByIds(Long[] tableIds); - - /** - * 导入表结构 - * - * @param tableList 导入表列表 - */ - public void importGenTable(List tableList); - - /** - * 预览代码 - * - * @param tableId 表编号 - * @return 预览数据列表 - */ - public Map previewCode(Long tableId); - - /** - * 生成代码（下载方式） - * - * @param tableName 表名称 - * @return 数据 - */ - public byte[] downloadCode(String tableName); - - /** - * 生成代码（自定义路径） - * - * @param tableName 表名称 - * @return 数据 - */ - public void generatorCode(String tableName); - - /** - * 同步数据库 - * - * @param tableName 表名称 - */ - public void synchDb(String tableName); - - /** - * 批量生成代码（下载方式） - * - * @param tableNames 表数组 - * @return 数据 - */ - public byte[] downloadCode(String[] tableNames); - - /** - * 修改保存参数校验 - * - * @param genTable 业务信息 - */ - public void validateEdit(GenTable genTable); -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java deleted file mode 100644 index 06c6821..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ /dev/null @@ -1,258 +0,0 @@ -package com.ruoyi.generator.util; - -import java.util.Arrays; -import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; - -/** - * 代码生成器 工具类 - * - * @author ruoyi - */ -public class GenUtils -{ - /** - * 初始化表信息 - */ - public static void initTable(GenTable genTable, String operName) - { - genTable.setClassName(convertClassName(genTable.getTableName())); - genTable.setPackageName(GenConfig.getPackageName()); - genTable.setModuleName(getModuleName(GenConfig.getPackageName())); - genTable.setBusinessName(getBusinessName(genTable.getTableName())); - genTable.setFunctionName(replaceText(genTable.getTableComment())); - genTable.setFunctionAuthor(GenConfig.getAuthor()); - genTable.setCreateBy(operName); - } - - /** - * 初始化列属性字段 - */ - public static void initColumnField(GenTableColumn column, GenTable table) - { - String dataType = getDbType(column.getColumnType()); - String columnName = column.getColumnName(); - column.setTableId(table.getTableId()); - column.setCreateBy(table.getCreateBy()); - // 设置java字段名 - column.setJavaField(StringUtils.toCamelCase(columnName)); - // 设置默认类型 - column.setJavaType(GenConstants.TYPE_STRING); - - if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) - { - // 字符串长度超过500设置为文本域 - Integer columnLength = getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; - column.setHtmlType(htmlType); - } - else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) - { - column.setJavaType(GenConstants.TYPE_DATE); - column.setHtmlType(GenConstants.HTML_DATETIME); - } - else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) - { - column.setHtmlType(GenConstants.HTML_INPUT); - - // 如果是浮点型 统一用BigDecimal - String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ","); - if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) - { - column.setJavaType(GenConstants.TYPE_BIGDECIMAL); - } - // 如果是整形 - else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) - { - column.setJavaType(GenConstants.TYPE_INTEGER); - } - // 长整形 - else - { - column.setJavaType(GenConstants.TYPE_LONG); - } - } - - // 插入字段（默认所有字段都需要插入） - column.setIsInsert(GenConstants.REQUIRE); - - // 编辑字段 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) - { - column.setIsEdit(GenConstants.REQUIRE); - } - // 列表字段 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) - { - column.setIsList(GenConstants.REQUIRE); - } - // 查询字段 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) - { - column.setIsQuery(GenConstants.REQUIRE); - } - - // 查询字段类型 - if (StringUtils.endsWithIgnoreCase(columnName, "name")) - { - column.setQueryType(GenConstants.QUERY_LIKE); - } - // 状态字段设置单选框 - if (StringUtils.endsWithIgnoreCase(columnName, "status")) - { - column.setHtmlType(GenConstants.HTML_RADIO); - } - // 类型&性别字段设置下拉框 - else if (StringUtils.endsWithIgnoreCase(columnName, "type") - || StringUtils.endsWithIgnoreCase(columnName, "sex")) - { - column.setHtmlType(GenConstants.HTML_SELECT); - } - // 图片字段设置图片上传控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "image")) - { - column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } - // 文件字段设置文件上传控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "file")) - { - column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } - // 内容字段设置富文本控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "content")) - { - column.setHtmlType(GenConstants.HTML_EDITOR); - } - } - - /** - * 校验数组是否包含指定值 - * - * @param arr 数组 - * @param targetValue 值 - * @return 是否包含 - */ - public static boolean arraysContains(String[] arr, String targetValue) - { - return Arrays.asList(arr).contains(targetValue); - } - - /** - * 获取模块名 - * - * @param packageName 包名 - * @return 模块名 - */ - public static String getModuleName(String packageName) - { - int lastIndex = packageName.lastIndexOf("."); - int nameLength = packageName.length(); - String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength); - return moduleName; - } - - /** - * 获取业务名 - * - * @param tableName 表名 - * @return 业务名 - */ - public static String getBusinessName(String tableName) - { - int lastIndex = tableName.lastIndexOf("_"); - int nameLength = tableName.length(); - String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength); - return businessName; - } - - /** - * 表名转换成Java类名 - * - * @param tableName 表名称 - * @return 类名 - */ - public static String convertClassName(String tableName) - { - boolean autoRemovePre = GenConfig.getAutoRemovePre(); - String tablePrefix = GenConfig.getTablePrefix(); - if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) - { - String[] searchList = StringUtils.split(tablePrefix, ","); - tableName = replaceFirst(tableName, searchList); - } - return StringUtils.convertToCamelCase(tableName); - } - - /** - * 批量替换前缀 - * - * @param replacementm 替换值 - * @param searchList 替换列表 - * @return - */ - public static String replaceFirst(String replacementm, String[] searchList) - { - String text = replacementm; - for (String searchString : searchList) - { - if (replacementm.startsWith(searchString)) - { - text = replacementm.replaceFirst(searchString, ""); - break; - } - } - return text; - } - - /** - * 关键字替换 - * - * @param text 需要被替换的名字 - * @return 替换后的名字 - */ - public static String replaceText(String text) - { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); - } - - /** - * 获取数据库类型字段 - * - * @param columnType 列类型 - * @return 截取后的列类型 - */ - public static String getDbType(String columnType) - { - if (StringUtils.indexOf(columnType, "(") > 0) - { - return StringUtils.substringBefore(columnType, "("); - } - else - { - return columnType; - } - } - - /** - * 获取字段长度 - * - * @param columnType 列类型 - * @return 截取后的列类型 - */ - public static Integer getColumnLength(String columnType) - { - if (StringUtils.indexOf(columnType, "(") > 0) - { - String length = StringUtils.substringBetween(columnType, "(", ")"); - return Integer.valueOf(length); - } - else - { - return 0; - } - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java deleted file mode 100644 index 62ce821..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.ruoyi.generator.util; - -import java.util.Properties; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeConstants; -import com.ruoyi.common.constant.Constants; - -/** - * VelocityEngine工厂 - * - * @author ruoyi - */ -public class VelocityInitializer -{ - /** - * 初始化vm方法 - */ - public static void initVelocity() - { - Properties p = new Properties(); - try - { - // 定义字符集 - p.setProperty(RuntimeConstants.INPUT_ENCODING, Constants.UTF8); - p.setProperty(RuntimeConstants.RESOURCE_LOADERS, "class"); - p.setProperty("resource.loader.class.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); - // 初始化Velocity引擎，指定配置Properties - Velocity.init(p); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java deleted file mode 100644 index 1f8d8f1..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ /dev/null @@ -1,361 +0,0 @@ -package com.ruoyi.generator.util; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import org.apache.velocity.VelocityContext; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; - -/** - * 模板处理工具类 - * - * @author ruoyi - */ -public class VelocityUtils -{ - /** 项目空间路径 */ - private static final String PROJECT_PATH = "main/java"; - - /** mybatis空间路径 */ - private static final String MYBATIS_PATH = "main/resources/mapper"; - - /** 默认上级菜单，系统工具 */ - private static final String DEFAULT_PARENT_MENU_ID = "3"; - - /** - * 设置模板变量信息 - * - * @return 模板列表 - */ - public static VelocityContext prepareContext(GenTable genTable) - { - String moduleName = genTable.getModuleName(); - String businessName = genTable.getBusinessName(); - String packageName = genTable.getPackageName(); - String tplCategory = genTable.getTplCategory(); - String functionName = genTable.getFunctionName(); - - VelocityContext velocityContext = new VelocityContext(); - velocityContext.put("tplCategory", genTable.getTplCategory()); - velocityContext.put("tableName", genTable.getTableName()); - velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); - velocityContext.put("ClassName", genTable.getClassName()); - velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName())); - velocityContext.put("moduleName", genTable.getModuleName()); - velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName())); - velocityContext.put("businessName", genTable.getBusinessName()); - velocityContext.put("basePackage", getPackagePrefix(packageName)); - velocityContext.put("packageName", packageName); - velocityContext.put("author", genTable.getFunctionAuthor()); - velocityContext.put("datetime", DateUtils.getDate()); - velocityContext.put("pkColumn", genTable.getPkColumn()); - velocityContext.put("importList", getImportList(genTable)); - velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); - velocityContext.put("columns", genTable.getColumns()); - velocityContext.put("table", genTable); - setMenuVelocityContext(velocityContext, genTable); - if (GenConstants.TPL_TREE.equals(tplCategory)) - { - setTreeVelocityContext(velocityContext, genTable); - } - if (GenConstants.TPL_SUB.equals(tplCategory)) - { - setSubVelocityContext(velocityContext, genTable); - } - return velocityContext; - } - - public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) - { - String options = genTable.getOptions(); - JSONObject paramsObj = JSONObject.parseObject(options); - String parentMenuId = getParentMenuId(paramsObj); - context.put("parentMenuId", parentMenuId); - } - - public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) - { - String options = genTable.getOptions(); - JSONObject paramsObj = JSONObject.parseObject(options); - String treeCode = getTreecode(paramsObj); - String treeParentCode = getTreeParentCode(paramsObj); - String treeName = getTreeName(paramsObj); - - context.put("treeCode", treeCode); - context.put("treeParentCode", treeParentCode); - context.put("treeName", treeName); - context.put("expandColumn", getExpandColumn(genTable)); - if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) - { - context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE)); - } - if (paramsObj.containsKey(GenConstants.TREE_NAME)) - { - context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME)); - } - } - - public static void setSubVelocityContext(VelocityContext context, GenTable genTable) - { - GenTable subTable = genTable.getSubTable(); - String subTableName = genTable.getSubTableName(); - String subTableFkName = genTable.getSubTableFkName(); - String subClassName = genTable.getSubTable().getClassName(); - String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName); - - context.put("subTable", subTable); - context.put("subTableName", subTableName); - context.put("subTableFkName", subTableFkName); - context.put("subTableFkClassName", subTableFkClassName); - context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName)); - context.put("subClassName", subClassName); - context.put("subclassName", StringUtils.uncapitalize(subClassName)); - context.put("subImportList", getImportList(genTable.getSubTable())); - } - - /** - * 获取模板信息 - * - * @return 模板列表 - */ - public static List getTemplateList(String tplCategory) - { - List templates = new ArrayList(); - templates.add("vm/java/domain.java.vm"); - templates.add("vm/java/mapper.java.vm"); - templates.add("vm/java/service.java.vm"); - templates.add("vm/java/serviceImpl.java.vm"); - templates.add("vm/java/controller.java.vm"); - templates.add("vm/xml/mapper.xml.vm"); - templates.add("vm/sql/sql.vm"); - templates.add("vm/js/api.js.vm"); - if (GenConstants.TPL_CRUD.equals(tplCategory)) - { - templates.add("vm/vue/index.vue.vm"); - } - else if (GenConstants.TPL_TREE.equals(tplCategory)) - { - templates.add("vm/vue/index-tree.vue.vm"); - } - else if (GenConstants.TPL_SUB.equals(tplCategory)) - { - templates.add("vm/vue/index.vue.vm"); - templates.add("vm/java/sub-domain.java.vm"); - } - return templates; - } - - /** - * 获取文件名 - */ - public static String getFileName(String template, GenTable genTable) - { - // 文件名称 - String fileName = ""; - // 包路径 - String packageName = genTable.getPackageName(); - // 模块名 - String moduleName = genTable.getModuleName(); - // 大写类名 - String className = genTable.getClassName(); - // 业务名称 - String businessName = genTable.getBusinessName(); - - String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/"); - String mybatisPath = MYBATIS_PATH + "/" + moduleName; - String vuePath = "vue"; - - if (template.contains("domain.java.vm")) - { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); - } - if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) - { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); - } - else if (template.contains("mapper.java.vm")) - { - fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); - } - else if (template.contains("service.java.vm")) - { - fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); - } - else if (template.contains("serviceImpl.java.vm")) - { - fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); - } - else if (template.contains("controller.java.vm")) - { - fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); - } - else if (template.contains("mapper.xml.vm")) - { - fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); - } - else if (template.contains("sql.vm")) - { - fileName = businessName + "Menu.sql"; - } - else if (template.contains("api.js.vm")) - { - fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName); - } - else if (template.contains("index.vue.vm")) - { - fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } - else if (template.contains("index-tree.vue.vm")) - { - fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } - return fileName; - } - - /** - * 获取包前缀 - * - * @param packageName 包名称 - * @return 包前缀名称 - */ - public static String getPackagePrefix(String packageName) - { - int lastIndex = packageName.lastIndexOf("."); - String basePackage = StringUtils.substring(packageName, 0, lastIndex); - return basePackage; - } - - /** - * 根据列类型获取导入包 - * - * @param genTable 业务表对象 - * @return 返回需要导入的包列表 - */ - public static HashSet getImportList(GenTable genTable) - { - List columns = genTable.getColumns(); - GenTable subGenTable = genTable.getSubTable(); - HashSet importList = new HashSet(); - if (StringUtils.isNotNull(subGenTable)) - { - importList.add("java.util.List"); - } - for (GenTableColumn column : columns) - { - if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) - { - importList.add("java.util.Date"); - importList.add("com.fasterxml.jackson.annotation.JsonFormat"); - } - else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) - { - importList.add("java.math.BigDecimal"); - } - } - return importList; - } - - /** - * 获取权限前缀 - * - * @param moduleName 模块名称 - * @param businessName 业务名称 - * @return 返回权限前缀 - */ - public static String getPermissionPrefix(String moduleName, String businessName) - { - return StringUtils.format("{}:{}", moduleName, businessName); - } - - /** - * 获取上级菜单ID字段 - * - * @param paramsObj 生成其他选项 - * @return 上级菜单ID字段 - */ - public static String getParentMenuId(JSONObject paramsObj) - { - if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)) - { - return paramsObj.getString(GenConstants.PARENT_MENU_ID); - } - return DEFAULT_PARENT_MENU_ID; - } - - /** - * 获取树编码 - * - * @param paramsObj 生成其他选项 - * @return 树编码 - */ - public static String getTreecode(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_CODE)) - { - return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE)); - } - return StringUtils.EMPTY; - } - - /** - * 获取树父编码 - * - * @param paramsObj 生成其他选项 - * @return 树父编码 - */ - public static String getTreeParentCode(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) - { - return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE)); - } - return StringUtils.EMPTY; - } - - /** - * 获取树名称 - * - * @param paramsObj 生成其他选项 - * @return 树名称 - */ - public static String getTreeName(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_NAME)) - { - return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME)); - } - return StringUtils.EMPTY; - } - - /** - * 获取需要在哪一列上面显示展开按钮 - * - * @param genTable 业务表对象 - * @return 展开按钮列序号 - */ - public static int getExpandColumn(GenTable genTable) - { - String options = genTable.getOptions(); - JSONObject paramsObj = JSONObject.parseObject(options); - String treeName = paramsObj.getString(GenConstants.TREE_NAME); - int num = 0; - for (GenTableColumn column : genTable.getColumns()) - { - if (column.isList()) - { - num++; - String columnName = column.getColumnName(); - if (columnName.equals(treeName)) - { - break; - } - } - } - return num; - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/generator.yml b/exam-online-api-DEL/ruoyi-generator/src/main/resources/generator.yml deleted file mode 100644 index 5bd3dd6..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/generator.yml +++ /dev/null @@ -1,10 +0,0 @@ -# 代码生成 -gen: - # 作者 - author: ruoyi - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_ \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/exam-online-api-DEL/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml deleted file mode 100644 index c5231e7..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - - - - - - - - - select ifnull(max(column_id),0) + 1 from gen_table_column - - insert into gen_table_column ( - table_id, - column_name, - column_comment, - column_type, - java_type, - java_field, - is_pk, - is_increment, - is_required, - is_insert, - is_edit, - is_list, - is_query, - query_type, - html_type, - dict_type, - sort, - create_by, - create_time - )values( - #{tableId}, - #{columnName}, - #{columnComment}, - #{columnType}, - #{javaType}, - #{javaField}, - #{isPk}, - #{isIncrement}, - #{isRequired}, - #{isInsert}, - #{isEdit}, - #{isList}, - #{isQuery}, - #{queryType}, - #{htmlType}, - #{dictType}, - #{sort}, - #{createBy}, - now() - ) - - - - update gen_table_column - - column_comment = #{columnComment}, - java_type = #{javaType}, - java_field = #{javaField}, - is_insert = #{isInsert,jdbcType=CHAR}, - is_edit = #{isEdit,jdbcType=CHAR}, - is_list = #{isList,jdbcType=CHAR}, - is_query = #{isQuery,jdbcType=CHAR}, - is_required = #{isRequired,jdbcType=CHAR}, - query_type = #{queryType,jdbcType=VARCHAR}, - html_type = #{htmlType,jdbcType=VARCHAR}, - dict_type = #{dictType,jdbcType=VARCHAR}, - sort = #{sort}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = now() - - where column_id = #{columnId} - - - - delete from gen_table_column where table_id in - - #{tableId} - - - - - delete from gen_table_column where column_id in - - #{item.columnId} - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/exam-online-api-DEL/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml deleted file mode 100644 index fd0d273..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table - - - - - - - - - - - - - - - - - - - - - select ifnull(max(table_id),0) + 1 from gen_table - - insert into gen_table ( - table_name, - table_comment, - class_name, - tpl_category, - package_name, - module_name, - business_name, - function_name, - function_author, - gen_type, - gen_path, - remark, - create_by, - create_time - )values( - #{tableName}, - #{tableComment}, - #{className}, - #{tplCategory}, - #{packageName}, - #{moduleName}, - #{businessName}, - #{functionName}, - #{functionAuthor}, - #{genType}, - #{genPath}, - #{remark}, - #{createBy}, - now() - ) - - - - ${sql} - - - - update gen_table - - table_name = #{tableName}, - table_comment = #{tableComment}, - sub_table_name = #{subTableName}, - sub_table_fk_name = #{subTableFkName}, - class_name = #{className}, - function_author = #{functionAuthor}, - gen_type = #{genType}, - gen_path = #{genPath}, - tpl_category = #{tplCategory}, - package_name = #{packageName}, - module_name = #{moduleName}, - business_name = #{businessName}, - function_name = #{functionName}, - options = #{options}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = now() - - where table_id = #{tableId} - - - - delete from gen_table where table_id in - - #{tableId} - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/controller.java.vm deleted file mode 100644 index 1f9461f..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ /dev/null @@ -1,114 +0,0 @@ -package ${packageName}.controller; - -import java.util.List; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.common.utils.poi.ExcelUtil; -#if($table.crud || $table.sub) -import com.ruoyi.common.core.page.TableDataInfo; -#elseif($table.tree) -#end - -/** - * ${functionName}Controller - * - * @author ${author} - * @date ${datetime} - */ -@RestController -@RequestMapping("/${moduleName}/${businessName}") -public class ${ClassName}Controller extends BaseController -{ - @Autowired - private I${ClassName}Service ${className}Service; - - /** - * 查询${functionName}列表 - */ - @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") - @GetMapping("/list") -#if($table.crud || $table.sub) - public TableDataInfo list(${ClassName} ${className}) - { - startPage(); - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return getDataTable(list); - } -#elseif($table.tree) - public AjaxResult list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return AjaxResult.success(list); - } -#end - - /** - * 导出${functionName}列表 - */ - @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") - @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); - return util.exportExcel(list, "${functionName}数据"); - } - - /** - * 获取${functionName}详细信息 - */ - @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") - @GetMapping(value = "/{${pkColumn.javaField}}") - public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { - return AjaxResult.success(${className}Service.select${ClassName}ById(${pkColumn.javaField})); - } - - /** - * 新增${functionName} - */ - @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") - @Log(title = "${functionName}", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.insert${ClassName}(${className})); - } - - /** - * 修改${functionName} - */ - @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") - @Log(title = "${functionName}", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.update${ClassName}(${className})); - } - - /** - * 删除${functionName} - */ - @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") - public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) - { - return toAjax(${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s)); - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/domain.java.vm deleted file mode 100644 index bd51c17..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ /dev/null @@ -1,105 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $importList) -import ${import}; -#end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -#if($table.crud || $table.sub) -import com.ruoyi.common.core.domain.BaseEntity; -#elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; -#end - -/** - * ${functionName}对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -#if($table.crud || $table.sub) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity") -#end -public class ${ClassName} extends ${Entity} -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#if($table.sub) - /** $table.subTable.functionName信息 */ - private List<${subClassName}> ${subclassName}List; - -#end -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - -#if($table.sub) - public List<${subClassName}> get${subClassName}List() - { - return ${subclassName}List; - } - - public void set${subClassName}List(List<${subClassName}> ${subclassName}List) - { - this.${subclassName}List = ${subclassName}List; - } - -#end - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end -#if($table.sub) - .append("${subclassName}List", get${subClassName}List()) -#end - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm deleted file mode 100644 index 282d9ea..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ /dev/null @@ -1,91 +0,0 @@ -package ${packageName}.mapper; - -import java.util.List; -import ${packageName}.domain.${ClassName}; -#if($table.sub) -import ${packageName}.domain.${subClassName}; -#end - -/** - * ${functionName}Mapper接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface ${ClassName}Mapper -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 删除${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据ID - * @return 结果 - */ - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); -#if($table.sub) - - /** - * 批量删除${subTable.functionName} - * - * @param customerIds 需要删除的数据ID - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 批量新增${subTable.functionName} - * - * @param ${subclassName}List ${subTable.functionName}列表 - * @return 结果 - */ - public int batch${subClassName}(List<${subClassName}> ${subclassName}List); - - - /** - * 通过${functionName}ID删除${subTable.functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); -#end -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/service.java.vm deleted file mode 100644 index 1217d53..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ /dev/null @@ -1,61 +0,0 @@ -package ${packageName}.service; - -import java.util.List; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Service接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface I${ClassName}Service -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}ID - * @return 结果 - */ - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm deleted file mode 100644 index 1351738..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ /dev/null @@ -1,166 +0,0 @@ -package ${packageName}.service.impl; - -import java.util.List; -#foreach ($column in $columns) -#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.utils.DateUtils; -#break -#end -#end -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -#if($table.sub) -import java.util.ArrayList; -import com.ruoyi.common.utils.StringUtils; -import org.springframework.transaction.annotation.Transactional; -import ${packageName}.domain.${subClassName}; -#end -import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; - -/** - * ${functionName}Service业务层处理 - * - * @author ${author} - * @date ${datetime} - */ -@Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service -{ - @Autowired - private ${ClassName}Mapper ${className}Mapper; - - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - @Override - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.select${ClassName}ById(${pkColumn.javaField}); - } - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName} - */ - @Override - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) - { - return ${className}Mapper.select${ClassName}List(${className}); - } - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int insert${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'createTime') - ${className}.setCreateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - int rows = ${className}Mapper.insert${ClassName}(${className}); - insert${subClassName}(${className}); - return rows; -#else - return ${className}Mapper.insert${ClassName}(${className}); -#end - } - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int update${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'updateTime') - ${className}.setUpdateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); - insert${subClassName}(${className}); -#end - return ${className}Mapper.update${ClassName}(${className}); - } - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}ID - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); -#end - return ${className}Mapper.delete${ClassName}ByIds(${pkColumn.javaField}s); - } - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - @Override - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); -#end - return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField}); - } -#if($table.sub) - - /** - * 新增${subTable.functionName}信息 - * - * @param ${className} ${functionName}对象 - */ - public void insert${subClassName}(${ClassName} ${className}) - { - List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); - Long ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); - if (StringUtils.isNotNull(${subclassName}List)) - { - List<${subClassName}> list = new ArrayList<${subClassName}>(); - for (${subClassName} ${subclassName} : ${subclassName}List) - { - ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); - list.add(${subclassName}); - } - if (list.size() > 0) - { - ${className}Mapper.batch${subClassName}(list); - } - } - } -#end -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm deleted file mode 100644 index a3f53eb..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm +++ /dev/null @@ -1,76 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $subImportList) -import ${import}; -#end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * ${subTable.functionName}对象 ${subTableName} - * - * @author ${author} - * @date ${datetime} - */ -public class ${subClassName} extends BaseEntity -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $subTable.columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/js/api.js.vm deleted file mode 100644 index 296d41a..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/js/api.js.vm +++ /dev/null @@ -1,53 +0,0 @@ -import request from '@/utils/request' - -// 查询${functionName}列表 -export function list${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/list', - method: 'get', - params: query - }) -} - -// 查询${functionName}详细 -export function get${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'get' - }) -} - -// 新增${functionName} -export function add${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'post', - data: data - }) -} - -// 修改${functionName} -export function update${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'put', - data: data - }) -} - -// 删除${functionName} -export function del${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'delete' - }) -} - -// 导出${functionName} -export function export${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/export', - method: 'get', - params: query - }) -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/sql/sql.vm deleted file mode 100644 index c7af436..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/sql/sql.vm +++ /dev/null @@ -1,18 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', now(), '', null, '${functionName}菜单'); - --- 按钮父菜单ID -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', now(), '', null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', now(), '', null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', now(), '', null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', now(), '', null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, menu_name_key, path, `component`, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', now(), '', null, ''); \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm deleted file mode 100644 index dc1fb2b..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ /dev/null @@ -1,503 +0,0 @@ - - - diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm deleted file mode 100644 index 54ad4db..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ /dev/null @@ -1,608 +0,0 @@ - - - diff --git a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm deleted file mode 100644 index 15c6c98..0000000 --- a/exam-online-api-DEL/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm +++ /dev/null @@ -1,135 +0,0 @@ - - - - - -#foreach ($column in $columns) - -#end - -#if($table.sub) - - - - - - -#foreach ($column in $subTable.columns) - -#end - -#end - - - select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName} - - - - - - - - insert into ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - $column.columnName, -#end -#end - - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - #{$column.javaField}, -#end -#end - - - - - update ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName) - $column.columnName = #{$column.javaField}, -#end -#end - - where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} in - - #{${pkColumn.javaField}} - - -#if($table.sub) - - - delete from ${subTableName} where ${subTableFkName} in - - #{${subTableFkclassName}} - - - - - delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} - - - - insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($velocityCount != $subTable.columns.size()),#end#end) values - - (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($velocityCount != $subTable.columns.size()),#end#end) - - -#end - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-quartz/pom.xml b/exam-online-api-DEL/ruoyi-quartz/pom.xml deleted file mode 100644 index 43dcb2f..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.8.6 - - 4.0.0 - - ruoyi-quartz - - - quartz定时任务 - - - - - - - org.quartz-scheduler - quartz - - - com.mchange - c3p0 - - - - - - - com.ruoyi - ruoyi-common - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java deleted file mode 100644 index 44d51ac..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java +++ /dev/null @@ -1,57 +0,0 @@ -//package com.ruoyi.quartz.config; -// -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.scheduling.quartz.SchedulerFactoryBean; -//import javax.sql.DataSource; -//import java.util.Properties; -// -///** -// * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效） -// * -// * @author ruoyi -// */ -//@Configuration -//public class ScheduleConfig -//{ -// @Bean -// public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) -// { -// SchedulerFactoryBean factory = new SchedulerFactoryBean(); -// factory.setDataSource(dataSource); -// -// // quartz参数 -// Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); -// prop.put("org.quartz.scheduler.instanceId", "AUTO"); -// // 线程池配置 -// prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); -// prop.put("org.quartz.threadPool.threadCount", "20"); -// prop.put("org.quartz.threadPool.threadPriority", "5"); -// // JobStore配置 -// prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore"); -// // 集群配置 -// prop.put("org.quartz.jobStore.isClustered", "true"); -// prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000"); -// prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1"); -// prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true"); -// -// // sqlserver 启用 -// // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?"); -// prop.put("org.quartz.jobStore.misfireThreshold", "12000"); -// prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); -// -// factory.setQuartzProperties(prop); -// factory.setSchedulerName("RuoyiScheduler"); -// // 延时启动 -// factory.setStartupDelay(1); -// factory.setApplicationContextSchedulerContextKey("applicationContextKey"); -// // 可选，QuartzScheduler -// // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了 -// factory.setOverwriteExistingJobs(true); -// // 设置自动启动，默认为true -// factory.setAutoStartup(true); -// -// return factory; -// } -//} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java deleted file mode 100644 index 5a1915e..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.ruoyi.quartz.controller; - -import java.util.List; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; - -/** - * 调度任务信息操作处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/job") -public class SysJobController extends BaseController -{ - @Autowired - private ISysJobService jobService; - - /** - * 查询定时任务列表 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:list')") - @GetMapping("/list") - public TableDataInfo list(SysJob sysJob) - { - startPage(); - List list = jobService.selectJobList(sysJob); - return getDataTable(list); - } - - /** - * 导出定时任务列表 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:export')") - @Log(title = "定时任务", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(SysJob sysJob) - { - List list = jobService.selectJobList(sysJob); - ExcelUtil util = new ExcelUtil(SysJob.class); - return util.exportExcel(list, "定时任务"); - } - - /** - * 获取定时任务详细信息 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:query')") - @GetMapping(value = "/{jobId}") - public AjaxResult getInfo(@PathVariable("jobId") Long jobId) - { - return AjaxResult.success(jobService.selectJobById(jobId)); - } - - /** - * 新增定时任务 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:add')") - @Log(title = "定时任务", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException - { - if (!CronUtils.isValid(sysJob.getCronExpression())) - { - return AjaxResult.error("新增任务'" + sysJob.getJobName() + "'失败，Cron表达式不正确"); - } - else if (StringUtils.containsIgnoreCase(sysJob.getInvokeTarget(), Constants.LOOKUP_RMI)) - { - return AjaxResult.error("新增任务'" + sysJob.getJobName() + "'失败，目标字符串不允许'rmi://'调用"); - } - sysJob.setCreateBy(SecurityUtils.getUsername()); - return toAjax(jobService.insertJob(sysJob)); - } - - /** - * 修改定时任务 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:edit')") - @Log(title = "定时任务", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException - { - if (!CronUtils.isValid(sysJob.getCronExpression())) - { - return AjaxResult.error("修改任务'" + sysJob.getJobName() + "'失败，Cron表达式不正确"); - } - else if (StringUtils.containsIgnoreCase(sysJob.getInvokeTarget(), Constants.LOOKUP_RMI)) - { - return AjaxResult.error("修改任务'" + sysJob.getJobName() + "'失败，目标字符串不允许'rmi://'调用"); - } - sysJob.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(jobService.updateJob(sysJob)); - } - - /** - * 定时任务状态修改 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") - @Log(title = "定时任务", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException - { - SysJob newJob = jobService.selectJobById(job.getJobId()); - newJob.setStatus(job.getStatus()); - return toAjax(jobService.changeStatus(newJob)); - } - - /** - * 定时任务立即执行一次 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") - @Log(title = "定时任务", businessType = BusinessType.UPDATE) - @PutMapping("/run") - public AjaxResult run(@RequestBody SysJob job) throws SchedulerException - { - jobService.run(job); - return AjaxResult.success(); - } - - /** - * 删除定时任务 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:remove')") - @Log(title = "定时任务", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobIds}") - public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException - { - jobService.deleteJobByIds(jobIds); - return AjaxResult.success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java deleted file mode 100644 index b1f8204..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ruoyi.quartz.controller; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; - -/** - * 调度日志操作处理 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/jobLog") -public class SysJobLogController extends BaseController -{ - @Autowired - private ISysJobLogService jobLogService; - - /** - * 查询定时任务调度日志列表 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:list')") - @GetMapping("/list") - public TableDataInfo list(SysJobLog sysJobLog) - { - startPage(); - List list = jobLogService.selectJobLogList(sysJobLog); - return getDataTable(list); - } - - /** - * 导出定时任务调度日志列表 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:export')") - @Log(title = "任务调度日志", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(SysJobLog sysJobLog) - { - List list = jobLogService.selectJobLogList(sysJobLog); - ExcelUtil util = new ExcelUtil(SysJobLog.class); - return util.exportExcel(list, "调度日志"); - } - - /** - * 根据调度编号获取详细信息 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:query')") - @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long jobLogId) - { - return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); - } - - - /** - * 删除定时任务调度日志 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:remove')") - @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobLogIds}") - public AjaxResult remove(@PathVariable Long[] jobLogIds) - { - return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); - } - - /** - * 清空定时任务调度日志 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:remove')") - @Log(title = "调度日志", businessType = BusinessType.CLEAN) - @DeleteMapping("/clean") - public AjaxResult clean() - { - jobLogService.cleanJobLog(); - return AjaxResult.success(); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java deleted file mode 100644 index 1f49695..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.ruoyi.quartz.domain; - -import java.util.Date; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.quartz.util.CronUtils; - -/** - * 定时任务调度表 sys_job - * - * @author ruoyi - */ -public class SysJob extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 任务ID */ - @Excel(name = "任务序号", cellType = ColumnType.NUMERIC) - private Long jobId; - - /** 任务名称 */ - @Excel(name = "任务名称") - private String jobName; - - /** 任务组名 */ - @Excel(name = "任务组名") - private String jobGroup; - - /** 调用目标字符串 */ - @Excel(name = "调用目标字符串") - private String invokeTarget; - - /** cron执行表达式 */ - @Excel(name = "执行表达式 ") - private String cronExpression; - - /** cron计划策略 */ - @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行") - private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; - - /** 是否并发执行（0允许 1禁止） */ - @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止") - private String concurrent; - - /** 任务状态（0正常 1暂停） */ - @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") - private String status; - - public Long getJobId() - { - return jobId; - } - - public void setJobId(Long jobId) - { - this.jobId = jobId; - } - - @NotBlank(message = "任务名称不能为空") - @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") - public String getJobName() - { - return jobName; - } - - public void setJobName(String jobName) - { - this.jobName = jobName; - } - - public String getJobGroup() - { - return jobGroup; - } - - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } - - @NotBlank(message = "调用目标字符串不能为空") - @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") - public String getInvokeTarget() - { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - @NotBlank(message = "Cron执行表达式不能为空") - @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") - public String getCronExpression() - { - return cronExpression; - } - - public void setCronExpression(String cronExpression) - { - this.cronExpression = cronExpression; - } - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - public Date getNextValidTime() - { - if (StringUtils.isNotEmpty(cronExpression)) - { - return CronUtils.getNextExecution(cronExpression); - } - return null; - } - - public String getMisfirePolicy() - { - return misfirePolicy; - } - - public void setMisfirePolicy(String misfirePolicy) - { - this.misfirePolicy = misfirePolicy; - } - - public String getConcurrent() - { - return concurrent; - } - - public void setConcurrent(String concurrent) - { - this.concurrent = concurrent; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobId", getJobId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("cronExpression", getCronExpression()) - .append("nextValidTime", getNextValidTime()) - .append("misfirePolicy", getMisfirePolicy()) - .append("concurrent", getConcurrent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java deleted file mode 100644 index 121c035..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.ruoyi.quartz.domain; - -import java.util.Date; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 定时任务调度日志表 sys_job_log - * - * @author ruoyi - */ -public class SysJobLog extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** ID */ - @Excel(name = "日志序号") - private Long jobLogId; - - /** 任务名称 */ - @Excel(name = "任务名称") - private String jobName; - - /** 任务组名 */ - @Excel(name = "任务组名") - private String jobGroup; - - /** 调用目标字符串 */ - @Excel(name = "调用目标字符串") - private String invokeTarget; - - /** 日志信息 */ - @Excel(name = "日志信息") - private String jobMessage; - - /** 执行状态（0正常 1失败） */ - @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败") - private String status; - - /** 异常信息 */ - @Excel(name = "异常信息") - private String exceptionInfo; - - /** 开始时间 */ - private Date startTime; - - /** 停止时间 */ - private Date stopTime; - - public Long getJobLogId() - { - return jobLogId; - } - - public void setJobLogId(Long jobLogId) - { - this.jobLogId = jobLogId; - } - - public String getJobName() - { - return jobName; - } - - public void setJobName(String jobName) - { - this.jobName = jobName; - } - - public String getJobGroup() - { - return jobGroup; - } - - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } - - public String getInvokeTarget() - { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - public String getJobMessage() - { - return jobMessage; - } - - public void setJobMessage(String jobMessage) - { - this.jobMessage = jobMessage; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getExceptionInfo() - { - return exceptionInfo; - } - - public void setExceptionInfo(String exceptionInfo) - { - this.exceptionInfo = exceptionInfo; - } - - public Date getStartTime() - { - return startTime; - } - - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStopTime() - { - return stopTime; - } - - public void setStopTime(Date stopTime) - { - this.stopTime = stopTime; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobLogId", getJobLogId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("jobMessage", getJobMessage()) - .append("status", getStatus()) - .append("exceptionInfo", getExceptionInfo()) - .append("startTime", getStartTime()) - .append("stopTime", getStopTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java deleted file mode 100644 index 727d916..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.quartz.mapper; - -import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; - -/** - * 调度任务日志信息 数据层 - * - * @author ruoyi - */ -public interface SysJobLogMapper -{ - /** - * 获取quartz调度器日志的计划任务 - * - * @param jobLog 调度日志信息 - * @return 调度任务日志集合 - */ - public List selectJobLogList(SysJobLog jobLog); - - /** - * 查询所有调度任务日志 - * - * @return 调度任务日志列表 - */ - public List selectJobLogAll(); - - /** - * 通过调度任务日志ID查询调度信息 - * - * @param jobLogId 调度任务日志ID - * @return 调度任务日志对象信息 - */ - public SysJobLog selectJobLogById(Long jobLogId); - - /** - * 新增任务日志 - * - * @param jobLog 调度日志信息 - * @return 结果 - */ - public int insertJobLog(SysJobLog jobLog); - - /** - * 批量删除调度日志信息 - * - * @param logIds 需要删除的数据ID - * @return 结果 - */ - public int deleteJobLogByIds(Long[] logIds); - - /** - * 删除任务日志 - * - * @param jobId 调度日志ID - * @return 结果 - */ - public int deleteJobLogById(Long jobId); - - /** - * 清空任务日志 - */ - public void cleanJobLog(); -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java deleted file mode 100644 index 20f45db..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ruoyi.quartz.mapper; - -import java.util.List; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 调度任务信息 数据层 - * - * @author ruoyi - */ -public interface SysJobMapper -{ - /** - * 查询调度任务日志集合 - * - * @param job 调度信息 - * @return 操作日志集合 - */ - public List selectJobList(SysJob job); - - /** - * 查询所有调度任务 - * - * @return 调度任务列表 - */ - public List selectJobAll(); - - /** - * 通过调度ID查询调度任务信息 - * - * @param jobId 调度ID - * @return 角色对象信息 - */ - public SysJob selectJobById(Long jobId); - - /** - * 通过调度ID删除调度任务信息 - * - * @param jobId 调度ID - * @return 结果 - */ - public int deleteJobById(Long jobId); - - /** - * 批量删除调度任务信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteJobByIds(Long[] ids); - - /** - * 修改调度任务信息 - * - * @param job 调度任务信息 - * @return 结果 - */ - public int updateJob(SysJob job); - - /** - * 新增调度任务信息 - * - * @param job 调度任务信息 - * @return 结果 - */ - public int insertJob(SysJob job); -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java deleted file mode 100644 index 8546792..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.ruoyi.quartz.service; - -import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; - -/** - * 定时任务调度日志信息信息 服务层 - * - * @author ruoyi - */ -public interface ISysJobLogService -{ - /** - * 获取quartz调度器日志的计划任务 - * - * @param jobLog 调度日志信息 - * @return 调度任务日志集合 - */ - public List selectJobLogList(SysJobLog jobLog); - - /** - * 通过调度任务日志ID查询调度信息 - * - * @param jobLogId 调度任务日志ID - * @return 调度任务日志对象信息 - */ - public SysJobLog selectJobLogById(Long jobLogId); - - /** - * 新增任务日志 - * - * @param jobLog 调度日志信息 - */ - public void addJobLog(SysJobLog jobLog); - - /** - * 批量删除调度日志信息 - * - * @param logIds 需要删除的日志ID - * @return 结果 - */ - public int deleteJobLogByIds(Long[] logIds); - - /** - * 删除任务日志 - * - * @param jobId 调度日志ID - * @return 结果 - */ - public int deleteJobLogById(Long jobId); - - /** - * 清空任务日志 - */ - public void cleanJobLog(); -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java deleted file mode 100644 index 6d62661..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.ruoyi.quartz.service; - -import java.util.List; -import org.quartz.SchedulerException; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 定时任务调度信息信息 服务层 - * - * @author ruoyi - */ -public interface ISysJobService -{ - /** - * 获取quartz调度器的计划任务 - * - * @param job 调度信息 - * @return 调度任务集合 - */ - public List selectJobList(SysJob job); - - /** - * 通过调度任务ID查询调度信息 - * - * @param jobId 调度任务ID - * @return 调度任务对象信息 - */ - public SysJob selectJobById(Long jobId); - - /** - * 暂停任务 - * - * @param job 调度信息 - * @return 结果 - */ - public int pauseJob(SysJob job) throws SchedulerException; - - /** - * 恢复任务 - * - * @param job 调度信息 - * @return 结果 - */ - public int resumeJob(SysJob job) throws SchedulerException; - - /** - * 删除任务后，所对应的trigger也将被删除 - * - * @param job 调度信息 - * @return 结果 - */ - public int deleteJob(SysJob job) throws SchedulerException; - - /** - * 批量删除调度信息 - * - * @param jobIds 需要删除的任务ID - * @return 结果 - */ - public void deleteJobByIds(Long[] jobIds) throws SchedulerException; - - /** - * 任务调度状态修改 - * - * @param job 调度信息 - * @return 结果 - */ - public int changeStatus(SysJob job) throws SchedulerException; - - /** - * 立即运行任务 - * - * @param job 调度信息 - * @return 结果 - */ - public void run(SysJob job) throws SchedulerException; - - /** - * 新增任务 - * - * @param job 调度信息 - * @return 结果 - */ - public int insertJob(SysJob job) throws SchedulerException, TaskException; - - /** - * 更新任务 - * - * @param job 调度信息 - * @return 结果 - */ - public int updateJob(SysJob job) throws SchedulerException, TaskException; - - /** - * 校验cron表达式是否有效 - * - * @param cronExpression 表达式 - * @return 结果 - */ - public boolean checkCronExpressionIsValid(String cronExpression); -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java deleted file mode 100644 index 812eed7..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.ruoyi.quartz.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.mapper.SysJobLogMapper; -import com.ruoyi.quartz.service.ISysJobLogService; - -/** - * 定时任务调度日志信息 服务层 - * - * @author ruoyi - */ -@Service -public class SysJobLogServiceImpl implements ISysJobLogService -{ - @Autowired - private SysJobLogMapper jobLogMapper; - - /** - * 获取quartz调度器日志的计划任务 - * - * @param jobLog 调度日志信息 - * @return 调度任务日志集合 - */ - @Override - public List selectJobLogList(SysJobLog jobLog) - { - return jobLogMapper.selectJobLogList(jobLog); - } - - /** - * 通过调度任务日志ID查询调度信息 - * - * @param jobLogId 调度任务日志ID - * @return 调度任务日志对象信息 - */ - @Override - public SysJobLog selectJobLogById(Long jobLogId) - { - return jobLogMapper.selectJobLogById(jobLogId); - } - - /** - * 新增任务日志 - * - * @param jobLog 调度日志信息 - */ - @Override - public void addJobLog(SysJobLog jobLog) - { - jobLogMapper.insertJobLog(jobLog); - } - - /** - * 批量删除调度日志信息 - * - * @param logIds 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteJobLogByIds(Long[] logIds) - { - return jobLogMapper.deleteJobLogByIds(logIds); - } - - /** - * 删除任务日志 - * - * @param jobId 调度日志ID - */ - @Override - public int deleteJobLogById(Long jobId) - { - return jobLogMapper.deleteJobLogById(jobId); - } - - /** - * 清空任务日志 - */ - @Override - public void cleanJobLog() - { - jobLogMapper.cleanJobLog(); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java deleted file mode 100644 index 57a5243..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ /dev/null @@ -1,254 +0,0 @@ -package com.ruoyi.quartz.service.impl; - -import java.util.List; -import javax.annotation.PostConstruct; -import org.quartz.JobDataMap; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.mapper.SysJobMapper; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; -import com.ruoyi.quartz.util.ScheduleUtils; - -/** - * 定时任务调度信息 服务层 - * - * @author ruoyi - */ -@Service -public class SysJobServiceImpl implements ISysJobService -{ - @Autowired - private Scheduler scheduler; - - @Autowired - private SysJobMapper jobMapper; - - /** - * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） - */ - @PostConstruct - public void init() throws SchedulerException, TaskException - { - scheduler.clear(); - List jobList = jobMapper.selectJobAll(); - for (SysJob job : jobList) - { - ScheduleUtils.createScheduleJob(scheduler, job); - } - } - - /** - * 获取quartz调度器的计划任务列表 - * - * @param job 调度信息 - * @return - */ - @Override - public List selectJobList(SysJob job) - { - return jobMapper.selectJobList(job); - } - - /** - * 通过调度任务ID查询调度信息 - * - * @param jobId 调度任务ID - * @return 调度任务对象信息 - */ - @Override - public SysJob selectJobById(Long jobId) - { - return jobMapper.selectJobById(jobId); - } - - /** - * 暂停任务 - * - * @param job 调度信息 - */ - @Override - @Transactional - public int pauseJob(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); - int rows = jobMapper.updateJob(job); - if (rows > 0) - { - scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - return rows; - } - - /** - * 恢复任务 - * - * @param job 调度信息 - */ - @Override - @Transactional - public int resumeJob(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); - int rows = jobMapper.updateJob(job); - if (rows > 0) - { - scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - return rows; - } - - /** - * 删除任务后，所对应的trigger也将被删除 - * - * @param job 调度信息 - */ - @Override - @Transactional - public int deleteJob(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - int rows = jobMapper.deleteJobById(jobId); - if (rows > 0) - { - scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - return rows; - } - - /** - * 批量删除调度信息 - * - * @param jobIds 需要删除的任务ID - * @return 结果 - */ - @Override - @Transactional - public void deleteJobByIds(Long[] jobIds) throws SchedulerException - { - for (Long jobId : jobIds) - { - SysJob job = jobMapper.selectJobById(jobId); - deleteJob(job); - } - } - - /** - * 任务调度状态修改 - * - * @param job 调度信息 - */ - @Override - @Transactional - public int changeStatus(SysJob job) throws SchedulerException - { - int rows = 0; - String status = job.getStatus(); - if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) - { - rows = resumeJob(job); - } - else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) - { - rows = pauseJob(job); - } - return rows; - } - - /** - * 立即运行任务 - * - * @param job 调度信息 - */ - @Override - @Transactional - public void run(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - SysJob properties = selectJobById(job.getJobId()); - // 参数 - JobDataMap dataMap = new JobDataMap(); - dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); - scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap); - } - - /** - * 新增任务 - * - * @param job 调度信息 调度信息 - */ - @Override - @Transactional - public int insertJob(SysJob job) throws SchedulerException, TaskException - { - job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); - int rows = jobMapper.insertJob(job); - if (rows > 0) - { - ScheduleUtils.createScheduleJob(scheduler, job); - } - return rows; - } - - /** - * 更新任务的时间表达式 - * - * @param job 调度信息 - */ - @Override - @Transactional - public int updateJob(SysJob job) throws SchedulerException, TaskException - { - SysJob properties = selectJobById(job.getJobId()); - int rows = jobMapper.updateJob(job); - if (rows > 0) - { - updateSchedulerJob(job, properties.getJobGroup()); - } - return rows; - } - - /** - * 更新任务 - * - * @param job 任务对象 - * @param jobGroup 任务组名 - */ - public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException - { - Long jobId = job.getJobId(); - // 判断是否存在 - JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); - if (scheduler.checkExists(jobKey)) - { - // 防止创建时存在数据问题 先移除，然后在执行创建操作 - scheduler.deleteJob(jobKey); - } - ScheduleUtils.createScheduleJob(scheduler, job); - } - - /** - * 校验cron表达式是否有效 - * - * @param cronExpression 表达式 - * @return 结果 - */ - @Override - public boolean checkCronExpressionIsValid(String cronExpression) - { - return CronUtils.isValid(cronExpression); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java deleted file mode 100644 index 853243b..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.ruoyi.quartz.task; - -import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; - -/** - * 定时任务调度测试 - * - * @author ruoyi - */ -@Component("ryTask") -public class RyTask -{ - public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) - { - System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i)); - } - - public void ryParams(String params) - { - System.out.println("执行有参方法：" + params); - } - - public void ryNoParams() - { - System.out.println("执行无参方法"); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java deleted file mode 100644 index 731a5eb..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.ruoyi.quartz.util; - -import java.util.Date; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; - -/** - * 抽象quartz调用 - * - * @author ruoyi - */ -public abstract class AbstractQuartzJob implements Job -{ - private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); - - /** - * 线程本地变量 - */ - private static ThreadLocal threadLocal = new ThreadLocal<>(); - - @Override - public void execute(JobExecutionContext context) throws JobExecutionException - { - SysJob sysJob = new SysJob(); - BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES)); - try - { - before(context, sysJob); - if (sysJob != null) - { - doExecute(context, sysJob); - } - after(context, sysJob, null); - } - catch (Exception e) - { - log.error("任务执行异常 - ：", e); - after(context, sysJob, e); - } - } - - /** - * 执行前 - * - * @param context 工作执行上下文对象 - * @param sysJob 系统计划任务 - */ - protected void before(JobExecutionContext context, SysJob sysJob) - { - threadLocal.set(new Date()); - } - - /** - * 执行后 - * - * @param context 工作执行上下文对象 - * @param sysJob 系统计划任务 - */ - protected void after(JobExecutionContext context, SysJob sysJob, Exception e) - { - Date startTime = threadLocal.get(); - threadLocal.remove(); - - final SysJobLog sysJobLog = new SysJobLog(); - sysJobLog.setJobName(sysJob.getJobName()); - sysJobLog.setJobGroup(sysJob.getJobGroup()); - sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); - sysJobLog.setStartTime(startTime); - sysJobLog.setStopTime(new Date()); - long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); - sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒"); - if (e != null) - { - sysJobLog.setStatus(Constants.FAIL); - String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); - sysJobLog.setExceptionInfo(errorMsg); - } - else - { - sysJobLog.setStatus(Constants.SUCCESS); - } - - // 写入数据库当中 - SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); - } - - /** - * 执行方法，由子类重载 - * - * @param context 工作执行上下文对象 - * @param sysJob 系统计划任务 - * @throws Exception 执行过程中的异常 - */ - protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception; -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java deleted file mode 100644 index dd53839..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ruoyi.quartz.util; - -import java.text.ParseException; -import java.util.Date; -import org.quartz.CronExpression; - -/** - * cron表达式工具类 - * - * @author ruoyi - * - */ -public class CronUtils -{ - /** - * 返回一个布尔值代表一个给定的Cron表达式的有效性 - * - * @param cronExpression Cron表达式 - * @return boolean 表达式是否有效 - */ - public static boolean isValid(String cronExpression) - { - return CronExpression.isValidExpression(cronExpression); - } - - /** - * 返回一个字符串值,表示该消息无效Cron表达式给出有效性 - * - * @param cronExpression Cron表达式 - * @return String 无效时返回表达式错误描述,如果有效返回null - */ - public static String getInvalidMessage(String cronExpression) - { - try - { - new CronExpression(cronExpression); - return null; - } - catch (ParseException pe) - { - return pe.getMessage(); - } - } - - /** - * 返回下一个执行时间根据给定的Cron表达式 - * - * @param cronExpression Cron表达式 - * @return Date 下次Cron表达式执行时间 - */ - public static Date getNextExecution(String cronExpression) - { - try - { - CronExpression cron = new CronExpression(cronExpression); - return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis())); - } - catch (ParseException e) - { - throw new IllegalArgumentException(e.getMessage()); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java deleted file mode 100644 index 40a19bd..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.ruoyi.quartz.util; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.LinkedList; -import java.util.List; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 任务执行工具 - * - * @author ruoyi - */ -public class JobInvokeUtil -{ - /** - * 执行方法 - * - * @param sysJob 系统任务 - */ - public static void invokeMethod(SysJob sysJob) throws Exception - { - String invokeTarget = sysJob.getInvokeTarget(); - String beanName = getBeanName(invokeTarget); - String methodName = getMethodName(invokeTarget); - List methodParams = getMethodParams(invokeTarget); - - if (!isValidClassName(beanName)) - { - Object bean = SpringUtils.getBean(beanName); - invokeMethod(bean, methodName, methodParams); - } - else - { - Object bean = Class.forName(beanName).newInstance(); - invokeMethod(bean, methodName, methodParams); - } - } - - /** - * 调用任务方法 - * - * @param bean 目标对象 - * @param methodName 方法名称 - * @param methodParams 方法参数 - */ - private static void invokeMethod(Object bean, String methodName, List methodParams) - throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, - InvocationTargetException - { - if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) - { - Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams)); - method.invoke(bean, getMethodParamsValue(methodParams)); - } - else - { - Method method = bean.getClass().getDeclaredMethod(methodName); - method.invoke(bean); - } - } - - /** - * 校验是否为为class包名 - * - * @param str 名称 - * @return true是 false否 - */ - public static boolean isValidClassName(String invokeTarget) - { - return StringUtils.countMatches(invokeTarget, ".") > 1; - } - - /** - * 获取bean名称 - * - * @param invokeTarget 目标字符串 - * @return bean名称 - */ - public static String getBeanName(String invokeTarget) - { - String beanName = StringUtils.substringBefore(invokeTarget, "("); - return StringUtils.substringBeforeLast(beanName, "."); - } - - /** - * 获取bean方法 - * - * @param invokeTarget 目标字符串 - * @return method方法 - */ - public static String getMethodName(String invokeTarget) - { - String methodName = StringUtils.substringBefore(invokeTarget, "("); - return StringUtils.substringAfterLast(methodName, "."); - } - - /** - * 获取method方法参数相关列表 - * - * @param invokeTarget 目标字符串 - * @return method方法相关参数列表 - */ - public static List getMethodParams(String invokeTarget) - { - String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")"); - if (StringUtils.isEmpty(methodStr)) - { - return null; - } - String[] methodParams = methodStr.split(","); - List classs = new LinkedList<>(); - for (int i = 0; i < methodParams.length; i++) - { - String str = StringUtils.trimToEmpty(methodParams[i]); - // String字符串类型，包含' - if (StringUtils.contains(str, "'")) - { - classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class }); - } - // boolean布尔类型，等于true或者false - else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false")) - { - classs.add(new Object[] { Boolean.valueOf(str), Boolean.class }); - } - // long长整形，包含L - else if (StringUtils.containsIgnoreCase(str, "L")) - { - classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class }); - } - // double浮点类型，包含D - else if (StringUtils.containsIgnoreCase(str, "D")) - { - classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class }); - } - // 其他类型归类为整形 - else - { - classs.add(new Object[] { Integer.valueOf(str), Integer.class }); - } - } - return classs; - } - - /** - * 获取参数类型 - * - * @param methodParams 参数相关列表 - * @return 参数类型列表 - */ - public static Class[] getMethodParamsType(List methodParams) - { - Class[] classs = new Class[methodParams.size()]; - int index = 0; - for (Object[] os : methodParams) - { - classs[index] = (Class) os[1]; - index++; - } - return classs; - } - - /** - * 获取参数值 - * - * @param methodParams 参数相关列表 - * @return 参数值列表 - */ - public static Object[] getMethodParamsValue(List methodParams) - { - Object[] classs = new Object[methodParams.size()]; - int index = 0; - for (Object[] os : methodParams) - { - classs[index] = (Object) os[0]; - index++; - } - return classs; - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java deleted file mode 100644 index 5e13558..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.quartz.util; - -import org.quartz.DisallowConcurrentExecution; -import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 定时任务处理（禁止并发执行） - * - * @author ruoyi - * - */ -@DisallowConcurrentExecution -public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob -{ - @Override - protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception - { - JobInvokeUtil.invokeMethod(sysJob); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java deleted file mode 100644 index e975326..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ruoyi.quartz.util; - -import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 定时任务处理（允许并发执行） - * - * @author ruoyi - * - */ -public class QuartzJobExecution extends AbstractQuartzJob -{ - @Override - protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception - { - JobInvokeUtil.invokeMethod(sysJob); - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java deleted file mode 100644 index 7f4213f..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.ruoyi.quartz.util; - -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.Job; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.exception.job.TaskException.Code; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 定时任务工具类 - * - * @author ruoyi - * - */ -public class ScheduleUtils -{ - /** - * 得到quartz任务类 - * - * @param sysJob 执行计划 - * @return 具体执行任务类 - */ - private static Class getQuartzJobClass(SysJob sysJob) - { - boolean isConcurrent = "0".equals(sysJob.getConcurrent()); - return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; - } - - /** - * 构建任务触发对象 - */ - public static TriggerKey getTriggerKey(Long jobId, String jobGroup) - { - return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); - } - - /** - * 构建任务键对象 - */ - public static JobKey getJobKey(Long jobId, String jobGroup) - { - return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); - } - - /** - * 创建定时任务 - */ - public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException - { - Class jobClass = getQuartzJobClass(job); - // 构建job信息 - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build(); - - // 表达式调度构建器 - CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression()); - cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder); - - // 按新的cronExpression表达式构建一个新的trigger - CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup)) - .withSchedule(cronScheduleBuilder).build(); - - // 放入参数，运行时的方法可以获取 - jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job); - - // 判断是否存在 - if (scheduler.checkExists(getJobKey(jobId, jobGroup))) - { - // 防止创建时存在数据问题 先移除，然后在执行创建操作 - scheduler.deleteJob(getJobKey(jobId, jobGroup)); - } - - scheduler.scheduleJob(jobDetail, trigger); - - // 暂停任务 - if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) - { - scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - } - - /** - * 设置定时任务策略 - */ - public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb) - throws TaskException - { - switch (job.getMisfirePolicy()) - { - case ScheduleConstants.MISFIRE_DEFAULT: - return cb; - case ScheduleConstants.MISFIRE_IGNORE_MISFIRES: - return cb.withMisfireHandlingInstructionIgnoreMisfires(); - case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED: - return cb.withMisfireHandlingInstructionFireAndProceed(); - case ScheduleConstants.MISFIRE_DO_NOTHING: - return cb.withMisfireHandlingInstructionDoNothing(); - default: - throw new TaskException("The task misfire policy '" + job.getMisfirePolicy() - + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR); - } - } -} diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/exam-online-api-DEL/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml deleted file mode 100644 index 1a7e8d4..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time - from sys_job_log - - - - - - - - - - delete from sys_job_log where job_log_id = #{jobLogId} - - - - delete from sys_job_log where job_log_id in - - #{jobLogId} - - - - - truncate table sys_job_log - - - - insert into sys_job_log( - job_log_id, - job_name, - job_group, - invoke_target, - job_message, - status, - exception_info, - create_time - )values( - #{jobLogId}, - #{jobName}, - #{jobGroup}, - #{invokeTarget}, - #{jobMessage}, - #{status}, - #{exceptionInfo}, - now() - ) - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/exam-online-api-DEL/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml deleted file mode 100644 index a4dbe21..0000000 --- a/exam-online-api-DEL/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark - from sys_job - - - - - - - - - - delete from sys_job where job_id = #{jobId} - - - - delete from sys_job where job_id in - - #{jobId} - - - - - update sys_job - - job_name = #{jobName}, - job_group = #{jobGroup}, - invoke_target = #{invokeTarget}, - cron_expression = #{cronExpression}, - misfire_policy = #{misfirePolicy}, - concurrent = #{concurrent}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = now() - - where job_id = #{jobId} - - - - insert into sys_job( - job_id, - job_name, - job_group, - invoke_target, - cron_expression, - misfire_policy, - concurrent, - status, - remark, - create_by, - create_time - )values( - #{jobId}, - #{jobName}, - #{jobGroup}, - #{invokeTarget}, - #{cronExpression}, - #{misfirePolicy}, - #{concurrent}, - #{status}, - #{remark}, - #{createBy}, - now() - ) - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/pom.xml b/exam-online-api-DEL/ruoyi-system/pom.xml deleted file mode 100644 index ff108e7..0000000 --- a/exam-online-api-DEL/ruoyi-system/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.8.6 - - 4.0.0 - - ruoyi-system - - - system系统模块 - - - - - com.github.binarywang - weixin-java-cp - 4.1.0 - - - - - com.ruoyi - ruoyi-common - - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java deleted file mode 100644 index c54678c..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.ruoyi.system.domain; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 参数配置表 sys_config - * - * @author ruoyi - */ -public class SysConfig extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 参数主键 */ - @Excel(name = "参数主键", cellType = ColumnType.NUMERIC) - private Long configId; - - /** 参数名称 */ - @Excel(name = "参数名称") - private String configName; - - /** 参数键名 */ - @Excel(name = "参数键名") - private String configKey; - - /** 参数键值 */ - @Excel(name = "参数键值") - private String configValue; - - /** 系统内置（Y是 N否） */ - @Excel(name = "系统内置", readConverterExp = "Y=是,N=否") - private String configType; - - public Long getConfigId() - { - return configId; - } - - public void setConfigId(Long configId) - { - this.configId = configId; - } - - @NotBlank(message = "参数名称不能为空") - @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - @NotBlank(message = "参数键名长度不能为空") - @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") - public String getConfigKey() - { - return configKey; - } - - public void setConfigKey(String configKey) - { - this.configKey = configKey; - } - - @NotBlank(message = "参数键值不能为空") - @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") - public String getConfigValue() - { - return configValue; - } - - public void setConfigValue(String configValue) - { - this.configValue = configValue; - } - - public String getConfigType() - { - return configType; - } - - public void setConfigType(String configType) - { - this.configType = configType; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("configId", getConfigId()) - .append("configName", getConfigName()) - .append("configKey", getConfigKey()) - .append("configValue", getConfigValue()) - .append("configType", getConfigType()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java deleted file mode 100644 index 9e98a2b..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.ruoyi.system.domain; - -import java.util.Date; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 系统访问记录表 sys_logininfor - * - * @author ruoyi - */ -public class SysLogininfor extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** ID */ - @Excel(name = "序号", cellType = ColumnType.NUMERIC) - private Long infoId; - - /** 用户账号 */ - @Excel(name = "用户账号") - private String userName; - - /** 登录状态 0成功 1失败 */ - @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败") - private String status; - - /** 登录IP地址 */ - @Excel(name = "登录地址") - private String ipaddr; - - /** 登录地点 */ - @Excel(name = "登录地点") - private String loginLocation; - - /** 浏览器类型 */ - @Excel(name = "浏览器") - private String browser; - - /** 操作系统 */ - @Excel(name = "操作系统") - private String os; - - /** 提示消息 */ - @Excel(name = "提示消息") - private String msg; - - /** 访问时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date loginTime; - - public Long getInfoId() - { - return infoId; - } - - public void setInfoId(Long infoId) - { - this.infoId = infoId; - } - - public String getUserName() - { - return userName; - } - - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getIpaddr() - { - return ipaddr; - } - - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getLoginLocation() - { - return loginLocation; - } - - public void setLoginLocation(String loginLocation) - { - this.loginLocation = loginLocation; - } - - public String getBrowser() - { - return browser; - } - - public void setBrowser(String browser) - { - this.browser = browser; - } - - public String getOs() - { - return os; - } - - public void setOs(String os) - { - this.os = os; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } - - public Date getLoginTime() - { - return loginTime; - } - - public void setLoginTime(Date loginTime) - { - this.loginTime = loginTime; - } - - /*public Long getInfoId() - public String getUserName() - public String getStatus() - public String getIpaddr() - public String getLoginLocation() - public String getBrowser() - public String getOs() - public String getMsg() - public Date getLoginTime()*/ - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("infoId",getInfoId()) - .append("userName",getUserName()) - .append("status",getStatus()) - .append("ipaddr",getIpaddr()) - .append("loginLocation",getLoginLocation()) - .append("browser",getBrowser()) - .append("os",getOs()) - .append("msg",getMsg()) - .append("loginTime",getLoginTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java deleted file mode 100644 index b43abea..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.ruoyi.system.domain; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 通知公告表 sys_notice - * - * @author ruoyi - */ -public class SysNotice extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 公告ID */ - private Long noticeId; - - /** 公告标题 */ - private String noticeTitle; - - /** 公告类型（1通知 2公告） */ - private String noticeType; - - /** 公告内容 */ - private String noticeContent; - - /** 公告状态（0正常 1关闭） */ - private String status; - - public Long getNoticeId() - { - return noticeId; - } - - public void setNoticeId(Long noticeId) - { - this.noticeId = noticeId; - } - - public void setNoticeTitle(String noticeTitle) - { - this.noticeTitle = noticeTitle; - } - - @NotBlank(message = "公告标题不能为空") - @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") - public String getNoticeTitle() - { - return noticeTitle; - } - - public void setNoticeType(String noticeType) - { - this.noticeType = noticeType; - } - - public String getNoticeType() - { - return noticeType; - } - - public void setNoticeContent(String noticeContent) - { - this.noticeContent = noticeContent; - } - - public String getNoticeContent() - { - return noticeContent; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("noticeId", getNoticeId()) - .append("noticeTitle", getNoticeTitle()) - .append("noticeType", getNoticeType()) - .append("noticeContent", getNoticeContent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java deleted file mode 100644 index ede4f64..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ /dev/null @@ -1,302 +0,0 @@ -package com.ruoyi.system.domain; - -import java.util.Date; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 操作日志记录表 oper_log - * - * @author ruoyi - */ -public class SysOperLog extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 日志主键 */ - @Excel(name = "操作序号", cellType = ColumnType.NUMERIC) - private Long operId; - - /** 操作模块 */ - @Excel(name = "操作模块") - private String title; - - /** 业务类型（0其它 1新增 2修改 3删除） */ - @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") - private Integer businessType; - - /** 业务类型数组 */ - private Integer[] businessTypes; - - /** 请求方法 */ - @Excel(name = "请求方法") - private String method; - - /** 请求方式 */ - @Excel(name = "请求方式") - private String requestMethod; - - /** 操作类别（0其它 1后台用户 2手机端用户） */ - @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") - private Integer operatorType; - - /** 操作人员 */ - @Excel(name = "操作人员") - private String operName; - - /** 部门名称 */ - @Excel(name = "部门名称") - private String deptName; - - /** 请求url */ - @Excel(name = "请求地址") - private String operUrl; - - /** 操作地址 */ - @Excel(name = "操作地址") - private String operIp; - - /** 操作地点 */ - @Excel(name = "操作地点") - private String operLocation; - - /** 请求参数 */ - @Excel(name = "请求参数") - private String operParam; - - /** 返回参数 */ - @Excel(name = "返回参数") - private String jsonResult; - - /** 操作状态（0正常 1异常） */ - @Excel(name = "状态", readConverterExp = "0=正常,1=异常") - private Integer status; - - /** 错误消息 */ - @Excel(name = "错误消息") - private String errorMsg; - - /** 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date operTime; - - public Long getOperId() - { - return operId; - } - - public void setOperId(Long operId) - { - this.operId = operId; - } - - public String getTitle() - { - return title; - } - - public void setTitle(String title) - { - this.title = title; - } - - public Integer getBusinessType() - { - return businessType; - } - - public void setBusinessType(Integer businessType) - { - this.businessType = businessType; - } - - public Integer[] getBusinessTypes() - { - return businessTypes; - } - - public void setBusinessTypes(Integer[] businessTypes) - { - this.businessTypes = businessTypes; - } - - public String getMethod() - { - return method; - } - - public void setMethod(String method) - { - this.method = method; - } - - public String getRequestMethod() - { - return requestMethod; - } - - public void setRequestMethod(String requestMethod) - { - this.requestMethod = requestMethod; - } - - public Integer getOperatorType() - { - return operatorType; - } - - public void setOperatorType(Integer operatorType) - { - this.operatorType = operatorType; - } - - public String getOperName() - { - return operName; - } - - public void setOperName(String operName) - { - this.operName = operName; - } - - public String getDeptName() - { - return deptName; - } - - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - public String getOperUrl() - { - return operUrl; - } - - public void setOperUrl(String operUrl) - { - this.operUrl = operUrl; - } - - public String getOperIp() - { - return operIp; - } - - public void setOperIp(String operIp) - { - this.operIp = operIp; - } - - public String getOperLocation() - { - return operLocation; - } - - public void setOperLocation(String operLocation) - { - this.operLocation = operLocation; - } - - public String getOperParam() - { - return operParam; - } - - public void setOperParam(String operParam) - { - this.operParam = operParam; - } - - public String getJsonResult() - { - return jsonResult; - } - - public void setJsonResult(String jsonResult) - { - this.jsonResult = jsonResult; - } - - public Integer getStatus() - { - return status; - } - - public void setStatus(Integer status) - { - this.status = status; - } - - public String getErrorMsg() - { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) - { - this.errorMsg = errorMsg; - } - - public Date getOperTime() - { - return operTime; - } - - public void setOperTime(Date operTime) - { - this.operTime = operTime; - } - - /*public Long getOperId() - public Integer getBusinessType() - public Integer[] getBusinessTypes() - public String getMethod() - public String getRequestMethod() - public Integer getOperatorType() - public String getOperName() - public String getDeptName() - public String getOperUrl() - public String getOperIp() - public String getOperLocation() - public String getOperParam() - public String getJsonResult() - public Integer getStatus() - public String getErrorMsg() - public Date getOperTime()*/ - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("operId()",getOperId()) - .append("businessType",getBusinessType()) - .append("businessTypes",getBusinessTypes()) - .append("method",getMethod()) - .append("requestMethod",getRequestMethod()) - .append("operatorType",getOperatorType()) - .append("operName",getOperName()) - .append("deptName",getDeptName()) - .append("operUrl",getOperUrl()) - .append("operIp",getOperIp()) - .append("operLocation",getOperLocation()) - .append("operParam",getOperParam()) - .append("jsonResult",getJsonResult()) - .append("status",getStatus()) - .append("errorMsg",getErrorMsg()) - .append("operTime",getOperTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java deleted file mode 100644 index 1f1fcf4..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.ruoyi.system.domain; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 岗位表 sys_post - * - * @author ruoyi - */ -public class SysPost extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 岗位序号 */ - @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) - private Long postId; - - /** 岗位编码 */ - @Excel(name = "岗位编码") - private String postCode; - - /** 岗位名称 */ - @Excel(name = "岗位名称") - private String postName; - - /** 岗位排序 */ - @Excel(name = "岗位排序") - private String postSort; - - /** 状态（0正常 1停用） */ - @Excel(name = "状态", readConverterExp = "0=正常,1=停用") - private String status; - - /** 用户是否存在此岗位标识 默认不存在 */ - private boolean flag = false; - - public Long getPostId() - { - return postId; - } - - public void setPostId(Long postId) - { - this.postId = postId; - } - - @NotBlank(message = "岗位编码不能为空") - @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") - public String getPostCode() - { - return postCode; - } - - public void setPostCode(String postCode) - { - this.postCode = postCode; - } - - @NotBlank(message = "岗位名称不能为空") - @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") - public String getPostName() - { - return postName; - } - - public void setPostName(String postName) - { - this.postName = postName; - } - - @NotBlank(message = "显示顺序不能为空") - public String getPostSort() - { - return postSort; - } - - public void setPostSort(String postSort) - { - this.postSort = postSort; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public boolean isFlag() - { - return flag; - } - - public void setFlag(boolean flag) - { - this.flag = flag; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("postId", getPostId()) - .append("postCode", getPostCode()) - .append("postName", getPostName()) - .append("postSort", getPostSort()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java deleted file mode 100644 index 47b21bf..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 角色和部门关联 sys_role_dept - * - * @author ruoyi - */ -public class SysRoleDept -{ - /** 角色ID */ - private Long roleId; - - /** 部门ID */ - private Long deptId; - - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("deptId", getDeptId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java deleted file mode 100644 index de10a74..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 角色和菜单关联 sys_role_menu - * - * @author ruoyi - */ -public class SysRoleMenu -{ - /** 角色ID */ - private Long roleId; - - /** 菜单ID */ - private Long menuId; - - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - public Long getMenuId() - { - return menuId; - } - - public void setMenuId(Long menuId) - { - this.menuId = menuId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("menuId", getMenuId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java deleted file mode 100644 index 78cabfb..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 当前在线会话 - * - * @author ruoyi - */ -public class SysUserOnline -{ - /** 会话编号 */ - private String tokenId; - - /** 部门名称 */ - private String deptName; - - /** 用户名称 */ - private String userName; - - /** 登录IP地址 */ - private String ipaddr; - - /** 登录地址 */ - private String loginLocation; - - /** 浏览器类型 */ - private String browser; - - /** 操作系统 */ - private String os; - - /** 登录时间 */ - private Long loginTime; - - public String getTokenId() - { - return tokenId; - } - - public void setTokenId(String tokenId) - { - this.tokenId = tokenId; - } - - public String getDeptName() - { - return deptName; - } - - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - public String getUserName() - { - return userName; - } - - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getIpaddr() - { - return ipaddr; - } - - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getLoginLocation() - { - return loginLocation; - } - - public void setLoginLocation(String loginLocation) - { - this.loginLocation = loginLocation; - } - - public String getBrowser() - { - return browser; - } - - public void setBrowser(String browser) - { - this.browser = browser; - } - - public String getOs() - { - return os; - } - - public void setOs(String os) - { - this.os = os; - } - - public Long getLoginTime() - { - return loginTime; - } - - public void setLoginTime(Long loginTime) - { - this.loginTime = loginTime; - } - - /*public String getTokenId() - public String getDeptName() - public String getUserName() - public String getIpaddr() - public String getLoginLocation() - public String getBrowser() - public String getOs() - public Long getLoginTime()*/ - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("tokenId",getTokenId()) - .append("deptName",getDeptName()) - .append("userName",getUserName()) - .append("ipaddr",getIpaddr()) - .append("loginLocation",getLoginLocation()) - .append("browser",getBrowser()) - .append("os",getOs()) - .append("loginTime",getLoginTime()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java deleted file mode 100644 index 6e8c416..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和岗位关联 sys_user_post - * - * @author ruoyi - */ -public class SysUserPost -{ - /** 用户ID */ - private Long userId; - - /** 岗位ID */ - private Long postId; - - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getPostId() - { - return postId; - } - - public void setPostId(Long postId) - { - this.postId = postId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("postId", getPostId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java deleted file mode 100644 index 4d15810..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和角色关联 sys_user_role - * - * @author ruoyi - */ -public class SysUserRole -{ - /** 用户ID */ - private Long userId; - - /** 角色ID */ - private Long roleId; - - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("roleId", getRoleId()) - .toString(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java deleted file mode 100644 index a5d5fdc..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.ruoyi.system.domain.vo; - -import com.ruoyi.common.utils.StringUtils; - -/** - * 路由显示信息 - * - * @author ruoyi - */ -public class MetaVo -{ - /** - * 设置该路由在侧边栏和面包屑中展示的名字 - */ - private String title; - - /** - * 设置该路由的图标，对应路径src/assets/icons/svg - */ - private String icon; - - /** - * 设置为true，则不会被 缓存 - */ - private boolean noCache; - - /** - * 内链地址（http(s)://开头） - */ - private String link; - - public MetaVo() - { - } - - public MetaVo(String title, String icon) - { - this.title = title; - this.icon = icon; - } - - public MetaVo(String title, String icon, boolean noCache) - { - this.title = title; - this.icon = icon; - this.noCache = noCache; - } - - public MetaVo(String title, String icon, String link) - { - this.title = title; - this.icon = icon; - this.link = link; - } - - public MetaVo(String title, String icon, boolean noCache, String link) - { - this.title = title; - this.icon = icon; - this.noCache = noCache; - if (StringUtils.ishttp(link)) - { - this.link = link; - } - } - - public boolean isNoCache() - { - return noCache; - } - - public void setNoCache(boolean noCache) - { - this.noCache = noCache; - } - - public String getTitle() - { - return title; - } - - public void setTitle(String title) - { - this.title = title; - } - - public String getIcon() - { - return icon; - } - - public void setIcon(String icon) - { - this.icon = icon; - } - - public String getLink() - { - return link; - } - - public void setLink(String link) - { - this.link = link; - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java deleted file mode 100644 index b5501b7..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.ruoyi.system.domain.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import java.util.List; - -/** - * 路由配置信息 - * - * @author ruoyi - */ -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouterVo -{ - /** - * 路由名字 - */ - private String name; - - /** - * 路由地址 - */ - private String path; - - /** - * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 - */ - private boolean hidden; - - /** - * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 - */ - private String redirect; - - /** - * 组件地址 - */ - private String component; - - /** - * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 - */ - private Boolean alwaysShow; - - /** - * 其他元素 - */ - private MetaVo meta; - - /** - * 子路由 - */ - private List children; - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getPath() - { - return path; - } - - public void setPath(String path) - { - this.path = path; - } - - public boolean getHidden() - { - return hidden; - } - - public void setHidden(boolean hidden) - { - this.hidden = hidden; - } - - public String getRedirect() - { - return redirect; - } - - public void setRedirect(String redirect) - { - this.redirect = redirect; - } - - public String getComponent() - { - return component; - } - - public void setComponent(String component) - { - this.component = component; - } - - public Boolean getAlwaysShow() - { - return alwaysShow; - } - - public void setAlwaysShow(Boolean alwaysShow) - { - this.alwaysShow = alwaysShow; - } - - public MetaVo getMeta() - { - return meta; - } - - public void setMeta(MetaVo meta) - { - this.meta = meta; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java deleted file mode 100644 index 0ed0c0a..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysConfig; - -/** - * 参数配置 数据层 - * - * @author ruoyi - */ -public interface SysConfigMapper -{ - /** - * 查询参数配置信息 - * - * @param config 参数配置信息 - * @return 参数配置信息 - */ - public SysConfig selectConfig(SysConfig config); - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * @return 参数配置集合 - */ - public List selectConfigList(SysConfig config); - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数键名 - * @return 参数配置信息 - */ - public SysConfig checkConfigKeyUnique(String configKey); - - /** - * 新增参数配置 - * - * @param config 参数配置信息 - * @return 结果 - */ - public int insertConfig(SysConfig config); - - /** - * 修改参数配置 - * - * @param config 参数配置信息 - * @return 结果 - */ - public int updateConfig(SysConfig config); - - /** - * 删除参数配置 - * - * @param configId 参数ID - * @return 结果 - */ - public int deleteConfigById(Long configId); - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - * @return 结果 - */ - public int deleteConfigByIds(Long[] configIds); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java deleted file mode 100644 index 534928b..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDept; - -import me.chanjar.weixin.cp.bean.WxCpDepart; - -/** - * 部门管理 数据层 - * - * @author ruoyi - */ -public interface SysDeptMapper -{ - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - public List selectDeptList(SysDept dept); - - /** - * 根据角色ID查询部门树信息 - * - * @param roleId 角色ID - * @param deptCheckStrictly 部门树选择项是否关联显示 - * @return 选中部门列表 - */ - public List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); - - /** - * 根据部门ID查询信息 - * - * @param deptId 部门ID - * @return 部门信息 - */ - public SysDept selectDeptById(Long deptId); - - /** - * 根据ID查询所有子部门 - * - * @param deptId 部门ID - * @return 部门列表 - */ - public List selectChildrenDeptById(Long deptId); - - /** - * 根据ID查询所有子部门（正常状态） - * - * @param deptId 部门ID - * @return 子部门数 - */ - public int selectNormalChildrenDeptById(Long deptId); - - /** - * 是否存在子节点 - * - * @param deptId 部门ID - * @return 结果 - */ - public int hasChildByDeptId(Long deptId); - - /** - * 查询部门是否存在用户 - * - * @param deptId 部门ID - * @return 结果 - */ - public int checkDeptExistUser(Long deptId); - - /** - * 校验部门名称是否唯一 - * - * @param deptName 部门名称 - * @param parentId 父部门ID - * @return 结果 - */ - public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); - - /** - * 新增部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - public int insertDept(SysDept dept); - - /** - * 修改部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - public int updateDept(SysDept dept); - - /** - * 修改所在部门正常状态 - * - * @param deptIds 部门ID组 - */ - public void updateDeptStatusNormal(Long[] deptIds); - - /** - * 修改子元素关系 - * - * @param depts 子元素 - * @return 结果 - */ - public int updateDeptChildren(@Param("depts") List depts); - - /** - * 删除部门管理信息 - * - * @param deptId 部门ID - * @return 结果 - */ - public int deleteDeptById(Long deptId); - - -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java deleted file mode 100644 index a341f1e..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDictData; - -/** - * 字典表 数据层 - * - * @author ruoyi - */ -public interface SysDictDataMapper -{ - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - public List selectDictDataList(SysDictData dictData); - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - public List selectDictDataByType(String dictType); - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - public SysDictData selectDictDataById(Long dictCode); - - /** - * 查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据 - */ - public int countDictDataByType(String dictType); - - /** - * 通过字典ID删除字典数据信息 - * - * @param dictCode 字典数据ID - * @return 结果 - */ - public int deleteDictDataById(Long dictCode); - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - * @return 结果 - */ - public int deleteDictDataByIds(Long[] dictCodes); - - /** - * 新增字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int insertDictData(SysDictData dictData); - - /** - * 修改字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int updateDictData(SysDictData dictData); - - /** - * 同步修改字典类型 - * - * @param oldDictType 旧字典类型 - * @param newDictType 新旧字典类型 - * @return 结果 - */ - public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java deleted file mode 100644 index 17545cd..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import com.ruoyi.common.core.domain.entity.SysDictType; - -/** - * 字典表 数据层 - * - * @author ruoyi - */ -@Mapper -public interface SysDictTypeMapper -{ - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - public List selectDictTypeList(SysDictType dictType); - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - public List selectDictTypeAll(); - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - public SysDictType selectDictTypeById(Long dictId); - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - public SysDictType selectDictTypeByType(String dictType); - - /** - * 通过字典ID删除字典信息 - * - * @param dictId 字典ID - * @return 结果 - */ - public int deleteDictTypeById(Long dictId); - - /** - * 批量删除字典类型信息 - * - * @param dictIds 需要删除的字典ID - * @return 结果 - */ - public int deleteDictTypeByIds(Long[] dictIds); - - /** - * 新增字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int insertDictType(SysDictType dictType); - - /** - * 修改字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int updateDictType(SysDictType dictType); - - /** - * 校验字典类型称是否唯一 - * - * @param dictType 字典类型 - * @return 结果 - */ - public SysDictType checkDictTypeUnique(String dictType); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java deleted file mode 100644 index 629866f..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; - -/** - * 系统访问日志情况信息 数据层 - * - * @author ruoyi - */ -public interface SysLogininforMapper -{ - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - public void insertLogininfor(SysLogininfor logininfor); - - /** - * 查询系统登录日志集合 - * - * @param logininfor 访问日志对象 - * @return 登录记录集合 - */ - public List selectLogininforList(SysLogininfor logininfor); - - /** - * 批量删除系统登录日志 - * - * @param infoIds 需要删除的登录日志ID - * @return 结果 - */ - public int deleteLogininforByIds(Long[] infoIds); - - /** - * 清空系统登录日志 - * - * @return 结果 - */ - public int cleanLogininfor(); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java deleted file mode 100644 index 1c2e853..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysMenu; - -/** - * 菜单表 数据层 - * - * @author ruoyi - */ -public interface SysMenuMapper -{ - /** - * 查询系统菜单列表 - * - * @param menu 菜单信息 - * @return 菜单列表 - */ - public List selectMenuList(SysMenu menu); - - /** - * 根据用户所有权限 - * - * @return 权限列表 - */ - public List selectMenuPerms(); - - /** - * 根据用户查询系统菜单列表 - * - * @param menu 菜单信息 - * @return 菜单列表 - */ - public List selectMenuListByUserId(SysMenu menu); - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - public List selectMenuPermsByUserId(Long userId); - - /** - * 根据用户ID查询菜单 - * - * @return 菜单列表 - */ - public List selectMenuTreeAll(); - - /** - * 根据用户ID查询菜单 - * - * @param userId 用户ID - * @return 菜单列表 - */ - public List selectMenuTreeByUserId(Long userId); - - /** - * 根据角色ID查询菜单树信息 - * - * @param roleId 角色ID - * @param menuCheckStrictly 菜单树选择项是否关联显示 - * @return 选中菜单列表 - */ - public List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); - - /** - * 根据菜单ID查询信息 - * - * @param menuId 菜单ID - * @return 菜单信息 - */ - public SysMenu selectMenuById(Long menuId); - - /** - * 是否存在菜单子节点 - * - * @param menuId 菜单ID - * @return 结果 - */ - public int hasChildByMenuId(Long menuId); - - /** - * 新增菜单信息 - * - * @param menu 菜单信息 - * @return 结果 - */ - public int insertMenu(SysMenu menu); - - /** - * 修改菜单信息 - * - * @param menu 菜单信息 - * @return 结果 - */ - public int updateMenu(SysMenu menu); - - /** - * 删除菜单管理信息 - * - * @param menuId 菜单ID - * @return 结果 - */ - public int deleteMenuById(Long menuId); - - /** - * 校验菜单名称是否唯一 - * - * @param menuName 菜单名称 - * @param parentId 父菜单ID - * @return 结果 - */ - public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java deleted file mode 100644 index c34f0a2..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysNotice; - -/** - * 通知公告表 数据层 - * - * @author ruoyi - */ -public interface SysNoticeMapper -{ - /** - * 查询公告信息 - * - * @param noticeId 公告ID - * @return 公告信息 - */ - public SysNotice selectNoticeById(Long noticeId); - - /** - * 查询公告列表 - * - * @param notice 公告信息 - * @return 公告集合 - */ - public List selectNoticeList(SysNotice notice); - - /** - * 新增公告 - * - * @param notice 公告信息 - * @return 结果 - */ - public int insertNotice(SysNotice notice); - - /** - * 修改公告 - * - * @param notice 公告信息 - * @return 结果 - */ - public int updateNotice(SysNotice notice); - - /** - * 批量删除公告 - * - * @param noticeId 公告ID - * @return 结果 - */ - public int deleteNoticeById(Long noticeId); - - /** - * 批量删除公告信息 - * - * @param noticeIds 需要删除的公告ID - * @return 结果 - */ - public int deleteNoticeByIds(Long[] noticeIds); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java deleted file mode 100644 index 2ae6457..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysOperLog; - -/** - * 操作日志 数据层 - * - * @author ruoyi - */ -public interface SysOperLogMapper -{ - /** - * 新增操作日志 - * - * @param operLog 操作日志对象 - */ - public void insertOperlog(SysOperLog operLog); - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - public List selectOperLogList(SysOperLog operLog); - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - public int deleteOperLogByIds(Long[] operIds); - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - public SysOperLog selectOperLogById(Long operId); - - /** - * 清空操作日志 - */ - public void cleanOperLog(); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java deleted file mode 100644 index b428747..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysPost; - -/** - * 岗位信息 数据层 - * - * @author ruoyi - */ -public interface SysPostMapper -{ - /** - * 查询岗位数据集合 - * - * @param post 岗位信息 - * @return 岗位数据集合 - */ - public List selectPostList(SysPost post); - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - public List selectPostAll(); - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - public SysPost selectPostById(Long postId); - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - public List selectPostListByUserId(Long userId); - - /** - * 查询用户所属岗位组 - * - * @param userName 用户名 - * @return 结果 - */ - public List selectPostsByUserName(String userName); - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - public int deletePostById(Long postId); - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - */ - public int deletePostByIds(Long[] postIds); - - /** - * 修改岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int updatePost(SysPost post); - - /** - * 新增岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int insertPost(SysPost post); - - /** - * 校验岗位名称 - * - * @param postName 岗位名称 - * @return 结果 - */ - public SysPost checkPostNameUnique(String postName); - - /** - * 校验岗位编码 - * - * @param postCode 岗位编码 - * @return 结果 - */ - public SysPost checkPostCodeUnique(String postCode); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java deleted file mode 100644 index 3e12f5c..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; - -/** - * 角色与部门关联表 数据层 - * - * @author ruoyi - */ -public interface SysRoleDeptMapper -{ - /** - * 通过角色ID删除角色和部门关联 - * - * @param roleId 角色ID - * @return 结果 - */ - public int deleteRoleDeptByRoleId(Long roleId); - - /** - * 批量删除角色部门关联信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteRoleDept(Long[] ids); - - /** - * 查询部门使用数量 - * - * @param deptId 部门ID - * @return 结果 - */ - public int selectCountRoleDeptByDeptId(Long deptId); - - /** - * 批量新增角色部门信息 - * - * @param roleDeptList 角色部门列表 - * @return 结果 - */ - public int batchRoleDept(List roleDeptList); - - /** - * 新增角色部门信息 - * 2021-8-3 单条新增角色部门 - * @param roleDeptList 角色部门列表 - * @return 结果 - */ - public int insertRoleDept(SysRoleDept sysRoleDept); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java deleted file mode 100644 index 9bb1344..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.common.core.domain.entity.SysRole; - -/** - * 角色表 数据层 - * - * @author ruoyi - */ -public interface SysRoleMapper -{ - /** - * 根据条件分页查询角色数据 - * - * @param role 角色信息 - * @return 角色数据集合信息 - */ - public List selectRoleList(SysRole role); - - /** - * 根据用户ID查询角色 - * - * @param userId 用户ID - * @return 角色列表 - */ - public List selectRolePermissionByUserId(Long userId); - - /** - * 查询所有角色 - * - * @return 角色列表 - */ - public List selectRoleAll(); - - /** - * 根据用户ID获取角色选择框列表 - * - * @param userId 用户ID - * @return 选中角色ID列表 - */ - public List selectRoleListByUserId(Long userId); - - /** - * 通过角色ID查询角色 - * - * @param roleId 角色ID - * @return 角色对象信息 - */ - public SysRole selectRoleById(Long roleId); - - /** - * 根据用户ID查询角色 - * - * @param userName 用户名 - * @return 角色列表 - */ - public List selectRolesByUserName(String userName); - - /** - * 根据角色名称查询角色ID - * - * @param userName 用户名 - * @return roleId - */ - public Long selectRoleIdByUserName(String roleName); - - /** - * 校验角色名称是否唯一 - * - * @param roleName 角色名称 - * @return 角色信息 - */ - public SysRole checkRoleNameUnique(String roleName); - - /** - * 校验角色权限是否唯一 - * - * @param roleKey 角色权限 - * @return 角色信息 - */ - public SysRole checkRoleKeyUnique(String roleKey); - - /** - * 修改角色信息 - * - * @param role 角色信息 - * @return 结果 - */ - public int updateRole(SysRole role); - - /** - * 新增角色信息 - * - * @param role 角色信息 - * @return 结果 - */ - public int insertRole(SysRole role); - - /** - * 通过角色ID删除角色 - * - * @param roleId 角色ID - * @return 结果 - */ - public int deleteRoleById(Long roleId); - - /** - * 批量删除角色信息 - * - * @param roleIds 需要删除的角色ID - * @return 结果 - */ - public int deleteRoleByIds(Long[] roleIds); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java deleted file mode 100644 index 1c151f8..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; - -/** - * 角色与菜单关联表 数据层 - * - * @author ruoyi - */ -public interface SysRoleMenuMapper -{ - /** - * 查询菜单使用数量 - * - * @param menuId 菜单ID - * @return 结果 - */ - public int checkMenuExistRole(Long menuId); - - /** - * 通过角色ID删除角色和菜单关联 - * - * @param roleId 角色ID - * @return 结果 - */ - public int deleteRoleMenuByRoleId(Long roleId); - - /** - * 批量删除角色菜单关联信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteRoleMenu(Long[] ids); - - /** - * 批量新增角色菜单信息 - * - * @param roleMenuList 角色菜单列表 - * @return 结果 - */ - public int batchRoleMenu(List roleMenuList); - - /** - * 新增角色菜单信息-2021-8-3 oracle下循环新增 - * - * @param sysRoleMenu 角色菜单列表 - * @return 是否成功，1成功，否则不成功 - */ - public int insertRoleMenu(SysRoleMenu sysRoleMenu); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java deleted file mode 100644 index 514f3b8..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysUser; - -/** - * 用户表 数据层 - * - * @author ruoyi - */ -public interface SysUserMapper -{ - /** - * 根据条件分页查询用户列表 - * - * @param sysUser 用户信息 - * @return 用户信息集合信息 - */ - public List selectUserList(SysUser sysUser); - - /** - * 根据条件分页查询未已配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectAllocatedList(SysUser user); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUnallocatedList(SysUser user); - - /** - * 通过微信openid查询用户 - * - * @param openid 微信openid - * @return 用户对象信息 - */ - public SysUser selectUserByWechatOpenid(String openid); - - /** - * 绑定微信用户 - * - * @param user 用户信息 - * @return 结果 - */ - public int bindWechatUser(SysUser user); - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - public SysUser selectUserByUserName(String userName); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - public SysUser selectUserById(Long userId); - - /** - * 新增查询用户-20210730 - * - * @param userName 用户名称(代码) - * @return 用户序号 - */ - public int selectUserId(String userName); - /** - * 新增用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int insertUser(SysUser user); - - /** - * 修改用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUser(SysUser user); - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - public int deleteUserById(Long userId); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - public int deleteUserByIds(Long[] userIds); - - /** - * 校验用户名称是否唯一 - * - * @param userName 用户名称 - * @return 结果 - */ - public int checkUserNameUnique(String userName); - - /** - * 校验手机号码是否唯一 - * - * @param phonenumber 手机号码 - * @return 结果 - */ - public SysUser checkPhoneUnique(String phonenumber); - - /** - * 校验email是否唯一 - * - * @param email 用户邮箱 - * @return 结果 - */ - public SysUser checkEmailUnique(String email); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java deleted file mode 100644 index c94240d..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.SysUserPost; - -/** - * 用户与岗位关联表 数据层 - * - * @author ruoyi - */ -public interface SysUserPostMapper -{ - /** - * 通过用户ID删除用户和岗位关联 - * - * @param userId 用户ID - * @return 结果 - */ - public int deleteUserPostByUserId(Long userId); - - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - public int countUserPostById(Long postId); - - /** - * 批量删除用户和岗位关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteUserPost(Long[] ids); - - /** - * 批量新增用户岗位信息 - * - * @param userPostList 用户角色列表 - * @return 结果 - */ - public int batchUserPost(List userPostList); - - /** - * 新增用户岗位信息 - * 2021-8-3 因oracle新增 - * @param SysUserPost 用户角色 - * @return 结果 - */ - public int insertUserPost(SysUserPost sysUserPost); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java deleted file mode 100644 index cf4f070..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; - -/** - * 用户与角色关联表 数据层 - * - * @author ruoyi - */ -public interface SysUserRoleMapper -{ - /** - * 通过用户ID删除用户和角色关联 - * - * @param userId 用户ID - * @return 结果 - */ - public int deleteUserRoleByUserId(Long userId); - - /** - * 批量删除用户和角色关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteUserRole(Long[] ids); - - /** - * 通过角色ID查询角色使用数量 - * - * @param roleId 角色ID - * @return 结果 - */ - public int countUserRoleByRoleId(Long roleId); - - /** - * 批量新增用户角色信息 - * - * @param userRoleList 用户角色列表 - * @return 结果 - */ - public int batchUserRole(List userRoleList); - - /** - * 新增用户角色信息 - * 2021-8-3 因oracle修改为单条插入 - * @param SysUserRole 用户角色列表 - * @return 结果 - */ - public int insertUserRole(SysUserRole sysUserRole); - /** - * 删除用户和角色关联信息 - * - * @param userRole 用户和角色关联信息 - * @return 结果 - */ - public int deleteUserRoleInfo(SysUserRole userRole); - - /** - * 批量取消授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID - * @return 结果 - */ - public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WechatLoginStatusMapper.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WechatLoginStatusMapper.java deleted file mode 100644 index cc0e1e4..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WechatLoginStatusMapper.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.common.core.domain.entity.WechatLoginStatus; -import org.apache.ibatis.annotations.Param; - -/** - * 微信登录状态Mapper接口 - * - * @author ruoyi - * @date 2024-08-24 - */ -public interface WechatLoginStatusMapper -{ - /** - * 查询微信登录状态 - * - * @param id 微信登录状态主键 - * @return 微信登录状态 - */ - public WechatLoginStatus selectWechatLoginStatusById(String id); - - /** - * 查询微信登录状态列表 - * - * @param wechatLoginStatus 微信登录状态 - * @return 微信登录状态集合 - */ - public List selectWechatLoginStatusList(WechatLoginStatus wechatLoginStatus); - - /** - * 新增微信登录状态 - * - * @param wechatLoginStatus 微信登录状态 - * @return 结果 - */ - public int insertWechatLoginStatus(WechatLoginStatus wechatLoginStatus); - - /** - * 修改微信登录状态 - * - * @param wechatLoginStatus 微信登录状态 - * @return 结果 - */ - public int updateWechatLoginStatus(WechatLoginStatus wechatLoginStatus); - - /** - * 删除微信登录状态 - * - * @param id 微信登录状态主键 - * @return 结果 - */ - public int deleteWechatLoginStatusById(String id); - - /** - * 批量删除微信登录状态 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteWechatLoginStatusByIds(String[] ids); - - /** - * 根据openid查询登录状态 - * - * @param openid 微信openid - * @return 微信登录状态 - */ - public WechatLoginStatus selectWechatLoginStatusByOpenid(@Param("openid") String openid); - - /** - * 清理过期的登录状态 - * - * @return 清理的记录数 - */ - public int deleteExpiredWechatLoginStatus(); -} \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java deleted file mode 100644 index f867e63..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.SysConfig; - -/** - * 参数配置 服务层 - * - * @author ruoyi - */ -public interface ISysConfigService -{ - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * @return 参数配置信息 - */ - public SysConfig selectConfigById(Long configId); - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数键名 - * @return 参数键值 - */ - public String selectConfigByKey(String configKey); - - /** - * 获取验证码开关 - * - * @return true开启，false关闭 - */ - public boolean selectCaptchaOnOff(); - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * @return 参数配置集合 - */ - public List selectConfigList(SysConfig config); - - /** - * 新增参数配置 - * - * @param config 参数配置信息 - * @return 结果 - */ - public int insertConfig(SysConfig config); - - /** - * 修改参数配置 - * - * @param config 参数配置信息 - * @return 结果 - */ - public int updateConfig(SysConfig config); - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - * @return 结果 - */ - public void deleteConfigByIds(Long[] configIds); - - /** - * 加载参数缓存数据 - */ - public void loadingConfigCache(); - - /** - * 清空参数缓存数据 - */ - public void clearConfigCache(); - - /** - * 重置参数缓存数据 - */ - public void resetConfigCache(); - - /** - * 校验参数键名是否唯一 - * - * @param config 参数信息 - * @return 结果 - */ - public String checkConfigKeyUnique(SysConfig config); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java deleted file mode 100644 index 5b352c6..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; - -import me.chanjar.weixin.cp.bean.WxCpDepart; - -/** - * 部门管理 服务层 - * - * @author ruoyi - */ -public interface ISysDeptService -{ - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - public List selectDeptList(SysDept dept); - - /** - * 构建前端所需要树结构 - * - * @param depts 部门列表 - * @return 树结构列表 - */ - public List buildDeptTree(List depts); - - /** - * 构建前端所需要下拉树结构 - * - * @param depts 部门列表 - * @return 下拉树结构列表 - */ - public List buildDeptTreeSelect(List depts); - - /** - * 根据角色ID查询部门树信息 - * - * @param roleId 角色ID - * @return 选中部门列表 - */ - public List selectDeptListByRoleId(Long roleId); - - /** - * 根据部门ID查询信息 - * - * @param deptId 部门ID - * @return 部门信息 - */ - public SysDept selectDeptById(Long deptId); - - /** - * 根据ID查询所有子部门（正常状态） - * - * @param deptId 部门ID - * @return 子部门数 - */ - public int selectNormalChildrenDeptById(Long deptId); - - /** - * 是否存在部门子节点 - * - * @param deptId 部门ID - * @return 结果 - */ - public boolean hasChildByDeptId(Long deptId); - - /** - * 查询部门是否存在用户 - * - * @param deptId 部门ID - * @return 结果 true 存在 false 不存在 - */ - public boolean checkDeptExistUser(Long deptId); - - /** - * 校验部门名称是否唯一 - * - * @param dept 部门信息 - * @return 结果 - */ - public String checkDeptNameUnique(SysDept dept); - - /** - * 新增保存部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - public int insertDept(SysDept dept); - - /** - * 修改保存部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - public int updateDept(SysDept dept); - - /** - * 删除部门管理信息 - * - * @param deptId 部门ID - * @return 结果 - */ - public int deleteDeptById(Long deptId); - - -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java deleted file mode 100644 index b4993e1..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; - -/** - * 字典 业务层 - * - * @author ruoyi - */ -public interface ISysDictDataService -{ - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - public List selectDictDataList(SysDictData dictData); - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - public String selectDictLabel(String dictType, String dictValue); - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - public SysDictData selectDictDataById(Long dictCode); - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - * @return 结果 - */ - public void deleteDictDataByIds(Long[] dictCodes); - - /** - * 新增保存字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int insertDictData(SysDictData dictData); - - /** - * 修改保存字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int updateDictData(SysDictData dictData); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java deleted file mode 100644 index 72d9af5..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; - -/** - * 字典 业务层 - * - * @author ruoyi - */ -public interface ISysDictTypeService -{ - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - public List selectDictTypeList(SysDictType dictType); - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - public List selectDictTypeAll(); - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - public List selectDictDataByType(String dictType); - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - public SysDictType selectDictTypeById(Long dictId); - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - public SysDictType selectDictTypeByType(String dictType); - - /** - * 批量删除字典信息 - * - * @param dictIds 需要删除的字典ID - * @return 结果 - */ - public void deleteDictTypeByIds(Long[] dictIds); - - /** - * 加载字典缓存数据 - */ - public void loadingDictCache(); - - /** - * 清空字典缓存数据 - */ - public void clearDictCache(); - - /** - * 重置字典缓存数据 - */ - public void resetDictCache(); - - /** - * 新增保存字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int insertDictType(SysDictType dictType); - - /** - * 修改保存字典类型信息 - * - * @param dictType 字典类型信息 - * @return 结果 - */ - public int updateDictType(SysDictType dictType); - - /** - * 校验字典类型称是否唯一 - * - * @param dictType 字典类型 - * @return 结果 - */ - public String checkDictTypeUnique(SysDictType dictType); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java deleted file mode 100644 index 96c4d54..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; - -/** - * 系统访问日志情况信息 服务层 - * - * @author ruoyi - */ -public interface ISysLogininforService -{ - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - public void insertLogininfor(SysLogininfor logininfor); - - /** - * 查询系统登录日志集合 - * - * @param logininfor 访问日志对象 - * @return 登录记录集合 - */ - public List selectLogininforList(SysLogininfor logininfor); - - /** - * 批量删除系统登录日志 - * - * @param infoIds 需要删除的登录日志ID - * @return - */ - public int deleteLogininforByIds(Long[] infoIds); - - /** - * 清空系统登录日志 - */ - public void cleanLogininfor(); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java deleted file mode 100644 index f64bee1..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import java.util.Set; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; - -/** - * 菜单 业务层 - * - * @author ruoyi - */ -public interface ISysMenuService -{ - /** - * 根据用户查询系统菜单列表 - * - * @param userId 用户ID - * @return 菜单列表 - */ - public List selectMenuList(Long userId); - - /** - * 根据用户查询系统菜单列表 - * - * @param menu 菜单信息 - * @param userId 用户ID - * @return 菜单列表 - */ - public List selectMenuList(SysMenu menu, Long userId); - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - public Set selectMenuPermsByUserId(Long userId); - - /** - * 根据用户ID查询菜单树信息 - * - * @param userId 用户ID - * @return 菜单列表 - */ - public List selectMenuTreeByUserId(Long userId); - - /** - * 根据角色ID查询菜单树信息 - * - * @param roleId 角色ID - * @return 选中菜单列表 - */ - public List selectMenuListByRoleId(Long roleId); - - /** - * 构建前端路由所需要的菜单 - * - * @param menus 菜单列表 - * @return 路由列表 - */ - public List buildMenus(List menus); - - /** - * 构建前端所需要树结构 - * - * @param menus 菜单列表 - * @return 树结构列表 - */ - public List buildMenuTree(List menus); - - /** - * 构建前端所需要下拉树结构 - * - * @param menus 菜单列表 - * @return 下拉树结构列表 - */ - public List buildMenuTreeSelect(List menus); - - /** - * 根据菜单ID查询信息 - * - * @param menuId 菜单ID - * @return 菜单信息 - */ - public SysMenu selectMenuById(Long menuId); - - /** - * 是否存在菜单子节点 - * - * @param menuId 菜单ID - * @return 结果 true 存在 false 不存在 - */ - public boolean hasChildByMenuId(Long menuId); - - /** - * 查询菜单是否存在角色 - * - * @param menuId 菜单ID - * @return 结果 true 存在 false 不存在 - */ - public boolean checkMenuExistRole(Long menuId); - - /** - * 新增保存菜单信息 - * - * @param menu 菜单信息 - * @return 结果 - */ - public int insertMenu(SysMenu menu); - - /** - * 修改保存菜单信息 - * - * @param menu 菜单信息 - * @return 结果 - */ - public int updateMenu(SysMenu menu); - - /** - * 删除菜单管理信息 - * - * @param menuId 菜单ID - * @return 结果 - */ - public int deleteMenuById(Long menuId); - - /** - * 校验菜单名称是否唯一 - * - * @param menu 菜单信息 - * @return 结果 - */ - public String checkMenuNameUnique(SysMenu menu); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java deleted file mode 100644 index 47ce1b7..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.SysNotice; - -/** - * 公告 服务层 - * - * @author ruoyi - */ -public interface ISysNoticeService -{ - /** - * 查询公告信息 - * - * @param noticeId 公告ID - * @return 公告信息 - */ - public SysNotice selectNoticeById(Long noticeId); - - /** - * 查询公告列表 - * - * @param notice 公告信息 - * @return 公告集合 - */ - public List selectNoticeList(SysNotice notice); - - /** - * 新增公告 - * - * @param notice 公告信息 - * @return 结果 - */ - public int insertNotice(SysNotice notice); - - /** - * 修改公告 - * - * @param notice 公告信息 - * @return 结果 - */ - public int updateNotice(SysNotice notice); - - /** - * 删除公告信息 - * - * @param noticeId 公告ID - * @return 结果 - */ - public int deleteNoticeById(Long noticeId); - - /** - * 批量删除公告信息 - * - * @param noticeIds 需要删除的公告ID - * @return 结果 - */ - public int deleteNoticeByIds(Long[] noticeIds); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java deleted file mode 100644 index 4fd8e5a..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.SysOperLog; - -/** - * 操作日志 服务层 - * - * @author ruoyi - */ -public interface ISysOperLogService -{ - /** - * 新增操作日志 - * - * @param operLog 操作日志对象 - */ - public void insertOperlog(SysOperLog operLog); - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - public List selectOperLogList(SysOperLog operLog); - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - public int deleteOperLogByIds(Long[] operIds); - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - public SysOperLog selectOperLogById(Long operId); - - /** - * 清空操作日志 - */ - public void cleanOperLog(); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java deleted file mode 100644 index aab216d..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.SysPost; - -/** - * 岗位信息 服务层 - * - * @author ruoyi - */ -public interface ISysPostService -{ - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * @return 岗位列表 - */ - public List selectPostList(SysPost post); - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - public List selectPostAll(); - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - public SysPost selectPostById(Long postId); - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - public List selectPostListByUserId(Long userId); - - /** - * 校验岗位名称 - * - * @param post 岗位信息 - * @return 结果 - */ - public String checkPostNameUnique(SysPost post); - - /** - * 校验岗位编码 - * - * @param post 岗位信息 - * @return 结果 - */ - public String checkPostCodeUnique(SysPost post); - - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - public int countUserPostById(Long postId); - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - public int deletePostById(Long postId); - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - * @throws Exception 异常 - */ - public int deletePostByIds(Long[] postIds); - - /** - * 新增保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int insertPost(SysPost post); - - /** - * 修改保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - public int updatePost(SysPost post); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java deleted file mode 100644 index 70bdce8..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import java.util.Set; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; - -/** - * 角色业务层 - * - * @author ruoyi - */ -public interface ISysRoleService -{ - /** - * 根据条件分页查询角色数据 - * - * @param role 角色信息 - * @return 角色数据集合信息 - */ - public List selectRoleList(SysRole role); - - /** - * 根据用户ID查询角色列表 - * - * @param userId 用户ID - * @return 角色列表 - */ - public List selectRolesByUserId(Long userId); - - /** - * 根据用户ID查询角色权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - public Set selectRolePermissionByUserId(Long userId); - - /** - * 查询所有角色 - * - * @return 角色列表 - */ - public List selectRoleAll(); - - /** - * 根据用户ID获取角色选择框列表 - * - * @param userId 用户ID - * @return 选中角色ID列表 - */ - public List selectRoleListByUserId(Long userId); - - /** - * 通过角色ID查询角色 - * - * @param roleId 角色ID - * @return 角色对象信息 - */ - public SysRole selectRoleById(Long roleId); - - /** - * 校验角色名称是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - public String checkRoleNameUnique(SysRole role); - - /** - * 校验角色权限是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - public String checkRoleKeyUnique(SysRole role); - - /** - * 校验角色是否允许操作 - * - * @param role 角色信息 - */ - public void checkRoleAllowed(SysRole role); - - /** - * 通过角色ID查询角色使用数量 - * - * @param roleId 角色ID - * @return 结果 - */ - public int countUserRoleByRoleId(Long roleId); - - /** - * 新增保存角色信息 - * - * @param role 角色信息 - * @return 结果 - */ - public int insertRole(SysRole role); - - /** - * 修改保存角色信息 - * - * @param role 角色信息 - * @return 结果 - */ - public int updateRole(SysRole role); - - /** - * 修改角色状态 - * - * @param role 角色信息 - * @return 结果 - */ - public int updateRoleStatus(SysRole role); - - /** - * 修改数据权限信息 - * - * @param role 角色信息 - * @return 结果 - */ - public int authDataScope(SysRole role); - - /** - * 通过角色ID删除角色 - * - * @param roleId 角色ID - * @return 结果 - */ - public int deleteRoleById(Long roleId); - - /** - * 批量删除角色信息 - * - * @param roleIds 需要删除的角色ID - * @return 结果 - */ - public int deleteRoleByIds(Long[] roleIds); - - /** - * 取消授权用户角色 - * - * @param userRole 用户和角色关联信息 - * @return 结果 - */ - public int deleteAuthUser(SysUserRole userRole); - - /** - * 批量取消授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要取消授权的用户数据ID - * @return 结果 - */ - public int deleteAuthUsers(Long roleId, Long[] userIds); - - /** - * 批量选择授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID - * @return 结果 - */ - public int insertAuthUsers(Long roleId, Long[] userIds); - - public Long selectRoleIdByUserName(String roleName); - - /** - * 新增角色菜单信息-2021-8-3 oracle下循环新增 - * - * @param sysRoleMenu 角色菜单列表 - * @return 是否成功，1成功，否则不成功 - */ - public int insertRoleMenu(SysRoleMenu sysRoleMenu); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java deleted file mode 100644 index 8eb5448..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; - -/** - * 在线用户 服务层 - * - * @author ruoyi - */ -public interface ISysUserOnlineService -{ - /** - * 通过登录地址查询信息 - * - * @param ipaddr 登录地址 - * @param user 用户信息 - * @return 在线用户信息 - */ - public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); - - /** - * 通过用户名称查询信息 - * - * @param userName 用户名称 - * @param user 用户信息 - * @return 在线用户信息 - */ - public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); - - /** - * 通过登录地址/用户名称查询信息 - * - * @param ipaddr 登录地址 - * @param userName 用户名称 - * @param user 用户信息 - * @return 在线用户信息 - */ - public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); - - /** - * 设置在线用户信息 - * - * @param user 用户信息 - * @return 在线用户 - */ - public SysUserOnline loginUserToUserOnline(LoginUser user); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java deleted file mode 100644 index 5355ba0..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.common.core.domain.entity.SysUser; - -/** - * 用户 业务层 - * - * @author ruoyi - */ -public interface ISysUserService -{ - /** - * 根据微信openid查询用户 - * - * @param openid 微信openid - * @return 用户对象信息 - */ - public SysUser selectUserByWechatOpenid(String openid); - - /** - * 绑定微信用户 - * - * @param user 用户信息 - * @return 结果 - */ - public int bindWechatUser(SysUser user); - - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUserList(SysUser user); - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectAllocatedList(SysUser user); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUnallocatedList(SysUser user); - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - public SysUser selectUserByUserName(String userName); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - public SysUser selectUserById(Long userId); - - /** - * 根据用户ID查询用户所属角色组 - * - * @param userName 用户名 - * @return 结果 - */ - public String selectUserRoleGroup(String userName); - - /** - * 根据用户ID查询用户所属岗位组 - * - * @param userName 用户名 - * @return 结果 - */ - public String selectUserPostGroup(String userName); - - /** - * 校验用户名称是否唯一 - * - * @param userName 用户名称 - * @return 结果 - */ - public String checkUserNameUnique(String userName); - - /** - * 校验手机号码是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public String checkPhoneUnique(SysUser user); - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public String checkEmailUnique(SysUser user); - - /** - * 校验用户是否允许操作 - * - * @param user 用户信息 - */ - public void checkUserAllowed(SysUser user); - - public int selectUserId(String userName); - /** - * 新增用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int insertUser(SysUser user); - - /** - * 修改用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUser(SysUser user); - - /** - * 用户授权角色 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - public void insertUserAuth(Long userId, Long[] roleIds); - - /** - * 修改用户状态 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUserStatus(SysUser user); - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUserProfile(SysUser user); - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - public boolean updateUserAvatar(String userName, String avatar); - - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - public int resetPwd(SysUser user); - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - public int resetUserPwd(String userName, String password); - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - public int deleteUserById(Long userId); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - public int deleteUserByIds(Long[] userIds); - - /** - * 导入用户数据 - * - * @param userList 用户数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - public String importUser(List userList, Boolean isUpdateSupport, String operName); -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java deleted file mode 100644 index 4fba58e..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ /dev/null @@ -1,227 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.Collection; -import java.util.List; -import javax.annotation.PostConstruct; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; - -/** - * 参数配置 服务层实现 - * - * @author ruoyi - */ -@Service -public class SysConfigServiceImpl implements ISysConfigService -{ - @Autowired - private SysConfigMapper configMapper; - - @Autowired - private RedisCache redisCache; - - /** - * 项目启动时，初始化参数到缓存 - */ - @PostConstruct - public void init() - { - loadingConfigCache(); - } - - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * @return 参数配置信息 - */ - @Override - @DataSource(DataSourceType.MASTER) - public SysConfig selectConfigById(Long configId) - { - SysConfig config = new SysConfig(); - config.setConfigId(configId); - return configMapper.selectConfig(config); - } - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数key - * @return 参数键值 - */ - @Override - public String selectConfigByKey(String configKey) - { - String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey))); - if (StringUtils.isNotEmpty(configValue)) - { - return configValue; - } - SysConfig config = new SysConfig(); - config.setConfigKey(configKey); - SysConfig retConfig = configMapper.selectConfig(config); - if (StringUtils.isNotNull(retConfig)) - { - redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); - return retConfig.getConfigValue(); - } - return StringUtils.EMPTY; - } - - /** - * 获取验证码开关 - * - * @return true开启，false关闭 - */ - @Override - public boolean selectCaptchaOnOff() - { - String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff"); - if (StringUtils.isEmpty(captchaOnOff)) - { - return true; - } - return Convert.toBool(captchaOnOff); - } - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * @return 参数配置集合 - */ - @Override - public List selectConfigList(SysConfig config) - { - return configMapper.selectConfigList(config); - } - - /** - * 新增参数配置 - * - * @param config 参数配置信息 - * @return 结果 - */ - @Override - public int insertConfig(SysConfig config) - { - int row = configMapper.insertConfig(config); - if (row > 0) - { - redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); - } - return row; - } - - /** - * 修改参数配置 - * - * @param config 参数配置信息 - * @return 结果 - */ - @Override - public int updateConfig(SysConfig config) - { - int row = configMapper.updateConfig(config); - if (row > 0) - { - redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); - } - return row; - } - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - * @return 结果 - */ - @Override - public void deleteConfigByIds(Long[] configIds) - { - for (Long configId : configIds) - { - SysConfig config = selectConfigById(configId); - if (StringUtils.equals(UserConstants.YES, config.getConfigType())) - { - throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); - } - configMapper.deleteConfigById(configId); - redisCache.deleteObject(getCacheKey(config.getConfigKey())); - } - } - - /** - * 加载参数缓存数据 - */ - @Override - public void loadingConfigCache() - { - List configsList = configMapper.selectConfigList(new SysConfig()); - for (SysConfig config : configsList) - { - redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); - } - } - - /** - * 清空参数缓存数据 - */ - @Override - public void clearConfigCache() - { - Collection keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); - redisCache.deleteObject(keys); - } - - /** - * 重置参数缓存数据 - */ - @Override - public void resetConfigCache() - { - clearConfigCache(); - loadingConfigCache(); - } - - /** - * 校验参数键名是否唯一 - * - * @param config 参数配置信息 - * @return 结果 - */ - @Override - public String checkConfigKeyUnique(SysConfig config) - { - Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); - if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 设置cache key - * - * @param configKey 参数键 - * @return 缓存键key - */ - private String getCacheKey(String configKey) - { - return Constants.SYS_CONFIG_KEY + configKey; - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java deleted file mode 100644 index c3b8043..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ /dev/null @@ -1,311 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; - - -/** - * 部门管理 服务实现 - * - * @author ruoyi - */ -@Service -public class SysDeptServiceImpl implements ISysDeptService -{ - @Autowired - private SysDeptMapper deptMapper; - - @Autowired - private SysRoleMapper roleMapper; - - - - /** - * 查询部门管理数据 - * - * @param dept 部门信息 - * @return 部门信息集合 - */ - @Override - @DataScope(deptAlias = "d") - public List selectDeptList(SysDept dept) - { - return deptMapper.selectDeptList(dept); - } - - /** - * 构建前端所需要树结构 - * - * @param depts 部门列表 - * @return 树结构列表 - */ - @Override - public List buildDeptTree(List depts) - { - List returnList = new ArrayList(); - List tempList = new ArrayList(); - for (SysDept dept : depts) - { - tempList.add(dept.getDeptId()); - } - for (Iterator iterator = depts.iterator(); iterator.hasNext();) - { - SysDept dept = (SysDept) iterator.next(); - // 如果是顶级节点, 遍历该父节点的所有子节点 - if (!tempList.contains(dept.getParentId())) - { - recursionFn(depts, dept); - returnList.add(dept); - } - } - if (returnList.isEmpty()) - { - returnList = depts; - } - return returnList; - } - - /** - * 构建前端所需要下拉树结构 - * - * @param depts 部门列表 - * @return 下拉树结构列表 - */ - @Override - public List buildDeptTreeSelect(List depts) - { - List deptTrees = buildDeptTree(depts); - return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); - } - - /** - * 根据角色ID查询部门树信息 - * - * @param roleId 角色ID - * @return 选中部门列表 - */ - @Override - public List selectDeptListByRoleId(Long roleId) - { - SysRole role = roleMapper.selectRoleById(roleId); - return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); - } - - /** - * 根据部门ID查询信息 - * - * @param deptId 部门ID - * @return 部门信息 - */ - @Override - public SysDept selectDeptById(Long deptId) - { - return deptMapper.selectDeptById(deptId); - } - - /** - * 根据ID查询所有子部门（正常状态） - * - * @param deptId 部门ID - * @return 子部门数 - */ - @Override - public int selectNormalChildrenDeptById(Long deptId) - { - return deptMapper.selectNormalChildrenDeptById(deptId); - } - - /** - * 是否存在子节点 - * - * @param deptId 部门ID - * @return 结果 - */ - @Override - public boolean hasChildByDeptId(Long deptId) - { - int result = deptMapper.hasChildByDeptId(deptId); - return result > 0 ? true : false; - } - - /** - * 查询部门是否存在用户 - * - * @param deptId 部门ID - * @return 结果 true 存在 false 不存在 - */ - @Override - public boolean checkDeptExistUser(Long deptId) - { - int result = deptMapper.checkDeptExistUser(deptId); - return result > 0 ? true : false; - } - - /** - * 校验部门名称是否唯一 - * - * @param dept 部门信息 - * @return 结果 - */ - @Override - public String checkDeptNameUnique(SysDept dept) - { - Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); - SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); - if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 新增保存部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - @Override - public int insertDept(SysDept dept) - { - SysDept info = deptMapper.selectDeptById(dept.getParentId()); - // 如果父节点不为正常状态,则不允许新增子节点 - if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) - { - throw new CustomException("部门停用，不允许新增"); - } - dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); - return deptMapper.insertDept(dept); - } - - /** - * 修改保存部门信息 - * - * @param dept 部门信息 - * @return 结果 - */ - @Override - public int updateDept(SysDept dept) - { - SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); - SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); - if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) - { - String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); - String oldAncestors = oldDept.getAncestors(); - dept.setAncestors(newAncestors); - updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); - } - int result = deptMapper.updateDept(dept); - if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) - { - // 如果该部门是启用状态，则启用该部门的所有上级部门 - updateParentDeptStatusNormal(dept); - } - return result; - } - - /** - * 修改该部门的父级部门状态 - * - * @param dept 当前部门 - */ - private void updateParentDeptStatusNormal(SysDept dept) - { - String ancestors = dept.getAncestors(); - Long[] deptIds = Convert.toLongArray(ancestors); - deptMapper.updateDeptStatusNormal(deptIds); - } - - /** - * 修改子元素关系 - * - * @param deptId 被修改的部门ID - * @param newAncestors 新的父ID集合 - * @param oldAncestors 旧的父ID集合 - */ - public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) - { - List children = deptMapper.selectChildrenDeptById(deptId); - for (SysDept child : children) - { - child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); - } - if (children.size() > 0) - { - deptMapper.updateDeptChildren(children); - } - } - - /** - * 删除部门管理信息 - * - * @param deptId 部门ID - * @return 结果 - */ - @Override - public int deleteDeptById(Long deptId) - { - return deptMapper.deleteDeptById(deptId); - } - - /** - * 递归列表 - */ - private void recursionFn(List list, SysDept t) - { - // 得到子节点列表 - List childList = getChildList(list, t); - t.setChildren(childList); - for (SysDept tChild : childList) - { - if (hasChild(list, tChild)) - { - recursionFn(list, tChild); - } - } - } - - /** - * 得到子节点列表 - */ - private List getChildList(List list, SysDept t) - { - List tlist = new ArrayList(); - Iterator it = list.iterator(); - while (it.hasNext()) - { - SysDept n = (SysDept) it.next(); - if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) - { - tlist.add(n); - } - } - return tlist; - } - - /** - * 判断是否有子节点 - */ - private boolean hasChild(List list, SysDept t) - { - return getChildList(list, t).size() > 0 ? true : false; - } - - -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java deleted file mode 100644 index f6a1938..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; - -/** - * 字典 业务层处理 - * - * @author ruoyi - */ -@Service -public class SysDictDataServiceImpl implements ISysDictDataService -{ - @Autowired - private SysDictDataMapper dictDataMapper; - - /** - * 根据条件分页查询字典数据 - * - * @param dictData 字典数据信息 - * @return 字典数据集合信息 - */ - @Override - public List selectDictDataList(SysDictData dictData) - { - return dictDataMapper.selectDictDataList(dictData); - } - - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - @Override - public String selectDictLabel(String dictType, String dictValue) - { - return dictDataMapper.selectDictLabel(dictType, dictValue); - } - - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - @Override - public SysDictData selectDictDataById(Long dictCode) - { - return dictDataMapper.selectDictDataById(dictCode); - } - - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - * @return 结果 - */ - @Override - public void deleteDictDataByIds(Long[] dictCodes) - { - for (Long dictCode : dictCodes) - { - SysDictData data = selectDictDataById(dictCode); - dictDataMapper.deleteDictDataById(dictCode); - List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); - } - } - - /** - * 新增保存字典数据信息 - * - * @param data 字典数据信息 - * @return 结果 - */ - @Override - public int insertDictData(SysDictData data) - { - int row = dictDataMapper.insertDictData(data); - if (row > 0) - { - List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); - } - return row; - } - - /** - * 修改保存字典数据信息 - * - * @param data 字典数据信息 - * @return 结果 - */ - @Override - public int updateDictData(SysDictData data) - { - int row = dictDataMapper.updateDictData(data); - if (row > 0) - { - List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); - } - return row; - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java deleted file mode 100644 index 2e0ff15..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import javax.annotation.PostConstruct; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; - -/** - * 字典 业务层处理 - * - * @author ruoyi - */ -@Service -public class SysDictTypeServiceImpl implements ISysDictTypeService -{ - @Autowired - private SysDictTypeMapper dictTypeMapper; - - @Autowired - private SysDictDataMapper dictDataMapper; - - /** - * 项目启动时，初始化字典到缓存 - */ - @PostConstruct - public void init() - { - loadingDictCache(); - } - - /** - * 根据条件分页查询字典类型 - * - * @param dictType 字典类型信息 - * @return 字典类型集合信息 - */ - @Override - public List selectDictTypeList(SysDictType dictType) - { - return dictTypeMapper.selectDictTypeList(dictType); - } - - /** - * 根据所有字典类型 - * - * @return 字典类型集合信息 - */ - @Override - public List selectDictTypeAll() - { - return dictTypeMapper.selectDictTypeAll(); - } - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - @Override - public List selectDictDataByType(String dictType) - { - List dictDatas = DictUtils.getDictCache(dictType); - if (StringUtils.isNotEmpty(dictDatas)) - { - return dictDatas; - } - dictDatas = dictDataMapper.selectDictDataByType(dictType); - if (StringUtils.isNotEmpty(dictDatas)) - { - DictUtils.setDictCache(dictType, dictDatas); - return dictDatas; - } - return null; - } - - /** - * 根据字典类型ID查询信息 - * - * @param dictId 字典类型ID - * @return 字典类型 - */ - @Override - public SysDictType selectDictTypeById(Long dictId) - { - return dictTypeMapper.selectDictTypeById(dictId); - } - - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - @Override - public SysDictType selectDictTypeByType(String dictType) - { - return dictTypeMapper.selectDictTypeByType(dictType); - } - - /** - * 批量删除字典类型信息 - * - * @param dictIds 需要删除的字典ID - * @return 结果 - */ - @Override - public void deleteDictTypeByIds(Long[] dictIds) - { - for (Long dictId : dictIds) - { - SysDictType dictType = selectDictTypeById(dictId); - if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) - { - throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName())); - } - dictTypeMapper.deleteDictTypeById(dictId); - DictUtils.removeDictCache(dictType.getDictType()); - } - } - - /** - * 加载字典缓存数据 - */ - @Override - public void loadingDictCache() - { - List dictTypeList = dictTypeMapper.selectDictTypeAll(); - for (SysDictType dictType : dictTypeList) - { - List dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType()); - DictUtils.setDictCache(dictType.getDictType(), dictDatas); - } - } - - /** - * 清空字典缓存数据 - */ - @Override - public void clearDictCache() - { - DictUtils.clearDictCache(); - } - - /** - * 重置字典缓存数据 - */ - @Override - public void resetDictCache() - { - clearDictCache(); - loadingDictCache(); - } - - /** - * 新增保存字典类型信息 - * - * @param dict 字典类型信息 - * @return 结果 - */ - @Override - public int insertDictType(SysDictType dict) - { - int row = dictTypeMapper.insertDictType(dict); - if (row > 0) - { - DictUtils.setDictCache(dict.getDictType(), null); - } - return row; - } - - /** - * 修改保存字典类型信息 - * - * @param dict 字典类型信息 - * @return 结果 - */ - @Override - @Transactional - public int updateDictType(SysDictType dict) - { - SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId()); - dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType()); - int row = dictTypeMapper.updateDictType(dict); - if (row > 0) - { - List dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType()); - DictUtils.setDictCache(dict.getDictType(), dictDatas); - } - return row; - } - - /** - * 校验字典类型称是否唯一 - * - * @param dict 字典类型 - * @return 结果 - */ - @Override - public String checkDictTypeUnique(SysDictType dict) - { - Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); - SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); - if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java deleted file mode 100644 index a3b5257..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; - -/** - * 系统访问日志情况信息 服务层处理 - * - * @author ruoyi - */ -@Service -public class SysLogininforServiceImpl implements ISysLogininforService -{ - - @Autowired - private SysLogininforMapper logininforMapper; - - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - @Override - public void insertLogininfor(SysLogininfor logininfor) - { - logininforMapper.insertLogininfor(logininfor); - } - - /** - * 查询系统登录日志集合 - * - * @param logininfor 访问日志对象 - * @return 登录记录集合 - */ - @Override - public List selectLogininforList(SysLogininfor logininfor) - { - return logininforMapper.selectLogininforList(logininfor); - } - - /** - * 批量删除系统登录日志 - * - * @param infoIds 需要删除的登录日志ID - * @return - */ - @Override - public int deleteLogininforByIds(Long[] infoIds) - { - return logininforMapper.deleteLogininforByIds(infoIds); - } - - /** - * 清空系统登录日志 - */ - @Override - public void cleanLogininfor() - { - logininforMapper.cleanLogininfor(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java deleted file mode 100644 index b633b84..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ /dev/null @@ -1,501 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; - -/** - * 菜单 业务层处理 - * - * @author ruoyi - */ -@Service -public class SysMenuServiceImpl implements ISysMenuService -{ - public static final String PREMISSION_STRING = "perms[\"{0}\"]"; - - @Autowired - private SysMenuMapper menuMapper; - - @Autowired - private SysRoleMapper roleMapper; - - @Autowired - private SysRoleMenuMapper roleMenuMapper; - - /** - * 根据用户查询系统菜单列表 - * - * @param userId 用户ID - * @return 菜单列表 - */ - @Override - public List selectMenuList(Long userId) - { - return selectMenuList(new SysMenu(), userId); - } - - /** - * 查询系统菜单列表 - * - * @param menu 菜单信息 - * @return 菜单列表 - */ - @Override - public List selectMenuList(SysMenu menu, Long userId) - { - List menuList = null; - // 管理员显示所有菜单信息 - if (SysUser.isAdmin(userId)) - { - menuList = menuMapper.selectMenuList(menu); - } - else - { - menu.getParams().put("userId", userId); - menuList = menuMapper.selectMenuListByUserId(menu); - } - return menuList; - } - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - @Override - public Set selectMenuPermsByUserId(Long userId) - { - List perms = menuMapper.selectMenuPermsByUserId(userId); - Set permsSet = new HashSet<>(); - for (String perm : perms) - { - if (StringUtils.isNotEmpty(perm)) - { - permsSet.addAll(Arrays.asList(perm.trim().split(","))); - } - } - return permsSet; - } - - /** - * 根据用户ID查询菜单 - * - * @param userId 用户名称 - * @return 菜单列表 - */ - @Override - public List selectMenuTreeByUserId(Long userId) - { - List menus = null; - if (SecurityUtils.isAdmin(userId)) - { - menus = menuMapper.selectMenuTreeAll(); - } - else - { - menus = menuMapper.selectMenuTreeByUserId(userId); - } - return getChildPerms(menus, 0); - } - - /** - * 根据角色ID查询菜单树信息 - * - * @param roleId 角色ID - * @return 选中菜单列表 - */ - @Override - public List selectMenuListByRoleId(Long roleId) - { - SysRole role = roleMapper.selectRoleById(roleId); - return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); - } - - /** - * 构建前端路由所需要的菜单 - * - * @param menus 菜单列表 - * @return 路由列表 - */ - @Override - public List buildMenus(List menus) - { - List routers = new LinkedList(); - for (SysMenu menu : menus) - { - RouterVo router = new RouterVo(); - router.setHidden("1".equals(menu.getVisible())); - router.setName(getRouteName(menu)); - router.setPath(getRouterPath(menu)); - router.setComponent(getComponent(menu)); - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); - List cMenus = menu.getChildren(); - if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) - { - router.setAlwaysShow(true); - router.setRedirect("noRedirect"); - router.setChildren(buildMenus(cMenus)); - } - else if (isMenuFrame(menu)) - { - router.setMeta(null); - List childrenList = new ArrayList(); - RouterVo children = new RouterVo(); - children.setPath(menu.getPath()); - children.setComponent(menu.getComponent()); - children.setName(StringUtils.capitalize(menu.getPath())); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); - childrenList.add(children); - router.setChildren(childrenList); - } - else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) - { - router.setMeta(null); - router.setPath("/inner"); - List childrenList = new ArrayList(); - RouterVo children = new RouterVo(); - String routerPath = StringUtils.replaceEach(menu.getPath(), new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" }); - children.setPath(routerPath); - children.setComponent(UserConstants.INNER_LINK); - children.setName(StringUtils.capitalize(routerPath)); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); - childrenList.add(children); - router.setChildren(childrenList); - } - routers.add(router); - } - return routers; - } - - /** - * 构建前端所需要树结构 - * - * @param menus 菜单列表 - * @return 树结构列表 - */ - @Override - public List buildMenuTree(List menus) - { - List returnList = new ArrayList(); - List tempList = new ArrayList(); - for (SysMenu dept : menus) - { - tempList.add(dept.getMenuId()); - } - for (Iterator iterator = menus.iterator(); iterator.hasNext();) - { - SysMenu menu = (SysMenu) iterator.next(); - // 如果是顶级节点, 遍历该父节点的所有子节点 - if (!tempList.contains(menu.getParentId())) - { - recursionFn(menus, menu); - returnList.add(menu); - } - } - if (returnList.isEmpty()) - { - returnList = menus; - } - return returnList; - } - - /** - * 构建前端所需要下拉树结构 - * - * @param menus 菜单列表 - * @return 下拉树结构列表 - */ - @Override - public List buildMenuTreeSelect(List menus) - { - List menuTrees = buildMenuTree(menus); - return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); - } - - /** - * 根据菜单ID查询信息 - * - * @param menuId 菜单ID - * @return 菜单信息 - */ - @Override - public SysMenu selectMenuById(Long menuId) - { - return menuMapper.selectMenuById(menuId); - } - - /** - * 是否存在菜单子节点 - * - * @param menuId 菜单ID - * @return 结果 - */ - @Override - public boolean hasChildByMenuId(Long menuId) - { - int result = menuMapper.hasChildByMenuId(menuId); - return result > 0 ? true : false; - } - - /** - * 查询菜单使用数量 - * - * @param menuId 菜单ID - * @return 结果 - */ - @Override - public boolean checkMenuExistRole(Long menuId) - { - int result = roleMenuMapper.checkMenuExistRole(menuId); - return result > 0 ? true : false; - } - - /** - * 新增保存菜单信息 - * - * @param menu 菜单信息 - * @return 结果 - */ - @Override - public int insertMenu(SysMenu menu) - { - return menuMapper.insertMenu(menu); - } - - /** - * 修改保存菜单信息 - * - * @param menu 菜单信息 - * @return 结果 - */ - @Override - public int updateMenu(SysMenu menu) - { - return menuMapper.updateMenu(menu); - } - - /** - * 删除菜单管理信息 - * - * @param menuId 菜单ID - * @return 结果 - */ - @Override - public int deleteMenuById(Long menuId) - { - return menuMapper.deleteMenuById(menuId); - } - - /** - * 校验菜单名称是否唯一 - * - * @param menu 菜单信息 - * @return 结果 - */ - @Override - public String checkMenuNameUnique(SysMenu menu) - { - Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); - SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); - if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 获取路由名称 - * - * @param menu 菜单信息 - * @return 路由名称 - */ - public String getRouteName(SysMenu menu) - { - String routerName = StringUtils.capitalize(menu.getPath()); - // 非外链并且是一级目录（类型为目录） - if (isMenuFrame(menu)) - { - routerName = StringUtils.EMPTY; - } - return routerName; - } - - /** - * 获取路由地址 - * - * @param menu 菜单信息 - * @return 路由地址 - */ - public String getRouterPath(SysMenu menu) - { - String routerPath = menu.getPath(); - // 内链打开外网方式 - if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) - { - routerPath = StringUtils.replaceEach(routerPath, new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" }); - } - // 非外链并且是一级目录（类型为目录） - if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) - && UserConstants.NO_FRAME.equals(menu.getIsFrame())) - { - routerPath = "/" + menu.getPath(); - } - // 非外链并且是一级目录（类型为菜单） - else if (isMenuFrame(menu)) - { - routerPath = "/"; - } - return routerPath; - } - - /** - * 获取组件信息 - * - * @param menu 菜单信息 - * @return 组件信息 - */ - public String getComponent(SysMenu menu) - { - String component = UserConstants.LAYOUT; - if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) - { - component = menu.getComponent(); - } - else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) - { - component = UserConstants.INNER_LINK; - } - else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) - { - component = UserConstants.PARENT_VIEW; - } - return component; - } - - /** - * 是否为菜单内部跳转 - * - * @param menu 菜单信息 - * @return 结果 - */ - public boolean isMenuFrame(SysMenu menu) - { - return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) - && menu.getIsFrame().equals(UserConstants.NO_FRAME); - } - - /** - * 是否为内链组件 - * - * @param menu 菜单信息 - * @return 结果 - */ - public boolean isInnerLink(SysMenu menu) - { - return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); - } - - /** - * 是否为parent_view组件 - * - * @param menu 菜单信息 - * @return 结果 - */ - public boolean isParentView(SysMenu menu) - { - return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); - } - - /** - * 根据父节点的ID获取所有子节点 - * - * @param list 分类表 - * @param parentId 传入的父节点ID - * @return String - */ - public List getChildPerms(List list, int parentId) - { - List returnList = new ArrayList(); - for (Iterator iterator = list.iterator(); iterator.hasNext();) - { - SysMenu t = (SysMenu) iterator.next(); - // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 - if (t.getParentId() == parentId) - { - recursionFn(list, t); - returnList.add(t); - } - } - return returnList; - } - - /** - * 递归列表 - * - * @param list - * @param t - */ - private void recursionFn(List list, SysMenu t) - { - // 得到子节点列表 - List childList = getChildList(list, t); - t.setChildren(childList); - for (SysMenu tChild : childList) - { - if (hasChild(list, tChild)) - { - recursionFn(list, tChild); - } - } - } - - /** - * 得到子节点列表 - */ - private List getChildList(List list, SysMenu t) - { - List tlist = new ArrayList(); - Iterator it = list.iterator(); - while (it.hasNext()) - { - SysMenu n = (SysMenu) it.next(); - if (n.getParentId().longValue() == t.getMenuId().longValue()) - { - tlist.add(n); - } - } - return tlist; - } - - /** - * 判断是否有子节点 - */ - private boolean hasChild(List list, SysMenu t) - { - return getChildList(list, t).size() > 0 ? true : false; - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java deleted file mode 100644 index 765438b..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; - -/** - * 公告 服务层实现 - * - * @author ruoyi - */ -@Service -public class SysNoticeServiceImpl implements ISysNoticeService -{ - @Autowired - private SysNoticeMapper noticeMapper; - - /** - * 查询公告信息 - * - * @param noticeId 公告ID - * @return 公告信息 - */ - @Override - public SysNotice selectNoticeById(Long noticeId) - { - return noticeMapper.selectNoticeById(noticeId); - } - - /** - * 查询公告列表 - * - * @param notice 公告信息 - * @return 公告集合 - */ - @Override - public List selectNoticeList(SysNotice notice) - { - return noticeMapper.selectNoticeList(notice); - } - - /** - * 新增公告 - * - * @param notice 公告信息 - * @return 结果 - */ - @Override - public int insertNotice(SysNotice notice) - { - return noticeMapper.insertNotice(notice); - } - - /** - * 修改公告 - * - * @param notice 公告信息 - * @return 结果 - */ - @Override - public int updateNotice(SysNotice notice) - { - return noticeMapper.updateNotice(notice); - } - - /** - * 删除公告对象 - * - * @param noticeId 公告ID - * @return 结果 - */ - @Override - public int deleteNoticeById(Long noticeId) - { - return noticeMapper.deleteNoticeById(noticeId); - } - - /** - * 批量删除公告信息 - * - * @param noticeIds 需要删除的公告ID - * @return 结果 - */ - @Override - public int deleteNoticeByIds(Long[] noticeIds) - { - return noticeMapper.deleteNoticeByIds(noticeIds); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java deleted file mode 100644 index 5a48d9a..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; - -/** - * 操作日志 服务层处理 - * - * @author ruoyi - */ -@Service -public class SysOperLogServiceImpl implements ISysOperLogService -{ - @Autowired - private SysOperLogMapper operLogMapper; - - /** - * 新增操作日志 - * - * @param operLog 操作日志对象 - */ - @Override - public void insertOperlog(SysOperLog operLog) - { - // System.out.println("传入的operLog:" + operLog.toString()); - operLogMapper.insertOperlog(operLog); - } - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * @return 操作日志集合 - */ - @Override - public List selectOperLogList(SysOperLog operLog) - { - return operLogMapper.selectOperLogList(operLog); - } - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * @return 结果 - */ - @Override - public int deleteOperLogByIds(Long[] operIds) - { - return operLogMapper.deleteOperLogByIds(operIds); - } - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - @Override - public SysOperLog selectOperLogById(Long operId) - { - return operLogMapper.selectOperLogById(operId); - } - - /** - * 清空操作日志 - */ - @Override - public void cleanOperLog() - { - operLogMapper.cleanOperLog(); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java deleted file mode 100644 index c0da6d4..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; - -/** - * 岗位信息 服务层处理 - * - * @author ruoyi - */ -@Service -public class SysPostServiceImpl implements ISysPostService -{ - @Autowired - private SysPostMapper postMapper; - - @Autowired - private SysUserPostMapper userPostMapper; - - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * @return 岗位信息集合 - */ - @Override - public List selectPostList(SysPost post) - { - return postMapper.selectPostList(post); - } - - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - @Override - public List selectPostAll() - { - return postMapper.selectPostAll(); - } - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * @return 角色对象信息 - */ - @Override - public SysPost selectPostById(Long postId) - { - return postMapper.selectPostById(postId); - } - - /** - * 根据用户ID获取岗位选择框列表 - * - * @param userId 用户ID - * @return 选中岗位ID列表 - */ - @Override - public List selectPostListByUserId(Long userId) - { - return postMapper.selectPostListByUserId(userId); - } - - /** - * 校验岗位名称是否唯一 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public String checkPostNameUnique(SysPost post) - { - Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostNameUnique(post.getPostName()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验岗位编码是否唯一 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public String checkPostCodeUnique(SysPost post) - { - Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * @return 结果 - */ - @Override - public int countUserPostById(Long postId) - { - return userPostMapper.countUserPostById(postId); - } - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * @return 结果 - */ - @Override - public int deletePostById(Long postId) - { - return postMapper.deletePostById(postId); - } - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * @return 结果 - * @throws Exception 异常 - */ - @Override - public int deletePostByIds(Long[] postIds) - { - for (Long postId : postIds) - { - SysPost post = selectPostById(postId); - if (countUserPostById(postId) > 0) - { - throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName())); - } - } - return postMapper.deletePostByIds(postIds); - } - - /** - * 新增保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public int insertPost(SysPost post) - { - return postMapper.insertPost(post); - } - - /** - * 修改保存岗位信息 - * - * @param post 岗位信息 - * @return 结果 - */ - @Override - public int updatePost(SysPost post) - { - return postMapper.updatePost(post); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java deleted file mode 100644 index 0345aea..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ /dev/null @@ -1,421 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; - -/** - * 角色 业务层处理 - * - * @author ruoyi - */ -@Service -public class SysRoleServiceImpl implements ISysRoleService -{ - @Autowired - private SysRoleMapper roleMapper; - - @Autowired - private SysRoleMenuMapper roleMenuMapper; - - @Autowired - private SysUserRoleMapper userRoleMapper; - - @Autowired - private SysRoleDeptMapper roleDeptMapper; - - /** - * 根据条件分页查询角色数据 - * - * @param role 角色信息 - * @return 角色数据集合信息 - */ - @Override - @DataScope(deptAlias = "d") - public List selectRoleList(SysRole role) - { - return roleMapper.selectRoleList(role); - } - - /** - * 根据用户ID查询角色 - * - * @param userId 用户ID - * @return 角色列表 - */ - @Override - public List selectRolesByUserId(Long userId) - { - List userRoles = roleMapper.selectRolePermissionByUserId(userId); - List roles = selectRoleAll(); - for (SysRole role : roles) - { - for (SysRole userRole : userRoles) - { - if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) - { - role.setFlag(true); - break; - } - } - } - return roles; - } - - /** - * 根据用户ID查询权限 - * - * @param userId 用户ID - * @return 权限列表 - */ - @Override - public Set selectRolePermissionByUserId(Long userId) - { - List perms = roleMapper.selectRolePermissionByUserId(userId); - Set permsSet = new HashSet<>(); - for (SysRole perm : perms) - { - if (StringUtils.isNotNull(perm)) - { - permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); - } - } - return permsSet; - } - - /** - * 查询所有角色 - * - * @return 角色列表 - */ - @Override - public List selectRoleAll() - { - return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); - } - - /** - * 根据用户ID获取角色选择框列表 - * - * @param userId 用户ID - * @return 选中角色ID列表 - */ - @Override - public List selectRoleListByUserId(Long userId) - { - return roleMapper.selectRoleListByUserId(userId); - } - - /** - * 通过角色ID查询角色 - * - * @param roleId 角色ID - * @return 角色对象信息 - */ - @Override - public SysRole selectRoleById(Long roleId) - { - return roleMapper.selectRoleById(roleId); - } - - /** - * 校验角色名称是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - public String checkRoleNameUnique(SysRole role) - { - Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); - SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); - if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验角色权限是否唯一 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - public String checkRoleKeyUnique(SysRole role) - { - Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); - SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); - if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验角色是否允许操作 - * - * @param role 角色信息 - */ - @Override - public void checkRoleAllowed(SysRole role) - { - if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) - { - throw new CustomException("不允许操作超级管理员角色"); - } - } - - /** - * 通过角色ID查询角色使用数量 - * - * @param roleId 角色ID - * @return 结果 - */ - @Override - public int countUserRoleByRoleId(Long roleId) - { - return userRoleMapper.countUserRoleByRoleId(roleId); - } - - /** - * 新增保存角色信息 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - @Transactional - public int insertRole(SysRole role) - { - // 新增角色信息 - roleMapper.insertRole(role); - // 新增取得角色ID - Long roleid = roleMapper.selectRoleIdByUserName(role.getRoleName()); - role.setRoleId(roleid); - return insertRoleMenu(role); - } - - /** - * 修改保存角色信息 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - @Transactional - public int updateRole(SysRole role) - { - // 修改角色信息 - roleMapper.updateRole(role); - // 删除角色与菜单关联 - roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId()); - return insertRoleMenu(role); - } - - /** - * 修改角色状态 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - public int updateRoleStatus(SysRole role) - { - return roleMapper.updateRole(role); - } - - /** - * 修改数据权限信息 - * - * @param role 角色信息 - * @return 结果 - */ - @Override - @Transactional - public int authDataScope(SysRole role) - { - // 修改角色信息 - roleMapper.updateRole(role); - // 删除角色与部门关联 - roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); - // 新增角色和部门信息（数据权限） - return insertRoleDept(role); - } - - /** - * 新增角色菜单信息 - * - * @param role 角色对象 - */ - public int insertRoleMenu(SysRole role) - { - int rows = 0; - // 新增用户与角色管理 - // 2021-8-3 改为java循环新增 - // List list = new ArrayList(); - for (Long menuId : role.getMenuIds()) - { - SysRoleMenu rm = new SysRoleMenu(); - rm.setRoleId(role.getRoleId()); - rm.setMenuId(menuId); - roleMenuMapper.insertRoleMenu(rm); - rows ++; - } - /* if (list.size() > 0) - { - rows = roleMenuMapper.batchRoleMenu(list); - }*/ - return rows; - } - - /** - * 新增角色部门信息(数据权限) - * - * @param role 角色对象 - */ - public int insertRoleDept(SysRole role) - { - int rows = 0; - // 新增角色与部门（数据权限）管理 - // 2021-8-3 oracle数据库，改为java端循环新增 - // List list = new ArrayList(); - for (Long deptId : role.getDeptIds()) - { - SysRoleDept rd = new SysRoleDept(); - rd.setRoleId(role.getRoleId()); - rd.setDeptId(deptId); - roleDeptMapper.insertRoleDept(rd); - rows ++; - // list.add(rd); - } - /*if (list.size() > 0) - { - rows = roleDeptMapper.batchRoleDept(list); - }*/ - return rows; - } - - /** - * 通过角色ID删除角色 - * - * @param roleId 角色ID - * @return 结果 - */ - @Override - @Transactional - public int deleteRoleById(Long roleId) - { - // 删除角色与菜单关联 - roleMenuMapper.deleteRoleMenuByRoleId(roleId); - // 删除角色与部门关联 - roleDeptMapper.deleteRoleDeptByRoleId(roleId); - return roleMapper.deleteRoleById(roleId); - } - - /** - * 批量删除角色信息 - * - * @param roleIds 需要删除的角色ID - * @return 结果 - */ - @Override - @Transactional - public int deleteRoleByIds(Long[] roleIds) - { - for (Long roleId : roleIds) - { - checkRoleAllowed(new SysRole(roleId)); - SysRole role = selectRoleById(roleId); - if (countUserRoleByRoleId(roleId) > 0) - { - throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName())); - } - } - // 删除角色与菜单关联 - roleMenuMapper.deleteRoleMenu(roleIds); - // 删除角色与部门关联 - roleDeptMapper.deleteRoleDept(roleIds); - return roleMapper.deleteRoleByIds(roleIds); - } - - /** - * 取消授权用户角色 - * - * @param userRole 用户和角色关联信息 - * @return 结果 - */ - @Override - public int deleteAuthUser(SysUserRole userRole) - { - return userRoleMapper.deleteUserRoleInfo(userRole); - } - - /** - * 批量取消授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要取消授权的用户数据ID - * @return 结果 - */ - @Override - public int deleteAuthUsers(Long roleId, Long[] userIds) - { - return userRoleMapper.deleteUserRoleInfos(roleId, userIds); - } - - /** - * 批量选择授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID - * @return 结果 - */ - @Override - public int insertAuthUsers(Long roleId, Long[] userIds) - { - // 新增用户与角色管理 - List list = new ArrayList(); - for (Long userId : userIds) - { - SysUserRole ur = new SysUserRole(); - ur.setUserId(userId); - ur.setRoleId(roleId); - list.add(ur); - } - return userRoleMapper.batchUserRole(list); - } - - @Override - public Long selectRoleIdByUserName(String roleName) { - // TODO Auto-generated method stub - return roleMapper.selectRoleIdByUserName(roleName); - } - - @Override - public int insertRoleMenu(SysRoleMenu sysRoleMenu) { - // TODO Auto-generated method stub - return roleMenuMapper.insertRoleMenu(sysRoleMenu); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java deleted file mode 100644 index f80a877..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.system.service.impl; - -import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; - -/** - * 在线用户 服务层处理 - * - * @author ruoyi - */ -@Service -public class SysUserOnlineServiceImpl implements ISysUserOnlineService -{ - /** - * 通过登录地址查询信息 - * - * @param ipaddr 登录地址 - * @param user 用户信息 - * @return 在线用户信息 - */ - @Override - public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) - { - if (StringUtils.equals(ipaddr, user.getIpaddr())) - { - return loginUserToUserOnline(user); - } - return null; - } - - /** - * 通过用户名称查询信息 - * - * @param userName 用户名称 - * @param user 用户信息 - * @return 在线用户信息 - */ - @Override - public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) - { - if (StringUtils.equals(userName, user.getUsername())) - { - return loginUserToUserOnline(user); - } - return null; - } - - /** - * 通过登录地址/用户名称查询信息 - * - * @param ipaddr 登录地址 - * @param userName 用户名称 - * @param user 用户信息 - * @return 在线用户信息 - */ - @Override - public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) - { - if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) - { - return loginUserToUserOnline(user); - } - return null; - } - - /** - * 设置在线用户信息 - * - * @param user 用户信息 - * @return 在线用户 - */ - @Override - public SysUserOnline loginUserToUserOnline(LoginUser user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser())) - { - return null; - } - SysUserOnline sysUserOnline = new SysUserOnline(); - sysUserOnline.setTokenId(user.getToken()); - sysUserOnline.setUserName(user.getUsername()); - sysUserOnline.setIpaddr(user.getIpaddr()); - sysUserOnline.setLoginLocation(user.getLoginLocation()); - sysUserOnline.setBrowser(user.getBrowser()); - sysUserOnline.setOs(user.getOs()); - sysUserOnline.setLoginTime(user.getLoginTime()); - if (StringUtils.isNotNull(user.getUser().getDept())) - { - sysUserOnline.setDeptName(user.getUser().getDept().getDeptName()); - } - return sysUserOnline; - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java deleted file mode 100644 index ecfcb96..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ /dev/null @@ -1,573 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.ArrayList; -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 用户 业务层处理 - * - * @author ruoyi - */ -@Service -public class SysUserServiceImpl implements ISysUserService -{ - private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); - - @Autowired - private SysUserMapper userMapper; - - @Autowired - private SysRoleMapper roleMapper; - - @Autowired - private SysPostMapper postMapper; - - - @Autowired - private SysUserRoleMapper userRoleMapper; - - @Autowired - private SysUserPostMapper userPostMapper; - - @Autowired - private ISysConfigService configService; - - /** - * 通过微信openid查询用户 - * - * @param openid 微信openid - * @return 用户对象信息 - */ - @Override - public SysUser selectUserByWechatOpenid(String openid) - { - return userMapper.selectUserByWechatOpenid(openid); - } - - /** - * 绑定微信用户 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int bindWechatUser(SysUser user) - { - return userMapper.bindWechatUser(user); - } - - - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUserList(SysUser user) - { - // System.out.println("进入"); - - return userMapper.selectUserList(user); - } - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectAllocatedList(SysUser user) - { - return userMapper.selectAllocatedList(user); - } - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUnallocatedList(SysUser user) - { - return userMapper.selectUnallocatedList(user); - } - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - @Override - public SysUser selectUserByUserName(String userName) - { - return userMapper.selectUserByUserName(userName); - } - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - @Override - public SysUser selectUserById(Long userId) - { - return userMapper.selectUserById(userId); - } - - /** - * 查询用户所属角色组 - * - * @param userName 用户名 - * @return 结果 - */ - @Override - public String selectUserRoleGroup(String userName) - { - List list = roleMapper.selectRolesByUserName(userName); - StringBuffer idsStr = new StringBuffer(); - for (SysRole role : list) - { - idsStr.append(role.getRoleName()).append(","); - } - if (StringUtils.isNotEmpty(idsStr.toString())) - { - return idsStr.substring(0, idsStr.length() - 1); - } - return idsStr.toString(); - } - - /** - * 查询用户所属岗位组 - * - * @param userName 用户名 - * @return 结果 - */ - @Override - public String selectUserPostGroup(String userName) - { - List list = postMapper.selectPostsByUserName(userName); - StringBuffer idsStr = new StringBuffer(); - for (SysPost post : list) - { - idsStr.append(post.getPostName()).append(","); - } - if (StringUtils.isNotEmpty(idsStr.toString())) - { - return idsStr.substring(0, idsStr.length() - 1); - } - return idsStr.toString(); - } - - /** - * 校验用户名称是否唯一 - * - * @param userName 用户名称 - * @return 结果 - */ - @Override - public String checkUserNameUnique(String userName) - { - int count = userMapper.checkUserNameUnique(userName); - if (count > 0) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验用户名称是否唯一 - * - * @param user 用户信息 - * @return - */ - @Override - public String checkPhoneUnique(SysUser user) - { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - * @return - */ - @Override - public String checkEmailUnique(SysUser user) - { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkEmailUnique(user.getEmail()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验用户是否允许操作 - * - * @param user 用户信息 - */ - @Override - public void checkUserAllowed(SysUser user) - { - if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) - { - throw new CustomException("不允许操作超级管理员用户"); - } - } - - /** - * 新增保存用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @Transactional - public int insertUser(SysUser user) - { - // 输出用户信息 - // System.out.println("传入的用户信息:" + user.toString()); - // 新增用户信息 - int rows = userMapper.insertUser(user); - - String usercode = String.valueOf(userMapper.selectUserId(user.getUserName())); - user.setUserId(Long.parseLong(usercode)); - // 新增用户岗位关联 - insertUserPost(user); - // 新增用户与角色管理 - insertUserRole(user); - return rows; - } - - /** - * 修改保存用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @Transactional - public int updateUser(SysUser user) - { - Long userId = user.getUserId(); - // 删除用户与角色关联 - userRoleMapper.deleteUserRoleByUserId(userId); - // 新增用户与角色管理 - insertUserRole(user); - // 删除用户与岗位关联 - userPostMapper.deleteUserPostByUserId(userId); - // 新增用户与岗位管理 - insertUserPost(user); - return userMapper.updateUser(user); - } - - /** - * 用户授权角色 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - @Override - @Transactional - public void insertUserAuth(Long userId, Long[] roleIds) - { - userRoleMapper.deleteUserRoleByUserId(userId); - insertUserRole(userId, roleIds); - } - - /** - * 修改用户状态 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int updateUserStatus(SysUser user) - { - return userMapper.updateUser(user); - } - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int updateUserProfile(SysUser user) - { - return userMapper.updateUser(user); - } - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - @Override - public boolean updateUserAvatar(String userName, String avatar) - { - return userMapper.updateUserAvatar(userName, avatar) > 0; - } - - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int resetPwd(SysUser user) - { - return userMapper.updateUser(user); - } - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - @Override - public int resetUserPwd(String userName, String password) - { - return userMapper.resetUserPwd(userName, password); - } - - /** - * 新增用户角色信息 - * - * @param user 用户对象 - */ - public void insertUserRole(SysUser user) - { - Long[] roles = user.getRoleIds(); - if (StringUtils.isNotNull(roles)) - { - // 新增用户与角色管理 - // 2021-8-3 因oracle数据库改为java循环插入 - // List list = new ArrayList(); - for (Long roleId : roles) - { - SysUserRole ur = new SysUserRole(); - ur.setUserId(user.getUserId()); - ur.setRoleId(roleId); - // list.add(ur); - userRoleMapper.insertUserRole(ur); - } - /*if (list.size() > 0) - { - userRoleMapper.batchUserRole(list); - }*/ - } - } - - /** - * 新增用户岗位信息 - * - * @param user 用户对象 - */ - public void insertUserPost(SysUser user) - { - Long[] posts = user.getPostIds(); - if (StringUtils.isNotNull(posts)) - { - // 新增用户与岗位管理 - // List list = new ArrayList(); - for (Long postId : posts) - { - SysUserPost up = new SysUserPost(); - up.setUserId(user.getUserId()); - up.setPostId(postId); - userPostMapper.insertUserPost(up); - //list.add(up); - } - /*if (list.size() > 0) - { - userPostMapper.batchUserPost(list); - }*/ - } - } - - /** - * 新增用户角色信息 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - public void insertUserRole(Long userId, Long[] roleIds) - { - if (StringUtils.isNotNull(roleIds)) - { - // 新增用户与角色管理 - List list = new ArrayList(); - for (Long roleId : roleIds) - { - SysUserRole ur = new SysUserRole(); - ur.setUserId(userId); - ur.setRoleId(roleId); - list.add(ur); - } - if (list.size() > 0) - { - userRoleMapper.batchUserRole(list); - } - } - } - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - @Override - @Transactional - public int deleteUserById(Long userId) - { - // 删除用户与角色关联 - userRoleMapper.deleteUserRoleByUserId(userId); - // 删除用户与岗位表 - userPostMapper.deleteUserPostByUserId(userId); - return userMapper.deleteUserById(userId); - } - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - @Override - @Transactional - public int deleteUserByIds(Long[] userIds) - { - for (Long userId : userIds) - { - checkUserAllowed(new SysUser(userId)); - } - // 删除用户与角色关联 - userRoleMapper.deleteUserRole(userIds); - // 删除用户与岗位关联 - userPostMapper.deleteUserPost(userIds); - return userMapper.deleteUserByIds(userIds); - } - - /** - * 导入用户数据 - * - * @param userList 用户数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - @Override - public String importUser(List userList, Boolean isUpdateSupport, String operName) - { - if (StringUtils.isNull(userList) || userList.size() == 0) - { - throw new CustomException("导入用户数据不能为空！"); - } - int successNum = 0; - int failureNum = 0; - StringBuilder successMsg = new StringBuilder(); - StringBuilder failureMsg = new StringBuilder(); - String password = configService.selectConfigByKey("sys.user.initPassword"); - for (SysUser user : userList) - { - try - { - // 验证是否存在这个用户 - SysUser u = userMapper.selectUserByUserName(user.getUserName()); - if (StringUtils.isNull(u)) - { - user.setPassword(SecurityUtils.encryptPassword(password)); - user.setCreateBy(operName); - this.insertUser(user); - successNum++; - successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); - } - else if (isUpdateSupport) - { - user.setUpdateBy(operName); - this.updateUser(user); - successNum++; - successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); - } - else - { - failureNum++; - failureMsg.append("
" + failureNum + "、账号 " + user.getUserName() + " 已存在"); - } - } - catch (Exception e) - { - failureNum++; - String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; - failureMsg.append(msg + e.getMessage()); - log.error(msg, e); - } - } - if (failureNum > 0) - { - failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); - throw new CustomException(failureMsg.toString()); - } - else - { - successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); - } - return successMsg.toString(); - } - - @Override - public int selectUserId(String userName) { - // TODO Auto-generated method stub - return userMapper.selectUserId(userName); - } -} diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml deleted file mode 100644 index cbc9562..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark - from sys_config - - - - - - - and config_id = #{configId} - - - and config_key = #{configKey} - - - - - - - - - - - - insert into sys_config ( - config_name, - config_key, - config_value, - config_type, - create_by, - remark, - create_time - )values( - #{configName}, - #{configKey}, - #{configValue}, - #{configType}, - #{createBy}, - #{remark}, - now() - ) - - - - update sys_config - - config_name = #{configName}, - config_key = #{configKey}, - config_value = #{configValue}, - config_type = #{configType}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = now() - - where config_id = #{configId} - - - - delete from sys_config where config_id = #{configId} - - - - delete from sys_config where config_id in - - #{configId} - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml deleted file mode 100644 index 9060556..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select d.dept_id, d.parent_id, d.ancestors, d.dept_code, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time - from sys_dept d - - - - - - - - - - - - - - - - - - - - insert into sys_dept( - parent_id, - dept_code, - dept_name, - ancestors, - order_num, - leader, - phone, - email, - status, - del_flag, - create_by, - create_time - )values( - #{parentId}, - #{deptCode}, - #{deptName}, - #{ancestors}, - #{orderNum}, - #{leader}, - #{phone}, - #{email}, - #{status}, - '0', - #{createBy}, - now() - ) - - - - update sys_dept - - parent_id = #{parentId}, - dept_code = #{deptCode}, - dept_name = #{deptName}, - ancestors = #{ancestors}, - order_num = #{orderNum}, - leader = #{leader}, - phone = #{phone}, - email = #{email}, - status = #{status}, - update_by = #{updateBy}, - update_time = now() - - where dept_id = #{deptId} - - - - update sys_dept set ancestors = - - when #{item.deptId} then #{item.ancestors} - - where dept_id in - - #{item.deptId} - - - - - update sys_dept set status = '0' where dept_id in - - #{deptId} - - - - - update sys_dept set del_flag = '2' where dept_id = #{deptId} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml deleted file mode 100644 index d4beaff..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark - from sys_dict_data - - - - - - - - - - - - - - delete from sys_dict_data where dict_code = #{dictCode} - - - - delete from sys_dict_data where dict_code in - - #{dictCode} - - - - - update sys_dict_data - - dict_sort = #{dictSort}, - dict_label = #{dictLabel}, - dict_value = #{dictValue}, - dict_type = #{dictType}, - css_class = #{cssClass}, - list_class = #{listClass}, - is_default = #{isDefault}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = now() - - where dict_code = #{dictCode} - - - - update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - - - - insert into sys_dict_data(、 - dict_sort, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - remark, - create_by, - create_time - )values( - #{dictSort}, - #{dictLabel}, - #{dictValue}, - #{dictType}, - #{cssClass}, - #{listClass}, - #{isDefault}, - #{status}, - #{remark}, - #{createBy}, - now() - ) - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml deleted file mode 100644 index 8afd420..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - select dict_id, dict_name, dict_type, status, create_by, create_time, remark - from sys_dict_type - - - - - - - - - - - - - - delete from sys_dict_type where dict_id = #{dictId} - - - - delete from sys_dict_type where dict_id in - - #{dictId} - - - - - update sys_dict_type - - dict_name = #{dictName}, - dict_type = #{dictType}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = now() - - where dict_id = #{dictId} - - - - insert into sys_dict_type( - dict_name, - dict_type, - status, - remark, - create_by, - create_time - )values( - #{dictName}, - #{dictType}, - #{status}, - #{remark}, - #{createBy}, - now() - ) - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml deleted file mode 100644 index fae5470..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) - values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now()) - - - - - - delete from sys_logininfor where info_id in - - #{infoId} - - - - - truncate table sys_logininfor - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml deleted file mode 100644 index e9c9552..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time - from sys_menu - - - - - - - - - - - - - - - - - - - - - - - - update sys_menu - - menu_name = #{menuName}, - parent_id = #{parentId}, - order_num = #{orderNum}, - path = #{path}, - component = #{component}, - is_frame = #{isFrame}, - is_cache = #{isCache}, - menu_type = #{menuType}, - visible = #{visible}, - status = #{status}, - perms = #{perms}, - icon = #{icon}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = now() - - where menu_id = #{menuId} - - - - insert into sys_menu( - parent_id, - menu_name, - order_num, - path, - component, - is_frame, - is_cache, - menu_type, - visible, - status, - perms, - icon, - remark, - create_by, - create_time - )values( - #{parentId}, - #{menuName}, - #{orderNum}, - #{path}, - #{component}, - #{isFrame}, - #{isCache}, - #{menuType}, - #{visible}, - #{status}, - #{perms}, - #{icon}, - #{remark}, - #{createBy}, - now() - ) - - - - delete from sys_menu where menu_id = #{menuId} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml deleted file mode 100644 index c37775f..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - select notice_id, notice_title, notice_type, notice_content, status, create_by, create_time, update_by, update_time, remark - from sys_notice - - - - - - - - insert into sys_notice ( - notice_title, - notice_type, - notice_content, - status, - remark, - create_by, - create_time - )values( - #{noticeTitle}, - #{noticeType}, - #{noticeContent}, - #{status}, - #{remark}, - #{createBy}, - now() - ) - - - - update sys_notice - - notice_title = #{noticeTitle}, - notice_type = #{noticeType}, - notice_content = #{noticeContent}, - status = #{status}, - update_by = #{updateBy}, - update_time = now() - - where notice_id = #{noticeId} - - - - delete from sys_notice where notice_id = #{noticeId} - - - - delete from sys_notice where notice_id in - - #{noticeId} - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml deleted file mode 100644 index d2f8ddf..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time - from sys_oper_log - - - - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) - values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, now()) - - - - - - delete from sys_oper_log where oper_id in - - #{operId} - - - - - - - truncate table sys_oper_log - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml deleted file mode 100644 index 97b2c61..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark - from sys_post - - - - - - - - - - - - - - - - - - update sys_post - - post_code = #{postCode}, - post_name = #{postName}, - post_sort = #{postSort}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = now() - - where post_id = #{postId} - - - - insert into sys_post( - post_code, - post_name, - post_sort, - status, - remark, - create_by, - create_time - )values( - #{postCode}, - #{postName}, - #{postSort}, - #{status}, - #{remark}, - #{createBy}, - now() - ) - - - - delete from sys_post where post_id = #{postId} - - - - delete from sys_post where post_id in - - #{postId} - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml deleted file mode 100644 index 1f55a33..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - delete from sys_role_dept where role_id=#{roleId} - - - - - - delete from sys_role_dept where role_id in - - #{roleId} - - - - - insert into sys_role_dept(role_id, dept_id) values - - (#{item.roleId},#{item.deptId}) - - - - - insert into sys_role_dept(role_id, dept_id) values (#{roleId},#{deptId}) - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml deleted file mode 100644 index 2be8f7b..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, - r.status, r.del_flag, r.create_time, r.remark - from sys_role r - left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id - - - - - - - - - - - - - - - - - - - - - - insert into sys_role( - role_name, - role_key, - role_sort, - data_scope, - menu_check_strictly, - dept_check_strictly, - status, - del_flag, - remark, - create_by, - create_time - )values( - #{roleName}, - #{roleKey}, - #{roleSort}, - #{dataScope}, - #{menuCheckStrictly}, - #{deptCheckStrictly}, - #{status}, - '0', - #{remark}, - #{createBy}, - now() - ) - - - - update sys_role - - role_name = #{roleName}, - role_key = #{roleKey}, - role_sort = #{roleSort}, - data_scope = #{dataScope}, - menu_check_strictly = #{menuCheckStrictly}, - dept_check_strictly = #{deptCheckStrictly}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = now() - - where role_id = #{roleId} - - - - update sys_role set del_flag = '2' where role_id = #{roleId} - - - - update sys_role set del_flag = '2' where role_id in - - #{roleId} - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml deleted file mode 100644 index 05be5c8..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - delete from sys_role_menu where role_id=#{roleId} - - - - delete from sys_role_menu where role_id in - - #{roleId} - - - - - insert into sys_role_menu(role_id, menu_id) values - - (#{item.roleId},#{item.menuId}) - - - - - insert into sys_role_menu(role_id, menu_id) values (#{roleId},#{menuId}) - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml deleted file mode 100644 index 8a9b6ae..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select u.user_id, u.user_code,u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id - - - - - - - - - - - - update sys_user - - wechat_openid = #{wechatOpenid}, - wechat_unionid = #{wechatUnionid}, - wechat_nickname = #{wechatNickname}, - wechat_avatar = #{wechatAvatar}, - bind_wechat = #{bindWechat}, - update_time = now() - - where user_id = #{userId} - - - - - - - - - - - - - - - - insert into sys_user( - dept_id, - user_name, - user_code, - nick_name, - email, - avatar, - phonenumber, - sex, - password, - status, - del_flag, - create_by, - remark, - create_time - )values( - #{deptId}, - #{userName}, - #{userCode}, - #{nickName}, - #{email}, - #{avatar}, - #{phonenumber}, - #{sex}, - #{password}, - #{status}, - '0', - #{createBy}, - #{remark}, - now() - ) - - - - update sys_user - - dept_id = #{deptId}, - user_name = #{userName}, - nick_name = #{nickName}, - email = #{email}, - phonenumber = #{phonenumber}, - sex = #{sex}, - avatar = #{avatar}, - password = #{password}, - status = #{status}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = now() - - where user_id = #{userId} - - - - update sys_user set status = #{status} where user_id = #{userId} - - - - update sys_user set avatar = #{avatar} where user_name = #{userName} - - - - update sys_user set password = #{password} where user_name = #{userName} - - - - delete from sys_user where user_id = #{userId} - - - - delete from sys_user where user_id in - - #{userId} - - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml deleted file mode 100644 index ea8cf66..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - delete from sys_user_post where user_id=#{userId} - - - - - - delete from sys_user_post where user_id in - - #{userId} - - - - - insert into sys_user_post(user_id, post_id) values - - (#{item.userId},#{item.postId}) - - - - - insert into sys_user_post(user_id, post_id) values (#{userId},#{postId}) - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml deleted file mode 100644 index 631f921..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - delete from sys_user_role where user_id=#{userId} - - - - - - delete from sys_user_role where user_id in - - #{userId} - - - - - insert into sys_user_role(user_id, role_id) values - - (#{item.userId},#{item.roleId}) - - - - - insert into sys_user_role(user_id, role_id) values (#{userId},#{roleId}) - - - - delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} - - - - delete from sys_user_role where role_id=#{roleId} and user_id in - - #{userId} - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/WechatLoginStatusMapper.xml b/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/WechatLoginStatusMapper.xml deleted file mode 100644 index b6f87d3..0000000 --- a/exam-online-api-DEL/ruoyi-system/src/main/resources/mapper/system/WechatLoginStatusMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - select id, qr_code_url, status, user_id, openid, expire_time, create_time, update_time from wechat_login_status - - - - - - - - - - insert into wechat_login_status - - id, - qr_code_url, - status, - user_id, - openid, - expire_time, - create_time, - update_time, - - - #{id}, - #{qrCodeUrl}, - #{status}, - #{userId}, - #{openid}, - #{expireTime}, - #{createTime}, - #{updateTime}, - - - - - update wechat_login_status - - qr_code_url = #{qrCodeUrl}, - status = #{status}, - user_id = #{userId}, - openid = #{openid}, - expire_time = #{expireTime}, - create_time = #{createTime}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from wechat_login_status where id = #{id} - - - - delete from wechat_login_status where id in - - #{id} - - - - - delete from wechat_login_status where expire_time < now() - - - \ No newline at end of file diff --git a/exam-online-api-DEL/ry.bat b/exam-online-api-DEL/ry.bat deleted file mode 100644 index a6ba5a5..0000000 --- a/exam-online-api-DEL/ry.bat +++ /dev/null @@ -1,67 +0,0 @@ -@echo off - -rem jarƽĿ¼ -set AppName=ruoyi-admin.jar - -rem JVM -set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" - - -ECHO. - ECHO. [1] %AppName% - ECHO. [2] ر%AppName% - ECHO. [3] %AppName% - ECHO. [4] ״̬ %AppName% - ECHO. [5] -ECHO. - -ECHO.ѡĿ: -set /p ID= - IF "%id%"=="1" GOTO start - IF "%id%"=="2" GOTO stop - IF "%id%"=="3" GOTO restart - IF "%id%"=="4" GOTO status - IF "%id%"=="5" EXIT -PAUSE -:start - for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( - set pid=%%a - set image_name=%%b - ) - if defined pid ( - echo %%is running - PAUSE - ) - -start javaw -jar %JAVA_OPTS% ruoyi-admin.jar - -echo starting -echo Start %AppName% success... -goto:eof - -rem stopͨjpspid -:stop - for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( - set pid=%%a - set image_name=%%b - ) - if not defined pid (echo process %AppName% does not exists) else ( - echo prepare to kill %image_name% - echo start kill %pid% ... - rem ݽIDkill - taskkill /f /pid %pid% - ) -goto:eof -:restart - call :stop - call :start -goto:eof -:status - for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( - set pid=%%a - set image_name=%%b - ) - if not defined pid (echo process %AppName% is dead ) else ( - echo %image_name% is running - ) -goto:eof \ No newline at end of file diff --git a/exam-online-api-DEL/ry.sh b/exam-online-api-DEL/ry.sh deleted file mode 100644 index 7c4f503..0000000 --- a/exam-online-api-DEL/ry.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# author ruoyi -# ./ry.sh start 启动 -# ./ry.sh stop 停止 -# ./ry.sh restart 重启 -# ./ry.sh status 状态 -AppName=ruoyi-admin.jar - -# JVM参数 -JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" -APP_HOME=`pwd` -LOG_PATH=$APP_HOME/logs/$AppName.log - -if [ "$1" = "" ]; -then - echo -e "\033[0;31m 未输入操作名 \033[0m \033[0;34m {start|stop|restart|status} \033[0m" - exit 1 -fi - -if [ "$AppName" = "" ]; -then - echo -e "\033[0;31m 未输入应用名 \033[0m" - exit 1 -fi - -function start() -{ - PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'` - - if [ x"$PID" != x"" ]; then - echo "$AppName is running..." - else - nohup java -jar $JVM_OPTS target/$AppName > /dev/null 2>&1 & - echo "Start $AppName success..." - fi -} - -function stop() -{ - echo "Stop $AppName" - - PID="" - query(){ - PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'` - } - - query - if [ x"$PID" != x"" ]; then - kill -TERM $PID - echo "$AppName (pid:$PID) exiting..." - while [ x"$PID" != x"" ] - do - sleep 1 - query - done - echo "$AppName exited." - else - echo "$AppName already stopped." - fi -} - -function restart() -{ - stop - sleep 2 - start -} - -function status() -{ - PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l` - if [ $PID != 0 ];then - echo "$AppName is running..." - else - echo "$AppName is not running..." - fi -} - -case $1 in - start) - start;; - stop) - stop;; - restart) - restart;; - status) - status;; - *) - -esac diff --git a/examapi/ruoyi-admin/src/main/resources/application.yml b/examapi/ruoyi-admin/src/main/resources/application.yml index 653cf30..49b8e93 100644 --- a/examapi/ruoyi-admin/src/main/resources/application.yml +++ b/examapi/ruoyi-admin/src/main/resources/application.yml @@ -157,3 +157,20 @@ cms: workflow: file-path: /photo/ueditor +# AI题目生成配置 +ai: + # DeepSeek API配置 + api-url: https://api.deepseek.com/v1/chat/completions + model-name: deepseek-chat + api-key: ${AI_API_KEY:} + connect-timeout: 30 + read-timeout: 60 + write-timeout: 30 + + # OpenRouter API配置 + openrouter: + api-url: https://openrouter.ai/api/v1/chat/completions + model-name: openai/gpt-oss-20b:free # 使用有效的免费模型 + api-key: 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 + enabled: true + diff --git a/examapi/yanzhu-exam/pom.xml b/examapi/yanzhu-exam/pom.xml index 17ab25e..dc1634f 100644 --- a/examapi/yanzhu-exam/pom.xml +++ b/examapi/yanzhu-exam/pom.xml @@ -181,7 +181,13 @@ org.json json 20231013 - + + + + com.squareup.okhttp3 + okhttp + 4.12.0 + com.ruoyi ruoyi-framework diff --git a/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestion.java b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestion.java new file mode 100644 index 0000000..7c7600d --- /dev/null +++ b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestion.java @@ -0,0 +1,233 @@ +package com.yanzhu.exam.ai; + +import java.util.Date; +import java.util.List; + +/** + * AI题目实体类 + * 用于表示AI生成的各种类型的题目 + */ +public class AIQuestion { + // 题目ID + private Long id; + + // 题目类型 + private String type; + + // 题目内容 + private String content; + + // 选项内容（选择题专用） + private List options; + + // 答案 + private String answer; + + // 答案要点（简答题专用） + private List answerPoints; + + // 答题思路（论述题专用） + private String thinkingApproach; + + // 评分标准（论述题专用） + private String scoringCriteria; + + // 题目解析 + private String explanation; + + // 难度等级 + private String difficulty; + + // 关联知识点 + private String knowledgePoint; + + // 关键词 + private String keywords; + + // 题目方向 + private String direction; + + // 适合学段 + private String gradeLevel; + + // 是否AI生成 + private Boolean aiGenerated = true; + + // 创建者ID + private Long creatorId; + + // 创建时间 + private Date createdAt; + + // 更新时间 + private Date updatedAt; + + // Getters and Setters + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public List getOptions() { + return options; + } + + public void setOptions(List options) { + this.options = options; + } + + public String getAnswer() { + return answer; + } + + public void setAnswer(String answer) { + this.answer = answer; + } + + public List getAnswerPoints() { + return answerPoints; + } + + public void setAnswerPoints(List answerPoints) { + this.answerPoints = answerPoints; + } + + public String getThinkingApproach() { + return thinkingApproach; + } + + public void setThinkingApproach(String thinkingApproach) { + this.thinkingApproach = thinkingApproach; + } + + public String getScoringCriteria() { + return scoringCriteria; + } + + public void setScoringCriteria(String scoringCriteria) { + this.scoringCriteria = scoringCriteria; + } + + public String getExplanation() { + return explanation; + } + + public void setExplanation(String explanation) { + this.explanation = explanation; + } + + public String getDifficulty() { + return difficulty; + } + + public void setDifficulty(String difficulty) { + this.difficulty = difficulty; + } + + public String getKnowledgePoint() { + return knowledgePoint; + } + + public void setKnowledgePoint(String knowledgePoint) { + this.knowledgePoint = knowledgePoint; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getGradeLevel() { + return gradeLevel; + } + + public void setGradeLevel(String gradeLevel) { + this.gradeLevel = gradeLevel; + } + + public Boolean getAiGenerated() { + return aiGenerated; + } + + public void setAiGenerated(Boolean aiGenerated) { + this.aiGenerated = aiGenerated; + } + + public Long getCreatorId() { + return creatorId; + } + + public void setCreatorId(Long creatorId) { + this.creatorId = creatorId; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + @Override + public String toString() { + return "AIQuestion{" + + "id=" + id + + ", type='" + type + '\'' + + ", content='" + content + '\'' + + ", options=" + options + + ", answer='" + answer + '\'' + + ", answerPoints=" + answerPoints + + ", thinkingApproach='" + thinkingApproach + '\'' + + ", scoringCriteria='" + scoringCriteria + '\'' + + ", explanation='" + explanation + '\'' + + ", difficulty='" + difficulty + '\'' + + ", knowledgePoint='" + knowledgePoint + '\'' + + ", keywords='" + keywords + '\'' + + ", direction='" + direction + '\'' + + ", gradeLevel='" + gradeLevel + '\'' + + ", aiGenerated=" + aiGenerated + + ", creatorId=" + creatorId + + ", createdAt=" + createdAt + + ", updatedAt=" + updatedAt + + '}'; + } +} \ No newline at end of file diff --git a/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestionController.java b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestionController.java new file mode 100644 index 0000000..f5863d3 --- /dev/null +++ b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestionController.java @@ -0,0 +1,419 @@ +package com.yanzhu.exam.ai; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.framework.web.service.TokenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.List; + +/** + * AI题目生成控制器 + * 提供RESTful API接口用于生成各类题目 + */ +@RestController +@RequestMapping("/ai/questions") +public class AIQuestionController extends BaseController { + + @Autowired + private AIQuestionService aiQuestionService; + + @Autowired + private TokenService tokenService; + + /** + * 生成选择题 + */ + @PreAuthorize("@ss.hasPermi('ai:questions:generate')") + @PostMapping("/choice") + public AjaxResult generateChoiceQuestion(@RequestBody ChoiceQuestionRequest request) { + try { + AIQuestion question = aiQuestionService.generateChoiceQuestion( + request.getKnowledgePoint(), + request.getKeywords(), + request.getDifficulty(), + request.getDirection(), + request.getGradeLevel(), + request.getMultiple() + ); + return AjaxResult.success(question); + } catch (IOException e) { + return AjaxResult.error("API调用失败: " + e.getMessage()); + } catch (Exception e) { + return AjaxResult.error("题目生成失败: " + e.getMessage()); + } + } + + /** + * 生成简答题 + */ + @PreAuthorize("@ss.hasPermi('ai:questions:generate')") + @PostMapping("/short-answer") + public AjaxResult generateShortAnswerQuestion(@RequestBody ShortAnswerQuestionRequest request) { + try { + AIQuestion question = aiQuestionService.generateShortAnswerQuestion( + request.getKnowledgePoint(), + request.getKeywords(), + request.getDifficulty(), + request.getDirection(), + request.getGradeLevel() + ); + return AjaxResult.success(question); + } catch (IOException e) { + e.printStackTrace(); + return AjaxResult.error("API调用失败: " + e.getMessage()); + } catch (Exception e) { + e.printStackTrace(); + return AjaxResult.error("题目生成失败: " + e.getMessage()); + } + } + + /** + * 生成论述题 + */ + @PreAuthorize("@ss.hasPermi('ai:questions:generate')") + @PostMapping("/essay") + public AjaxResult generateEssayQuestion(@RequestBody EssayQuestionRequest request) { + try { + AIQuestion question = aiQuestionService.generateEssayQuestion( + request.getKnowledgePoint(), + request.getKeywords(), + request.getDifficulty(), + request.getDirection(), + request.getGradeLevel() + ); + return AjaxResult.success(question); + } catch (IOException e) { + return AjaxResult.error("API调用失败: " + e.getMessage()); + } catch (Exception e) { + return AjaxResult.error("题目生成失败: " + e.getMessage()); + } + } + + /** + * 批量生成题目 + */ + @PreAuthorize("@ss.hasPermi('ai:questions:generate')") + @PostMapping("/batch") + public AjaxResult generateBatchQuestions(@RequestBody BatchQuestionRequest request, HttpServletRequest httpRequest) { + try { + List questions = aiQuestionService.generateBatchQuestions( + request.getQuestionType(), + request.getCount(), + request.getKnowledgePoint(), + request.getKeywords(), + request.getDifficulty(), + request.getDirection(), + request.getGradeLevel(), + request.getMultiple() + ); + return AjaxResult.success(questions); + } catch (IOException e) { + return AjaxResult.error("API调用失败: " + e.getMessage()); + } catch (Exception e) { + return AjaxResult.error("题目生成失败: " + e.getMessage()); + } + } + + /** + * 保存AI生成的题目到题库 + */ + @PreAuthorize("@ss.hasPermi('ai:questions:save')") + @PostMapping("/save") + public AjaxResult saveAIQuestions(@RequestBody SaveQuestionsRequest request, HttpServletRequest httpRequest) { + try { + // 获取当前登录用户 + LoginUser loginUser = tokenService.getLoginUser(httpRequest); + String creator = loginUser.getUser().getUserName(); + + // 保存题目到数据库 + boolean success = aiQuestionService.saveAIQuestionsToDatabase( + request.getQuestions(), + request.getBankCode(), + creator + ); + + if (success) { + return AjaxResult.success("题目保存成功"); + } else { + return AjaxResult.error("题目保存失败"); + } + } catch (Exception e) { + return AjaxResult.error("题目保存失败: " + e.getMessage()); + } + } + + /** + * 选择题生成请求参数 + */ + public static class ChoiceQuestionRequest { + private String knowledgePoint; + private String keywords; + private String difficulty; + private String direction; + private String gradeLevel; + private boolean multiple; + + // Getters and Setters + public String getKnowledgePoint() { + return knowledgePoint; + } + + public void setKnowledgePoint(String knowledgePoint) { + this.knowledgePoint = knowledgePoint; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } + + public String getDifficulty() { + return difficulty; + } + + public void setDifficulty(String difficulty) { + this.difficulty = difficulty; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getGradeLevel() { + return gradeLevel; + } + + public void setGradeLevel(String gradeLevel) { + this.gradeLevel = gradeLevel; + } + + public boolean getMultiple() { + return multiple; + } + + public void setMultiple(boolean multiple) { + this.multiple = multiple; + } + } + + /** + * 简答题生成请求参数 + */ + public static class ShortAnswerQuestionRequest { + private String knowledgePoint; + private String keywords; + private String difficulty; + private String direction; + private String gradeLevel; + + // Getters and Setters + public String getKnowledgePoint() { + return knowledgePoint; + } + + public void setKnowledgePoint(String knowledgePoint) { + this.knowledgePoint = knowledgePoint; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } + + public String getDifficulty() { + return difficulty; + } + + public void setDifficulty(String difficulty) { + this.difficulty = difficulty; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getGradeLevel() { + return gradeLevel; + } + + public void setGradeLevel(String gradeLevel) { + this.gradeLevel = gradeLevel; + } + } + + /** + * 论述题生成请求参数 + */ + public static class EssayQuestionRequest { + private String knowledgePoint; + private String keywords; + private String difficulty; + private String direction; + private String gradeLevel; + + // Getters and Setters + public String getKnowledgePoint() { + return knowledgePoint; + } + + public void setKnowledgePoint(String knowledgePoint) { + this.knowledgePoint = knowledgePoint; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } + + public String getDifficulty() { + return difficulty; + } + + public void setDifficulty(String difficulty) { + this.difficulty = difficulty; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getGradeLevel() { + return gradeLevel; + } + + public void setGradeLevel(String gradeLevel) { + this.gradeLevel = gradeLevel; + } + } + + /** + * 批量生成题目请求参数 + */ + public static class BatchQuestionRequest { + private String questionType; + private int count; + private String knowledgePoint; + private String keywords; + private String difficulty; + private String direction; + private String gradeLevel; + private boolean multiple; + + // Getters and Setters + public String getQuestionType() { + return questionType; + } + + public void setQuestionType(String questionType) { + this.questionType = questionType; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + public String getKnowledgePoint() { + return knowledgePoint; + } + + public void setKnowledgePoint(String knowledgePoint) { + this.knowledgePoint = knowledgePoint; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } + + public String getDifficulty() { + return difficulty; + } + + public void setDifficulty(String difficulty) { + this.difficulty = difficulty; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getGradeLevel() { + return gradeLevel; + } + + public void setGradeLevel(String gradeLevel) { + this.gradeLevel = gradeLevel; + } + + public boolean getMultiple() { + return multiple; + } + + public void setMultiple(boolean multiple) { + this.multiple = multiple; + } + } + + /** + * 保存题目请求参数 + */ + public static class SaveQuestionsRequest { + private List questions; + private String bankCode; + + // Getters and Setters + public List getQuestions() { + return questions; + } + + public void setQuestions(List questions) { + this.questions = questions; + } + + public String getBankCode() { + return bankCode; + } + + public void setBankCode(String bankCode) { + this.bankCode = bankCode; + } + } +} \ No newline at end of file diff --git a/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestionService.java b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestionService.java new file mode 100644 index 0000000..298bb4c --- /dev/null +++ b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/AIQuestionService.java @@ -0,0 +1,491 @@ +package com.yanzhu.exam.ai; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.yanzhu.exam.ai.utils.AIQuestionConverter; +import com.yanzhu.exam.questions.domain.ExamQuestions; +import com.yanzhu.exam.questions.domain.ExamQuestionsAnswer; +import com.yanzhu.exam.questions.domain.ExamQuestionsContent; +import com.yanzhu.exam.questions.domain.ExamQuestionsProperty; +import com.yanzhu.exam.questions.service.IExamQuestionsAnswerService; +import com.yanzhu.exam.questions.service.IExamQuestionsContentService; +import com.yanzhu.exam.questions.service.IExamQuestionsPropertyService; +import okhttp3.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * AI题目生成服务 + * 提供调用AI API生成各类题目的功能 + */ +@Service +public class AIQuestionService { + + @Value("${ai.api-url:https://api.deepseek.com/v1/chat/completions}") + private String apiUrl; + + @Value("${ai.model-name:deepseek-chat}") + private String modelName; + + @Value("${ai.api-key:}") + private String apiKey; + + @Value("${ai.connect-timeout:30}") + private int connectTimeout; + + @Value("${ai.read-timeout:60}") + private int readTimeout; + + @Value("${ai.write-timeout:30}") + private int writeTimeout; + + // OpenRouter配置 + @Value("${ai.openrouter.api-url:https://openrouter.ai/api/v1/chat/completions}") + private String openrouterApiUrl; + + @Value("${ai.openrouter.model-name:deepseek/deepseek-v3-0324-free}") + private String openrouterModelName; + + @Value("${ai.openrouter.api-key:}") + private String openrouterApiKey; + + @Value("${ai.openrouter.enabled:false}") + private boolean openrouterEnabled; + + @Autowired + private IExamQuestionsPropertyService examQuestionsPropertyService; + + @Autowired + private IExamQuestionsContentService examQuestionsContentService; + + @Autowired + private IExamQuestionsAnswerService examQuestionsAnswerService; + + private OkHttpClient client; + + @PostConstruct + public void init() { + this.client = new OkHttpClient.Builder() + .connectTimeout(connectTimeout, TimeUnit.SECONDS) + .readTimeout(readTimeout, TimeUnit.SECONDS) + .writeTimeout(writeTimeout, TimeUnit.SECONDS) + .build(); + } + + @PreDestroy + public void destroy() { + if (client != null) { + client.dispatcher().executorService().shutdown(); + client.connectionPool().evictAll(); + } + } + + /** + * 生成选择题 + * @param knowledgePoint 知识点范围 + * @param keywords 关键词 + * @param difficulty 难易程度 + * @param direction 题目方向 + * @param gradeLevel 适合学段 + * @param isMultiple 是否为多选题 + * @return 生成的题目对象 + * @throws IOException API调用异常 + */ + public AIQuestion generateChoiceQuestion(String knowledgePoint, String keywords, String difficulty, String direction, String gradeLevel, boolean isMultiple) throws IOException { + String prompt = buildChoiceQuestionPrompt(knowledgePoint, keywords, difficulty, direction, gradeLevel, isMultiple); + double temperature = isMultiple ? 0.8 : 0.7; + + JSONObject result = callAIAPI(prompt, temperature); + return parseChoiceQuestion(result, isMultiple); + } + + /** + * 生成简答题 + * @param knowledgePoint 知识点范围 + * @param keywords 关键词 + * @param difficulty 难易程度 + * @param direction 题目方向 + * @param gradeLevel 适合学段 + * @return 生成的题目对象 + * @throws IOException API调用异常 + */ + public AIQuestion generateShortAnswerQuestion(String knowledgePoint, String keywords, String difficulty, String direction, String gradeLevel) throws IOException { + String prompt = buildShortAnswerQuestionPrompt(knowledgePoint, keywords, difficulty, direction, gradeLevel); + JSONObject result = callAIAPI(prompt, 0.7); + return parseShortAnswerQuestion(result); + } + + /** + * 生成论述题 + * @param knowledgePoint 知识点范围 + * @param keywords 关键词 + * @param difficulty 难易程度 + * @param direction 题目方向 + * @param gradeLevel 适合学段 + * @return 生成的题目对象 + * @throws IOException API调用异常 + */ + public AIQuestion generateEssayQuestion(String knowledgePoint, String keywords, String difficulty, String direction, String gradeLevel) throws IOException { + String prompt = buildEssayQuestionPrompt(knowledgePoint, keywords, difficulty, direction, gradeLevel); + JSONObject result = callAIAPI(prompt, 0.8); + return parseEssayQuestion(result); + } + + /** + * 批量生成题目 + * @param questionType 题目类型 + * @param count 题目数量 + * @param knowledgePoint 知识点范围 + * @param keywords 关键词 + * @param difficulty 难易程度 + * @param direction 题目方向 + * @param gradeLevel 适合学段 + * @param isMultiple 是否为多选题（仅对选择题有效） + * @return 生成的题目列表 + * @throws IOException API调用异常 + */ + public List generateBatchQuestions(String questionType, int count, String knowledgePoint, String keywords, + String difficulty, String direction, String gradeLevel, boolean isMultiple) throws IOException { + List questions = new ArrayList<>(); + int attempts = 0; // 尝试次数 + int maxAttempts = count * 2; // 最大尝试次数，防止无限循环 + + while (questions.size() < count && attempts < maxAttempts) { + attempts++; + try { + AIQuestion question = null; + + switch (questionType) { + case "choice": + question = generateChoiceQuestion(knowledgePoint, keywords, difficulty, direction, gradeLevel, isMultiple); + break; + case "short-answer": + question = generateShortAnswerQuestion(knowledgePoint, keywords, difficulty, direction, gradeLevel); + break; + case "essay": + question = generateEssayQuestion(knowledgePoint, keywords, difficulty, direction, gradeLevel); + break; + } + + if (question != null) { + questions.add(question); + System.out.println("成功生成第 " + questions.size() + " 道题目"); + } + } catch (Exception e) { + // 记录错误但继续生成其他题目 + System.err.println("生成第 " + attempts + " 道题目时出错: " + e.getMessage()); + System.err.println("将继续生成其他题目以确保总数达到 " + count); + // 不抛出异常，继续下一次循环 + } + } + + // 如果尝试次数达到了上限但仍然没有生成足够的题目，记录警告 + if (questions.size() < count) { + System.err.println("警告: 尝试生成 " + count + " 道题目，但只成功生成了 " + questions.size() + " 道题目"); + } + + return questions; + } + + /** + * 构建选择题提示词 + */ + private String buildChoiceQuestionPrompt(String knowledgePoint, String keywords, String difficulty, String direction, String gradeLevel, boolean isMultiple) { + StringBuilder prompt = new StringBuilder(); + prompt.append("你是一位专业的思政教育专家，请根据以下要求生成题目：\n\n"); + prompt.append("知识点范围：").append(knowledgePoint).append("\n"); + if (keywords != null && !keywords.isEmpty()) { + prompt.append("关键词：").append(keywords).append("\n"); + } + prompt.append("难易程度：").append(difficulty).append("\n"); + prompt.append("题目方向：").append(direction).append("\n"); + prompt.append("适合学段：").append(gradeLevel).append("\n"); + prompt.append("题目类型：").append(isMultiple ? "多选题" : "单选题").append("\n\n"); + prompt.append("请按照以下JSON格式返回：\n"); + prompt.append("{\n"); + prompt.append(" \"type\": \"").append(isMultiple ? "multiple_choice" : "single_choice").append("\",\n"); + prompt.append(" \"question\": \"题目内容\",\n"); + prompt.append(" \"options\": [\"选项A\", \"选项B\", \"选项C\", \"选项D\"],\n"); + prompt.append(" \"answer\": \"").append(isMultiple ? "正确选项列表，如[\"A\",\"B\"]" : "正确选项，如\"A\"").append("\",\n"); + prompt.append(" \"explanation\": \"题目解析\"\n"); + prompt.append("}"); + + return prompt.toString(); + } + + /** + * 构建简答题提示词 + */ + private String buildShortAnswerQuestionPrompt(String knowledgePoint, String keywords, String difficulty, String direction, String gradeLevel) { + StringBuilder prompt = new StringBuilder(); + prompt.append("你是一位专业的思政教育专家，请根据以下要求生成题目：\n\n"); + prompt.append("知识点范围：").append(knowledgePoint).append("\n"); + if (keywords != null && !keywords.isEmpty()) { + prompt.append("关键词：").append(keywords).append("\n"); + } + prompt.append("难易程度：").append(difficulty).append("\n"); + prompt.append("题目方向：").append(direction).append("\n"); + prompt.append("适合学段：").append(gradeLevel).append("\n"); + prompt.append("题目类型：简答题\n\n"); + prompt.append("请按照以下JSON格式返回：\n"); + prompt.append("{\n"); + prompt.append(" \"type\": \"short_answer\",\n"); + prompt.append(" \"question\": \"题目内容\",\n"); + prompt.append(" \"answer_points\": [\"答案要点1\", \"答案要点2\", \"答案要点3\"],\n"); + prompt.append(" \"explanation\": \"题目解析\"\n"); + prompt.append("}"); + + return prompt.toString(); + } + + /** + * 构建论述题提示词 + */ + private String buildEssayQuestionPrompt(String knowledgePoint, String keywords, String difficulty, String direction, String gradeLevel) { + StringBuilder prompt = new StringBuilder(); + prompt.append("你是一位专业的思政教育专家，请根据以下要求生成题目：\n\n"); + prompt.append("知识点范围：").append(knowledgePoint).append("\n"); + if (keywords != null && !keywords.isEmpty()) { + prompt.append("关键词：").append(keywords).append("\n"); + } + prompt.append("难易程度：").append(difficulty).append("\n"); + prompt.append("题目方向：").append(direction).append("\n"); + prompt.append("适合学段：").append(gradeLevel).append("\n"); + prompt.append("题目类型：论述题\n\n"); + prompt.append("请按照以下JSON格式返回：\n"); + prompt.append("{\n"); + prompt.append(" \"type\": \"essay\",\n"); + prompt.append(" \"question\": \"题目内容\",\n"); + prompt.append(" \"thinking_approach\": \"答题思路\",\n"); + prompt.append(" \"scoring_criteria\": \"评分标准\",\n"); + prompt.append(" \"explanation\": \"题目解析\"\n"); + prompt.append("}"); + + return prompt.toString(); + } + + /** + * 调用AI API + */ + private JSONObject callAIAPI(String prompt, double temperature) throws IOException { + // 最大重试次数 + int maxRetries = 3; + // 初始等待时间（毫秒） + int waitTime = 1000; + + for (int attempt = 0; attempt <= maxRetries; attempt++) { + try { + // 构建系统消息 + JSONObject systemMessage = new JSONObject(); + systemMessage.put("role", "system"); + systemMessage.put("content", "你是一位专业的思政教育专家，擅长根据指定要求生成高质量的题目。"); + + // 构建用户消息 + JSONObject userMessage = new JSONObject(); + userMessage.put("role", "user"); + userMessage.put("content", prompt); + + // 构建请求体 + JSONObject requestBody = new JSONObject(); + requestBody.put("model", modelName); + requestBody.put("messages", new JSONObject[]{systemMessage, userMessage}); + requestBody.put("temperature", temperature); + + // 确定使用的API URL和密钥 + String url = openrouterEnabled ? openrouterApiUrl : apiUrl; + String model = openrouterEnabled ? openrouterModelName : modelName; + String key = openrouterEnabled ? openrouterApiKey : apiKey; + + // 更新请求体中的模型名称 + requestBody.put("model", model); + + // 打印请求信息用于调试 + System.out.println("发送API请求到: " + url); + System.out.println("请求体: " + requestBody.toJSONString()); + System.out.println("使用的API密钥: " + (key != null && key.length() > 10 ? key.substring(0, 10) + "..." : "无效密钥")); + + // 创建请求 + Request request = new Request.Builder() + .url(url) + .post(RequestBody.create(MediaType.get("application/json"), requestBody.toJSONString())) + .addHeader("Authorization", "Bearer " + key) + .addHeader("Content-Type", "application/json") + .addHeader("HTTP-Referer", "https://kyvtc.edu.cn") // OpenRouter需要此头部 + .addHeader("X-Title", "Ideological and Political Education System") // OpenRouter需要此头部 + .build(); + + // 执行请求 + try (Response response = client.newCall(request).execute()) { + // 打印响应状态码和消息用于调试 + System.out.println("API响应状态码: " + response.code()); + System.out.println("API响应消息: " + response.message()); + + if (!response.isSuccessful()) { + // 读取错误响应体 + String errorBody = ""; + if (response.body() != null) { + errorBody = response.body().string(); + System.out.println("API错误响应体: " + errorBody); + } + + // 检查是否是速率限制错误(429) + if (response.code() == 429) { + if (attempt < maxRetries) { + System.out.println("遇到速率限制(429)，将在 " + waitTime + " 毫秒后进行第 " + (attempt + 1) + " 次重试..."); + Thread.sleep(waitTime); + waitTime *= 2; // 指数退避 + continue; // 重试 + } else { + throw new IOException("API调用失败: 达到最大重试次数，仍然遇到速率限制(429) - 错误详情: " + errorBody); + } + } + + throw new IOException("API调用失败: " + response.code() + " " + response.message() + " - 错误详情: " + errorBody); + } + + ResponseBody responseBody = response.body(); + if (responseBody == null) { + throw new IOException("API响应为空"); + } + + String responseStr = responseBody.string(); + + // 记录响应内容用于调试 + System.out.println("API响应内容: " + responseStr); + + JSONObject responseJson = JSON.parseObject(responseStr); + + // 检查响应结构 + if (!responseJson.containsKey("choices") || responseJson.getJSONArray("choices").isEmpty()) { + throw new IOException("API响应格式不正确: 缺少choices字段或为空"); + } + + // 提取生成的题目内容 + String questionContent = responseJson.getJSONArray("choices") + .getJSONObject(0) + .getJSONObject("message") + .getString("content"); + + // 解析题目JSON + return JSON.parseObject(questionContent); + } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException("API调用被中断", e); + } catch (Exception e) { + System.out.println("API调用异常: " + e.getMessage()); + if (attempt < maxRetries) { + System.out.println("将在 " + waitTime + " 毫秒后进行第 " + (attempt + 1) + " 次重试..."); + try { + Thread.sleep(waitTime); + waitTime *= 2; // 指数退避 + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + throw new IOException("重试过程中被中断", ie); + } + } else { + e.printStackTrace(); + throw e; + } + } + } + + throw new IOException("API调用失败: 达到最大重试次数"); + } + + /** + * 解析选择题结果 + */ + private AIQuestion parseChoiceQuestion(JSONObject result, boolean isMultiple) { + AIQuestion question = new AIQuestion(); + question.setType(isMultiple ? "multiple_choice" : "single_choice"); + question.setContent(result.getString("question")); + question.setOptions(result.getJSONArray("options").toJavaList(String.class)); + question.setAnswer(result.getString("answer")); + question.setExplanation(result.getString("explanation")); + return question; + } + + /** + * 解析简答题结果 + */ + private AIQuestion parseShortAnswerQuestion(JSONObject result) { + AIQuestion question = new AIQuestion(); + question.setType("short_answer"); + question.setContent(result.getString("question")); + question.setAnswerPoints(result.getJSONArray("answer_points").toJavaList(String.class)); + question.setExplanation(result.getString("explanation")); + return question; + } + + /** + * 解析论述题结果 + */ + private AIQuestion parseEssayQuestion(JSONObject result) { + AIQuestion question = new AIQuestion(); + question.setType("essay"); + question.setContent(result.getString("question")); + question.setThinkingApproach(result.getString("thinking_approach")); + question.setScoringCriteria(result.getString("scoring_criteria")); + question.setExplanation(result.getString("explanation")); + return question; + } + + /** + * 保存AI生成的题目到数据库 + * @param aiQuestion AI生成的题目 + * @param bankCode 题库代码 + * @param creator 创建者 + * @return 是否保存成功 + */ + public boolean saveAIQuestionToDatabase(AIQuestion aiQuestion, String bankCode, String creator) { + try { + // 转换为系统题目对象 + ExamQuestionsProperty property = AIQuestionConverter.convertToExamQuestionsProperty(aiQuestion, bankCode, creator); + ExamQuestionsContent content = AIQuestionConverter.convertToExamQuestionsContent(aiQuestion); + List answerList = AIQuestionConverter.convertToExamQuestionsAnswerList(aiQuestion); + + // 保存题目属性 + examQuestionsPropertyService.insertExamQuestionsProperty(property); + + // 保存题目内容 + examQuestionsContentService.insertExamQuestionsContent(content); + + // 保存题目答案 + for (ExamQuestionsAnswer answer : answerList) { + answer.setQuestionsCode(property.getQuestionsCode()); + examQuestionsAnswerService.insertExamQuestionsAnswer(answer); + } + + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 批量保存AI生成的题目到数据库 + * @param aiQuestions AI生成的题目列表 + * @param bankCode 题库代码 + * @param creator 创建者 + * @return 是否保存成功 + */ + public boolean saveAIQuestionsToDatabase(List aiQuestions, String bankCode, String creator) { + boolean success = true; + for (AIQuestion aiQuestion : aiQuestions) { + if (!saveAIQuestionToDatabase(aiQuestion, bankCode, creator)) { + success = false; + } + } + return success; + } +} \ No newline at end of file diff --git a/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/config/AIConfig.java b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/config/AIConfig.java new file mode 100644 index 0000000..9aabee0 --- /dev/null +++ b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/config/AIConfig.java @@ -0,0 +1,20 @@ +package com.yanzhu.exam.ai.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * AI模块配置类 + */ +@Configuration +public class AIConfig implements WebMvcConfigurer { + + /** + * 静态资源处理器 + */ + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + // 可以在这里添加静态资源映射 + } +} \ No newline at end of file diff --git a/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/utils/AIQuestionConverter.java b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/utils/AIQuestionConverter.java new file mode 100644 index 0000000..ff70524 --- /dev/null +++ b/examapi/yanzhu-exam/src/main/java/com/yanzhu/exam/ai/utils/AIQuestionConverter.java @@ -0,0 +1,129 @@ +package com.yanzhu.exam.ai.utils; + +import com.yanzhu.exam.ai.AIQuestion; +import com.yanzhu.exam.questions.domain.ExamQuestions; +import com.yanzhu.exam.questions.domain.ExamQuestionsAnswer; +import com.yanzhu.exam.questions.domain.ExamQuestionsContent; +import com.yanzhu.exam.questions.domain.ExamQuestionsProperty; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * AI题目转换工具类 + * 用于将AI生成的题目转换为系统题目格式 + */ +public class AIQuestionConverter { + + /** + * 将AI题目转换为系统题目 + * @param aiQuestion AI生成的题目 + * @param bankCode 题库代码 + * @param creator 创建者 + * @return 系统题目对象 + */ + public static ExamQuestions convertToExamQuestions(AIQuestion aiQuestion, String bankCode, String creator) { + ExamQuestions examQuestions = new ExamQuestions(); + + // 设置基本信息 + examQuestions.setBankCode(bankCode); + examQuestions.setQuestionsCode(UUID.randomUUID().toString()); + examQuestions.setQuestionsTitle(aiQuestion.getContent()); + examQuestions.setQuestionsType(getQuestionsType(aiQuestion.getType())); + examQuestions.setQuestionsScore(10); // 默认分数 + examQuestions.setRateNumber(getRateNumber(aiQuestion.getDifficulty())); + examQuestions.setAnswerAnalyse(aiQuestion.getExplanation()); + examQuestions.setRightAnswer(aiQuestion.getAnswer()); + examQuestions.setCreateBy(creator); + + return examQuestions; + } + + /** + * 将AI题目转换为题目属性 + * @param aiQuestion AI生成的题目 + * @param bankCode 题库代码 + * @param creator 创建者 + * @return 题目属性对象 + */ + public static ExamQuestionsProperty convertToExamQuestionsProperty(AIQuestion aiQuestion, String bankCode, String creator) { + ExamQuestionsProperty property = new ExamQuestionsProperty(); + + // 设置基本信息 + property.setBankCode(bankCode); + property.setQuestionsCode(UUID.randomUUID().toString()); + property.setQuestionsTitle(aiQuestion.getContent()); + property.setQuestionsType(getQuestionsType(aiQuestion.getType())); + property.setQuestionsScore(10); // 默认分数 + property.setRateNumber(getRateNumber(aiQuestion.getDifficulty())); + property.setAnswerAnalyse(aiQuestion.getExplanation()); + property.setRightAnswer(aiQuestion.getAnswer()); + property.setStatus(0); // 默认状态为启用 + property.setCreateBy(creator); + + return property; + } + + /** + * 将AI题目转换为题目内容 + * @param aiQuestion AI生成的题目 + * @return 题目内容对象 + */ + public static ExamQuestionsContent convertToExamQuestionsContent(AIQuestion aiQuestion) { + return new ExamQuestionsContent(UUID.randomUUID().toString(), aiQuestion.getContent()); + } + + /** + * 将AI题目转换为题目答案列表 + * @param aiQuestion AI生成的题目 + * @return 题目答案列表 + */ + public static List convertToExamQuestionsAnswerList(AIQuestion aiQuestion) { + List answerList = new ArrayList<>(); + + if (aiQuestion.getOptions() != null && !aiQuestion.getOptions().isEmpty()) { + // 选择题 + for (int i = 0; i < aiQuestion.getOptions().size(); i++) { + ExamQuestionsAnswer answer = new ExamQuestionsAnswer(); + String optCode = String.valueOf((char) ('A' + i)); // A, B, C, D... + answer.setOptionCode(optCode); + answer.setOptionDescribe(aiQuestion.getOptions().get(i)); + answer.setIsRight(aiQuestion.getAnswer() != null && aiQuestion.getAnswer().contains(optCode) ? 0 : 1); + answer.setOrderId((long) i); + answerList.add(answer); + } + } + + return answerList; + } + + /** + * 根据AI题目类型获取系统题目类型 + * @param aiType AI题目类型 + * @return 系统题目类型 + */ + private static Integer getQuestionsType(String aiType) { + switch (aiType) { + case "single_choice": return 2; // 单选题 + case "multiple_choice": return 3; // 多选题 + case "short_answer": return 4; // 简答题 + case "essay": return 5; // 论述题 + default: return 2; // 默认单选题 + } + } + + /** + * 根据难度获取复杂度等级 + * @param difficulty 难度 + * @return 复杂度等级 + */ + private static Integer getRateNumber(String difficulty) { + switch (difficulty) { + case "simple": return 1; + case "medium": return 2; + case "hard": return 3; + default: return 2; + } + } +} \ No newline at end of file diff --git a/examui/package.json b/examui/package.json index 60bf6fb..6ededcf 100644 --- a/examui/package.json +++ b/examui/package.json @@ -50,6 +50,7 @@ "js-cookie": "^3.0.5", "js-pinyin": "^0.2.7", "jsencrypt": "^3.3.2", + "marked": "^16.2.0", "nprogress": "^0.2.0", "quill": "^1.3.7", "screenfull": "^5.2.0", diff --git a/examui/src/api/ai/questions.js b/examui/src/api/ai/questions.js new file mode 100644 index 0000000..b12aaca --- /dev/null +++ b/examui/src/api/ai/questions.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +// 生成选择题 +export function generateChoiceQuestion(data) { + return request({ + url: '/ai/questions/choice', + method: 'post', + data: data + }) +} + +// 生成简答题 +export function generateShortAnswerQuestion(data) { + return request({ + url: '/ai/questions/short-answer', + method: 'post', + data: data + }) +} + +// 生成论述题 +export function generateEssayQuestion(data) { + return request({ + url: '/ai/questions/essay', + method: 'post', + data: data + }) +} + +// 批量生成题目 +export function generateBatchQuestions(data) { + return request({ + url: '/ai/questions/batch', + method: 'post', + data: data + }) +} + +// 保存AI生成的题目 +export function saveAIQuestions(data) { + return request({ + url: '/ai/questions/save', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/examui/src/router/index.js b/examui/src/router/index.js index 2751a1e..3100d88 100644 --- a/examui/src/router/index.js +++ b/examui/src/router/index.js @@ -3,6 +3,9 @@ import Router from 'vue-router' Vue.use(Router) +// 引入题库管理路由 +import questionsRouter from './modules/questions' + /* Layout */ import Layout from '@/layout' import ParentView from '@/components/ParentView'; diff --git a/examui/src/router/modules/questions.js b/examui/src/router/modules/questions.js new file mode 100644 index 0000000..bdf44d0 --- /dev/null +++ b/examui/src/router/modules/questions.js @@ -0,0 +1,34 @@ +import Layout from '@/layout' + +const questionsRouter = { + path: '/questions', + component: Layout, + redirect: '/questions/questionsbank', + name: 'Questions', + meta: { + title: '题库管理', + icon: 'edit' + }, + children: [ + { + path: 'questionsbank', + component: () => import('@/views/questions/questionsbank'), + name: 'QuestionsBank', + meta: { title: '题库管理', icon: 'bank' } + }, + { + path: 'examquestions', + component: () => import('@/views/questions/examquestions'), + name: 'ExamQuestions', + meta: { title: '题目管理', icon: 'question' } + }, + { + path: 'ai/generator', + component: () => import('@/views/questions/ai/AIQuestionGenerator'), + name: 'AIQuestionGenerator', + meta: { title: 'AI题目生成', icon: 'magic' } + } + ] +} + +export default questionsRouter \ No newline at end of file diff --git a/examui/src/store/modules/user.js b/examui/src/store/modules/user.js index f038d87..ea51193 100644 --- a/examui/src/store/modules/user.js +++ b/examui/src/store/modules/user.js @@ -60,9 +60,8 @@ const user = { GetInfo({ commit, state }) { return new Promise((resolve, reject) => { getInfo().then(res => { - // console.log('res:' + JSON.stringify(res)) const user = res.user - const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; + const avatar = !user.avatar ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) diff --git a/examui/src/utils/request.js b/examui/src/utils/request.js index 75ac5cf..147fcdb 100644 --- a/examui/src/utils/request.js +++ b/examui/src/utils/request.js @@ -30,7 +30,7 @@ service.interceptors.request.use(config => { for (const propName of Object.keys(config.params)) { const value = config.params[propName]; var part = encodeURIComponent(propName) + "="; - if (value !== null && typeof(value) !== "undefined") { + if (value !== null && typeof (value) !== "undefined") { if (typeof value === 'object') { for (const key of Object.keys(value)) { let params = propName + '[' + key + ']'; @@ -48,42 +48,47 @@ service.interceptors.request.use(config => { } return config }, error => { - console.log(error) - Promise.reject(error) + console.log(error) + Promise.reject(error) }) // 响应拦截器 service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - if (code === 401) { - MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('LogOut').then(() => { - location.href = '/examui/'; - }) - }).catch(() => {}); - } else if (code === 500) { + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + if (code === 401) { + MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('LogOut').then(() => { + location.href = '/examui/'; + }) + }).catch(() => { }); + } else if (code === 500) { + if (!window.isGenerating) { Message({ message: msg, type: 'error' }) - return Promise.reject(new Error(msg)) - } else if (code !== 200 && code < 100000) { + } + + return Promise.reject(new Error(msg)) + } else if (code !== 200 && code < 100000) { + if (!window.isGenerating) { Notification.error({ title: msg }) - return Promise.reject('error') - } else { - return res.data } - }, + return Promise.reject('error') + } else { + return res.data + } +}, error => { console.log('err' + error) let { message } = error; @@ -96,11 +101,13 @@ service.interceptors.response.use(res => { else if (message.includes("Request failed with status code")) { message = "系统接口" + message.substr(message.length - 3) + "异常"; } - Message({ - message: message, - type: 'error', - duration: 5 * 1000 - }) + if (!window.isGenerating) { + Message({ + message: message, + type: 'error', + duration: 5 * 1000 + }) + } return Promise.reject(error) } ) diff --git a/examui/src/views/questions/ai/AIQuestionGenerator.vue b/examui/src/views/questions/ai/AIQuestionGenerator.vue new file mode 100644 index 0000000..55e2dfc --- /dev/null +++ b/examui/src/views/questions/ai/AIQuestionGenerator.vue @@ -0,0 +1,571 @@ + + + + + \ No newline at end of file diff --git a/examui/src/views/questions/questionsbank/detailEdit.vue b/examui/src/views/questions/questionsbank/detailEdit.vue index af5c74a..9e81751 100644 --- a/examui/src/views/questions/questionsbank/detailEdit.vue +++ b/examui/src/views/questions/questionsbank/detailEdit.vue @@ -21,7 +21,14 @@ icon="el-icon-check" size="mini" @click="onSave" - >保存 + >保存 + AI生成题目

@@ -186,6 +193,28 @@ export default { }); }, methods: { + init_data (row) { + if (row === undefined) { + this.isNew = true + this.dataForm.radioScore = 2 + this.dataForm.choiceScore = 5 + this.dataForm.judgeScore = 2 + this.dataForm.onlineDate = new Date() + this.dataForm.status = 0 + this.dataForm.bankCode = newGuid() + this.newCode = this.dataForm.bankCode + } else { + this.dataForm = row + } + }, + + openAIQuestionGenerator() { + // 打开AI题目生成器 + this.$router.push({ + path: '/questions/ai/generator', + query: { bankCode: this.dataForm.bankCode } + }); + }, init_data (row) { if (row === undefined) { this.isNew = true