diff --git a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java index 9b50447..5baeef7 100644 --- a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java +++ b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java @@ -139,8 +139,8 @@ public class UserController { int nunRequiredHourCount = 0;//选修课时 int requiredFinishedHourCount = 0;//已完成必修课时 int nunRequiredFinishedHourCount = 0;//已完成选修课时 - Integer todayLearnDuration = userLearnDurationStatsService.todayUserDuration(FCtx.getId());//今日学习时长 - Integer learnDuration = userLearnDurationStatsService.userDuration(FCtx.getId());//学习总时长 + Long todayLearnDuration = userLearnDurationStatsService.todayUserDuration(FCtx.getId());//今日学习时长 + Long learnDuration = userLearnDurationStatsService.userDuration(FCtx.getId());//学习总时长 // -------- 学习数据统计 ---------- if (courses.size() > 0) { @@ -169,7 +169,7 @@ public class UserController { } } } - HashMap stats = new HashMap<>(); + HashMap stats = new HashMap<>(); stats.put("required_course_count", requiredCourseCount);//必修课数量 stats.put("nun_required_course_count", nunRequiredCourseCount);//选修课数量 stats.put("required_finished_course_count", requiredFinishedCourseCount);//必修已完成线上课数 diff --git a/src/main/java/xyz/playedu/api/domain/UserLearnDurationStats.java b/src/main/java/xyz/playedu/api/domain/UserLearnDurationStats.java index 07c5b08..99fccd8 100644 --- a/src/main/java/xyz/playedu/api/domain/UserLearnDurationStats.java +++ b/src/main/java/xyz/playedu/api/domain/UserLearnDurationStats.java @@ -32,7 +32,7 @@ public class UserLearnDurationStats implements Serializable { /** * */ - private Integer duration; + private Long duration; /** * diff --git a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java b/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java index 533ca45..cadc06d 100644 --- a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java +++ b/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java @@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface UserLearnDurationStatsMapper extends BaseMapper { - Integer getUserDuration(Integer userId); + Long getUserDuration(Integer userId); } diff --git a/src/main/java/xyz/playedu/api/service/UserLearnDurationStatsService.java b/src/main/java/xyz/playedu/api/service/UserLearnDurationStatsService.java index f5f6afa..d03c42d 100644 --- a/src/main/java/xyz/playedu/api/service/UserLearnDurationStatsService.java +++ b/src/main/java/xyz/playedu/api/service/UserLearnDurationStatsService.java @@ -19,7 +19,7 @@ public interface UserLearnDurationStatsService extends IService top10(); - Integer todayUserDuration(Integer userId); + Long todayUserDuration(Integer userId); - Integer userDuration(Integer userId); + Long userDuration(Integer userId); } diff --git a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java index f765d4f..c099def 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java @@ -32,7 +32,7 @@ public class UserLearnDurationStatsServiceImpl extends ServiceImpl - + @@ -15,7 +15,7 @@ id,user_id,duration, created_date - SELECT sum(`duration`) FROM `user_learn_duration_stats` where `user_id` = #{userId};