huertian/jinduguanli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 统一使用秒级时间戳，优化代码格式

Browse Source
This commit is contained in:
Hvemi_han
2024-12-20 15:52:26 +08:00
parent d1aafdae85
commit 2ac66ed9eb
2 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
API文档.md
View File

@ -157,8 +157,8 @@
"avatar": null, "avatar": null,
"creatorId": 1, "creatorId": 1,
"status": 1, "status": 1,
"createdAt": 1734498503690, "createdAt": 1734578081,
"updatedAt": 1734498503690, "updatedAt": 1734578081,
"enabled": true, "enabled": true,
"authorities": [ "authorities": [
{ {
@ -194,8 +194,8 @@
"avatar": null, "avatar": null,
"creatorId": 1, "creatorId": 1,
"status": 1, "status": 1,
"createdAt": 1734491549, "createdAt": 1734578081,
"updatedAt": 1734491549 "updatedAt": 1734578081
} }
], ],
"total": 12, "total": 12,
@ -245,14 +245,14 @@
"microLessonName": "Test Lesson", "microLessonName": "Test Lesson",
"userId": 12, "userId": 12,
"progressStatus": 1, "progressStatus": 1,
"scriptUploadTime": 1734498510000, "scriptUploadTime": 1734578081,
"scriptConfirmTime": 1734498510000, "scriptConfirmTime": 1734578081,
"videoCaptureTime": 1734498510000, "videoCaptureTime": 1734578081,
"videoConfirmTime": 1734498510000, "videoConfirmTime": 1734578081,
"finishTime": 1734498510000, "finishTime": 1734578081,
"advise": "Test advice", "advise": "Test advice",
"createdAt": 1734498546322, "createdAt": 1734578081,
"updatedAt": 1734498546322 "updatedAt": 1734578081
} }
], ],
"totalElements": 4, "totalElements": 4,
@ -284,14 +284,14 @@
"microLessonName": "Test Lesson", "microLessonName": "Test Lesson",
"userId": 12, "userId": 12,
"progressStatus": 1, "progressStatus": 1,
"scriptUploadTime": 1734498510000, "scriptUploadTime": 1734578081,
"scriptConfirmTime": 1734498510000, "scriptConfirmTime": 1734578081,
"videoCaptureTime": 1734498510000, "videoCaptureTime": 1734578081,
"videoConfirmTime": 1734498510000, "videoConfirmTime": 1734578081,
"finishTime": 1734498510000, "finishTime": 1734578081,
"advise": "Test advice", "advise": "Test advice",
"createdAt": 1734498546322, "createdAt": 1734578081,
"updatedAt": 1734498546322 "updatedAt": 1734578081
} }
} }
``` ```
@ -327,8 +327,8 @@
"videoConfirmTime": , "videoConfirmTime": ,
"finishTime": , "finishTime": ,
"advise": "请注意讲解速度", "advise": "请注意讲解速度",
"createdAt": 1734498546322, "createdAt": 1734578081,
"updatedAt": 1734498546322 "updatedAt": 1734578081
} }
} }
``` ```
@ -347,11 +347,11 @@
"microLessonName": "Updated Lesson", // 微课名称 "microLessonName": "Updated Lesson", // 微课名称
"userId": 12, // 用户ID "userId": 12, // 用户ID
"progressStatus": 2, // 进度状态 "progressStatus": 2, // 进度状态
"scriptUploadTime": 1734498510000, // 脚本上传时间 "scriptUploadTime": 1734578081, // 脚本上传时间
"scriptConfirmTime": 1734498510000, // 脚本确认时间 "scriptConfirmTime": 1734578081, // 脚本确认时间
"videoCaptureTime": 1734498510000, // 视频录制时间 "videoCaptureTime": 1734578081, // 视频录制时间
"videoConfirmTime": 1734498510000, // 视频确认时间 "videoConfirmTime": 1734578081, // 视频确认时间
"finishTime": 1734498510000, // 完成时间 "finishTime": 1734578081, // 完成时间
"advise": "Updated advice" // 建议 "advise": "Updated advice" // 建议
} }
``` ```
@ -366,14 +366,14 @@
"microLessonName": "Updated Lesson", "microLessonName": "Updated Lesson",
"userId": 12, "userId": 12,
"progressStatus": 2, "progressStatus": 2,
"scriptUploadTime": 1734498510000, "scriptUploadTime": 1734578081,
"scriptConfirmTime": 1734498510000, "scriptConfirmTime": 1734578081,
"videoCaptureTime": 1734498510000, "videoCaptureTime": 1734578081,
"videoConfirmTime": 1734498510000, "videoConfirmTime": 1734578081,
"finishTime": 1734498510000, "finishTime": 1734578081,
"advise": "Updated advice", "advise": "Updated advice",
"createdAt": 1734498546322, "createdAt": 1734578081,
"updatedAt": 1734498586574 "updatedAt": 1734578081
} }
} }
``` ```
@ -394,16 +394,16 @@
} }
``` ```
### 6. 按部门ID查询课程任务 ### 6. 按部门 ID 查询课程任务
- **接口**：`GET /api/lesson-tasks/department/{departmentId}` - **接口**：`GET /api/lesson-tasks/department/{departmentId}`
- **描述**：获取指定部门下正常状态用户的课程任务列表（分页） - **描述**：获取指定部门下正常状态用户的课程任务列表（分页）
- **认证**：需要 - **认证**：需要
- **路径参数**： - **路径参数**：
- `departmentId`: 部门ID - `departmentId`: 部门 ID
- **查询参数**： - **查询参数**：
- `page`: 页码（从1开始） - `page`: 页码（从 1 开始）
- `size`: 每页数量（默认10） - `size`: 每页数量（默认 10）
- **成功响应**： - **成功响应**：
```json ```json
{ {
@ -418,14 +418,14 @@
"userId": 1, "userId": 1,
"username": "教师账号1", // 新增：用户名字段 "username": "教师账号1", // 新增：用户名字段
"progressStatus": 4, "progressStatus": 4,
"scriptUploadTime": 1734498510000, "scriptUploadTime": 1734498510,
"scriptConfirmTime": 1734498510000, "scriptConfirmTime": 1734498510,
"videoCaptureTime": 1734498510000, "videoCaptureTime": 1734498510,
"videoConfirmTime": 1734498510000, "videoConfirmTime": 1734498510,
"finishTime": 1734498510000, "finishTime": 1734498510,
"advise": null, "advise": null,
"createdAt": 1734578081000, "createdAt": 1734578081,
"updatedAt": 1734580393000 "updatedAt": 1734580393
} }
], ],
"totalElements": 10, "totalElements": 10,
@ -445,7 +445,7 @@
- **描述**：更新课程任务的进度状态和建议 - **描述**：更新课程任务的进度状态和建议
- **认证**：需要 - **认证**：需要
- **路径参数**： - **路径参数**：
- `id`: 课程任务ID - `id`: 课程任务 ID
- **请求体**： - **请求体**：
```json ```json
{ {
@ -455,11 +455,11 @@
``` ```
- **说明**： - **说明**：
- 更新进度状态时会自动更新对应的时间戳： - 更新进度状态时会自动更新对应的时间戳：
- 状态1：更新scriptUploadTime - 状态 1：更新 scriptUploadTime
- 状态2：更新scriptConfirmTime - 状态 2：更新 scriptConfirmTime
- 状态3：更新videoCaptureTime - 状态 3：更新 videoCaptureTime
- 状态4：更新videoConfirmTime - 状态 4：更新 videoConfirmTime
- 状态5：更新finishTime - 状态 5：更新 finishTime
- 只会更新请求体中包含的字段，未提供的字段保持不变 - 只会更新请求体中包含的字段，未提供的字段保持不变
- **成功响应**： - **成功响应**：
```json ```json
@ -473,13 +473,13 @@
"userId": 1, "userId": 1,
"progressStatus": 2, "progressStatus": 2,
"scriptUploadTime": null, "scriptUploadTime": null,
"scriptConfirmTime": 1734663755667, "scriptConfirmTime": 1734663755,
"videoCaptureTime": null, "videoCaptureTime": null,
"videoConfirmTime": null, "videoConfirmTime": null,
"finishTime": null, "finishTime": null,
"advise": "{\"method\":\"wechat\",\"uploaded\":true}", "advise": "{\"method\":\"wechat\",\"uploaded\":true}",
"createdAt": 1734602440561, "createdAt": 1734602440,
"updatedAt": 1734663755000 "updatedAt": 1734663755
} }
} }
``` ```
@ -487,7 +487,7 @@
## 注意事项 ## 注意事项
1. 所有需要认证的接口必须在请求头中携带有效的 JWT 令牌 1. 所有需要认证的接口必须在请求头中携带有效的 JWT 令牌
2. 所有时间戳字段均为毫秒级时间戳 2. 所有时间戳字段均为秒级时间戳
3. 分页接口的页码从 1 开始 3. 分页接口的页码从 1 开始
4. 用户密码在传输和存储时都会进行加密处理 4. 用户密码在传输和存储时都会进行加密处理
5. 课程任务的 progressStatus 字段状态码说明： 5. 课程任务的 progressStatus 字段状态码说明：

10
src/main/java/com/huertian/jinduguanli/service/LessonTaskService.java
View File

@ -51,7 +51,7 @@ public class LessonTaskService {
} }
@Transactional @Transactional
@CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true) @CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true)
public LessonTask create(LessonTaskRequest request) { public LessonTask create(LessonTaskRequest request) {
logger.info("开始创建课程任务 - 课程名称: {}, 小课名称: {}, 用户ID: {}", logger.info("开始创建课程任务 - 课程名称: {}, 小课名称: {}, 用户ID: {}",
request.getCourseName(), request.getMicroLessonName(), request.getUserId()); request.getCourseName(), request.getMicroLessonName(), request.getUserId());
@ -65,7 +65,7 @@ public class LessonTaskService {
} }
@Transactional @Transactional
@CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true) @CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true)
public LessonTask update(Long id, LessonTaskRequest request) { public LessonTask update(Long id, LessonTaskRequest request) {
logger.info("开始更新课程任务 - 任务ID: {}, 进度状态: {}", id, request.getProgressStatus()); logger.info("开始更新课程任务 - 任务ID: {}, 进度状态: {}", id, request.getProgressStatus());
LessonTask task = findById(id); LessonTask task = findById(id);
@ -74,7 +74,7 @@ public class LessonTaskService {
if (request.getProgressStatus() != null) { if (request.getProgressStatus() != null) {
task.setProgressStatus(request.getProgressStatus()); task.setProgressStatus(request.getProgressStatus());
// 根据进度状态更新时间戳 // 根据进度状态更新时间戳
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis() / 1000;
switch (request.getProgressStatus()) { switch (request.getProgressStatus()) {
case 1: // 脚本上传 case 1: // 脚本上传
task.setScriptUploadTime(currentTime); task.setScriptUploadTime(currentTime);
@ -106,14 +106,14 @@ public class LessonTaskService {
task.setUserId(request.getUserId()); task.setUserId(request.getUserId());
} }
task.setUpdatedAt(System.currentTimeMillis()); task.setUpdatedAt(System.currentTimeMillis() / 1000);
LessonTask updatedTask = lessonTaskRepository.save(task); LessonTask updatedTask = lessonTaskRepository.save(task);
logger.info("更新课程任务成功 - 任务ID: {}", updatedTask.getId()); logger.info("更新课程任务成功 - 任务ID: {}", updatedTask.getId());
return updatedTask; return updatedTask;
} }
@Transactional @Transactional
@CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true) @CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true)
public void delete(Long id) { public void delete(Long id) {
logger.info("开始删除课程任务 - 任务ID: {}", id); logger.info("开始删除课程任务 - 任务ID: {}", id);
if (!lessonTaskRepository.existsById(id)) { if (!lessonTaskRepository.existsById(id)) {