diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java index ad9db5a..e08c0b6 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java @@ -42,7 +42,7 @@ public class ExceptionController { @ExceptionHandler(Exception.class) public JsonResponse exceptionHandler(Exception e) { - log.error("{}-{}", e, e.getMessage()); + log.error("出现异常", e); return JsonResponse.error("系统错误", 500); } @@ -101,6 +101,6 @@ public class ExceptionController { @ExceptionHandler(AmazonS3Exception.class) public JsonResponse serviceExceptionHandler(AmazonS3Exception e) { log.error("s3错误={}", e.getMessage()); - return JsonResponse.error(e.getMessage(), 500); + return JsonResponse.error("存储配置有问题或存储无法无法正常访问", 500); } } diff --git a/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java index 002794e..c9e4625 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java +++ b/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java @@ -37,6 +37,6 @@ public class UserCourseHourRecordDestroyListener { @EventListener public void updateUserCourseRecord(UserCourseHourRecordDestroyEvent e) { - userCourseRecordService.decrease(e.getUserId(), e.getCourseId(), 1); + userCourseRecordService.updateUserCourseLearnProgress(e.getUserId(), e.getCourseId(), 1); } } diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java index 110edb9..e437f09 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/UserCourseRecordService.java @@ -51,5 +51,5 @@ public interface UserCourseRecordService extends IService { List chunks(List ids, List fields); - void decrease(Integer userId, Integer courseId, int count); + void updateUserCourseLearnProgress(Integer userId, Integer courseId, int count); } diff --git a/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java index 2a67ff7..fd42f46 100644 --- a/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java +++ b/playedu-course/src/main/java/xyz/playedu/course/service/impl/UserCourseRecordServiceImpl.java @@ -144,7 +144,7 @@ public class UserCourseRecordServiceImpl } @Override - public void decrease(Integer userId, Integer courseId, int count) { + public void updateUserCourseLearnProgress(Integer userId, Integer courseId, int count) { UserCourseRecord record = find(userId, courseId); if (record == null) { return; @@ -152,12 +152,17 @@ public class UserCourseRecordServiceImpl int finishedCount = record.getFinishedCount() - count; + if (0 == finishedCount) { + remove(query().getWrapper().eq("id", record.getId())); + return; + } + UserCourseRecord newRecord = new UserCourseRecord(); newRecord.setId(record.getId()); - newRecord.setFinishedCount(finishedCount); + newRecord.setIsFinished(0); newRecord.setFinishedAt(null); newRecord.setProgress(finishedCount * 10000 / record.getHourCount()); - newRecord.setIsFinished(0); + newRecord.setFinishedCount(finishedCount); updateById(newRecord); } diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java index 680f8d9..c1ae31f 100644 --- a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java +++ b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java @@ -66,11 +66,18 @@ public class AdminPermissionCheck implements CommandLineRunner { new AdminPermission[] { new AdminPermission() { { - setSort(30); + setSort(0); setName("列表"); setSlug(BPermissionConstant.RESOURCE_MENU); } }, + new AdminPermission() { + { + setSort(10); + setName("资源上传"); + setSlug(BPermissionConstant.UPLOAD); + } + }, }); // 学员 put( @@ -227,13 +234,6 @@ public class AdminPermissionCheck implements CommandLineRunner { .PASSWORD_CHANGE); } }, - new AdminPermission() { - { - setSort(35); - setName("文件上传"); - setSlug(BPermissionConstant.UPLOAD); - } - }, }); } });