From 6b23dfe77b6c15c4e597e671d319e4f6b98d35cb Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 4 Apr 2023 09:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/frontend/UserController.java    |  6 +++---
 .../playedu/api/domain/UserLearnDurationStats.java |  2 +-
 .../api/mapper/UserLearnDurationStatsMapper.java   |  2 +-
 .../api/service/UserLearnDurationStatsService.java |  4 ++--
 .../impl/UserLearnDurationStatsServiceImpl.java    | 14 +++++++-------
 .../mapper/UserLearnDurationStatsMapper.xml        |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

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<String, Integer> stats = new HashMap<>();
+        HashMap<String, Object> 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<UserLearnDurationStats> {
 
-    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<UserLearnDuratio
 
     List<UserLearnDurationStats> 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<UserLearnDura
         if (stats == null) {
             UserLearnDurationStats newStats = new UserLearnDurationStats();
             newStats.setUserId(userId);
-            newStats.setDuration(Math.toIntExact(duration));
+            newStats.setDuration(duration);
             newStats.setCreatedDate(simpleDateFormat.parse(date));
             save(newStats);
             return;
@@ -40,7 +40,7 @@ public class UserLearnDurationStatsServiceImpl extends ServiceImpl<UserLearnDura
 
         UserLearnDurationStats newStats = new UserLearnDurationStats();
         newStats.setId(stats.getId());
-        newStats.setDuration((int) (stats.getDuration() + duration));
+        newStats.setDuration(stats.getDuration() + duration);
         updateById(newStats);
     }
 
@@ -68,20 +68,20 @@ public class UserLearnDurationStatsServiceImpl extends ServiceImpl<UserLearnDura
     }
 
     @Override
-    public Integer todayUserDuration(Integer userId) {
+    public Long todayUserDuration(Integer userId) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String today = simpleDateFormat.format(new Date());
         UserLearnDurationStats stats = getOne(query().getWrapper().eq("user_id", userId).eq("created_date", today));
         if (stats == null) {
-            return 0;
+            return 0L;
         }
         return stats.getDuration();
     }
 
     @Override
-    public Integer userDuration(Integer userId) {
-        Integer totalDuration = getBaseMapper().getUserDuration(userId);
-        return totalDuration == null ? 0 : totalDuration;
+    public Long userDuration(Integer userId) {
+        Long totalDuration = getBaseMapper().getUserDuration(userId);
+        return totalDuration == null ? 0L : totalDuration;
     }
 }
 
diff --git a/src/main/resources/mapper/UserLearnDurationStatsMapper.xml b/src/main/resources/mapper/UserLearnDurationStatsMapper.xml
index 445387d..7b32623 100644
--- a/src/main/resources/mapper/UserLearnDurationStatsMapper.xml
+++ b/src/main/resources/mapper/UserLearnDurationStatsMapper.xml
@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="xyz.playedu.api.domain.UserLearnDurationStats">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="userId" column="user_id" jdbcType="INTEGER"/>
-            <result property="duration" column="duration" jdbcType="INTEGER"/>
+            <result property="duration" column="duration" jdbcType="BIGINT"/>
             <result property="createdDate" column="created_date" jdbcType="DATE"/>
     </resultMap>
 
@@ -15,7 +15,7 @@
         id,user_id,duration,
         created_date
     </sql>
-    <select id="getUserDuration" resultType="java.lang.Integer">
+    <select id="getUserDuration" resultType="java.lang.Long">
         SELECT sum(`duration`)
         FROM `user_learn_duration_stats`
         where `user_id` = #{userId};