yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-06-08 10:14:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

权限优化 && 学员的线上课学习记录重置的进度更新

Browse Source
This commit is contained in:
xxx 2023-11-13 15:24:54 +08:00
parent 23ff7068f7
commit 8f27bb9fda
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java
View File

@ -42,7 +42,7 @@ public class ExceptionController {
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
public JsonResponse exceptionHandler(Exception e) { public JsonResponse exceptionHandler(Exception e) {
log.error("{}-{}", e, e.getMessage()); log.error("出现异常", e);
return JsonResponse.error("系统错误", 500); return JsonResponse.error("系统错误", 500);
} }
@ -101,6 +101,6 @@ public class ExceptionController {
@ExceptionHandler(AmazonS3Exception.class) @ExceptionHandler(AmazonS3Exception.class)
public JsonResponse serviceExceptionHandler(AmazonS3Exception e) { public JsonResponse serviceExceptionHandler(AmazonS3Exception e) {
log.error("s3错误={}", e.getMessage()); log.error("s3错误={}", e.getMessage());
return JsonResponse.error(e.getMessage(), 500); return JsonResponse.error("存储配置有问题或存储无法无法正常访问", 500);
} }
} }

2
playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java
View File

@ -37,6 +37,6 @@ public class UserCourseHourRecordDestroyListener {
@EventListener @EventListener
public void updateUserCourseRecord(UserCourseHourRecordDestroyEvent e) { public void updateUserCourseRecord(UserCourseHourRecordDestroyEvent e) {
userCourseRecordService.decrease(e.getUserId(), e.getCourseId(), 1); userCourseRecordService.updateUserCourseLearnProgress(e.getUserId(), e.getCourseId(), 1);
} }
} }

2
playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java
View File

@ -51,5 +51,5 @@ public interface UserCourseRecordService extends IService<UserCourseRecord> {
List<UserCourseRecord> chunks(List<Integer> ids, List<String> fields); List<UserCourseRecord> chunks(List<Integer> ids, List<String> fields);
void decrease(Integer userId, Integer courseId, int count); void updateUserCourseLearnProgress(Integer userId, Integer courseId, int count);
} }

11
playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java
View File

@ -144,7 +144,7 @@ public class UserCourseRecordServiceImpl
} }
@Override @Override
public void decrease(Integer userId, Integer courseId, int count) { public void updateUserCourseLearnProgress(Integer userId, Integer courseId, int count) {
UserCourseRecord record = find(userId, courseId); UserCourseRecord record = find(userId, courseId);
if (record == null) { if (record == null) {
return; return;
@ -152,12 +152,17 @@ public class UserCourseRecordServiceImpl
int finishedCount = record.getFinishedCount() - count; int finishedCount = record.getFinishedCount() - count;
if (0 == finishedCount) {
remove(query().getWrapper().eq("id", record.getId()));
return;
}
UserCourseRecord newRecord = new UserCourseRecord(); UserCourseRecord newRecord = new UserCourseRecord();
newRecord.setId(record.getId()); newRecord.setId(record.getId());
newRecord.setFinishedCount(finishedCount); newRecord.setIsFinished(0);
newRecord.setFinishedAt(null); newRecord.setFinishedAt(null);
newRecord.setProgress(finishedCount * 10000 / record.getHourCount()); newRecord.setProgress(finishedCount * 10000 / record.getHourCount());
newRecord.setIsFinished(0); newRecord.setFinishedCount(finishedCount);
updateById(newRecord); updateById(newRecord);
} }

16
playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java
View File

@ -66,11 +66,18 @@ public class AdminPermissionCheck implements CommandLineRunner {
new AdminPermission[] { new AdminPermission[] {
new AdminPermission() { new AdminPermission() {
{ {
setSort(30); setSort(0);
setName("列表"); setName("列表");
setSlug(BPermissionConstant.RESOURCE_MENU); setSlug(BPermissionConstant.RESOURCE_MENU);
} }
}, },
new AdminPermission() {
{
setSort(10);
setName("资源上传");
setSlug(BPermissionConstant.UPLOAD);
}
},
}); });
// 学员 // 学员
put( put(
@ -227,13 +234,6 @@ public class AdminPermissionCheck implements CommandLineRunner {
.PASSWORD_CHANGE); .PASSWORD_CHANGE);
} }
}, },
new AdminPermission() {
{
setSort(35);
setName("文件上传");
setSlug(BPermissionConstant.UPLOAD);
}
},
}); });
} }
}); });