From f42c5a423643415aa108d02daba774d1946483ca Mon Sep 17 00:00:00 2001
From: none <none>
Date: Fri, 24 Mar 2023 11:54:29 +0800
Subject: [PATCH] update

---
 src/main/java/xyz/playedu/api/domain/Course.java           | 1 +
 .../playedu/api/mapper/UserLearnDurationStatsMapper.java   | 2 --
 .../service/impl/UserLearnDurationStatsServiceImpl.java    | 7 ++++++-
 src/main/resources/mapper/UserLearnDurationStatsMapper.xml | 6 ------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/domain/Course.java b/src/main/java/xyz/playedu/api/domain/Course.java
index 3152e03..43debeb 100644
--- a/src/main/java/xyz/playedu/api/domain/Course.java
+++ b/src/main/java/xyz/playedu/api/domain/Course.java
@@ -48,6 +48,7 @@ public class Course implements Serializable {
     /**
      * 1:必修,0:选修
      */
+    @JsonProperty("is_required")
     private Integer isRequired;
 
     /**
diff --git a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java b/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java
index 84d08e4..533ca45 100644
--- a/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java
+++ b/src/main/java/xyz/playedu/api/mapper/UserLearnDurationStatsMapper.java
@@ -13,8 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface UserLearnDurationStatsMapper extends BaseMapper<UserLearnDurationStats> {
 
-    Integer getUserDateDuration(Integer userId, String createdDate);
-
     Integer getUserDuration(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 feaec4b..050c524 100644
--- a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java
+++ b/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java
@@ -70,7 +70,12 @@ public class UserLearnDurationStatsServiceImpl extends ServiceImpl<UserLearnDura
     @Override
     public Integer todayUserDuration(Integer userId) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        return getBaseMapper().getUserDateDuration(userId, simpleDateFormat.format(new Date()));
+        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 stats.getDuration();
     }
 
     @Override
diff --git a/src/main/resources/mapper/UserLearnDurationStatsMapper.xml b/src/main/resources/mapper/UserLearnDurationStatsMapper.xml
index e8f94f6..445387d 100644
--- a/src/main/resources/mapper/UserLearnDurationStatsMapper.xml
+++ b/src/main/resources/mapper/UserLearnDurationStatsMapper.xml
@@ -15,12 +15,6 @@
         id,user_id,duration,
         created_date
     </sql>
-    <select id="getUserDateDuration" resultType="java.lang.Integer">
-        SELECT `duration`
-        FROM `user_learn_duration_stats`
-        where `user_id` = #{userId}
-          and `created_date` = #{createdDate};
-    </select>
     <select id="getUserDuration" resultType="java.lang.Integer">
         SELECT sum(`duration`)
         FROM `user_learn_duration_stats`