From 984dc83c2e93ee05d8ea57db5beec76a773d4716 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 04 七月 2025 18:08:49 +0800
Subject: [PATCH] 部分代码

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java
index d7ddbc8..d0fc106 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.study.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.study.domain.*;
 import com.ruoyi.study.dto.StudyWeekDTO;
 import com.ruoyi.study.vo.*;
@@ -22,18 +23,19 @@
      *
      * @param type    所属类型
      * @param quarter 季度
+     * @param userId  用户id
      * @return 列表
      */
-    List<StudyWeekDTO> weekList(Integer type, Integer quarter);
+    List<StudyWeekDTO> weekList(Integer type, Integer quarter, Integer userId);
 
     /**
      * 获取学习进度及学习时长等信息
      *
-     * @param userId 用户id
-     * @param week   周目
+     * @param studyRecord 学习进度
+     * @param week        所属周目
      * @return 学习信息
      */
-    TUserStudy studySchedule(String userId, Integer week);
+    TUserStudy studySchedule(TUserStudy studyRecord, Integer week);
 
     /**
      * 自主学习1-听音选图
@@ -43,7 +45,7 @@
      * @param studyListens 数据集合
      * @return 单个题组下所包含的所有图片及语音
      */
-    StudyListenResultVO listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens);
+    StudyListenResultVO listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens,Integer userId);
 
     /**
      * 自主游戏1-超级听力
@@ -51,8 +53,9 @@
      * @param difficulty 难度(0入门、1中级、2高级)
      * @param week       所属周目
      * @param game       游戏信息
+     * @param userid     用户id
      */
-    void checkDifficulty(Integer difficulty, Integer week, TGame game);
+    void checkDifficulty(Integer difficulty, Integer week, TGame game, Integer userid);
 
     /**
      * 自主学习2-看图选音
@@ -62,7 +65,7 @@
      * @param lookList 数据集合
      * @return 单个题组下所包含的所有图片及语音
      */
-    StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList);
+    R<StudyLookResultVO> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList, Integer userId);
 
     /**
      * 自主学习3-归纳排除
@@ -72,7 +75,7 @@
      * @param inductionList 归纳排除
      * @return 题目信息
      */
-    StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList);
+    R<StudyInductionResultVO> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList,Integer userId);
 
     /**
      * 自主学习4-有问有答
@@ -82,7 +85,7 @@
      * @param answerList 有问有答
      * @return 题目信息
      */
-    StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList);
+    R<StudyAnswerResultVO> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList,Integer userId);
 
     /**
      * 自主学习5-音图相配
@@ -92,7 +95,7 @@
      * @param pair 音图相配
      * @return 题目信息
      */
-    StudyPairResultVO pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair);
+    R<StudyPairResultVO> pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair,Integer userId);
 
     /**
      * 计算用户当前week的学习进度
@@ -112,4 +115,30 @@
      * @return 积分
      */
     int computeTotalIntegral(List<String> studyIds, Integer type, Integer accuracy);
+
+    /**
+     * 计算剩余学习周目
+     *
+     * @param studyRecord 学习进度信息
+     * @param studyList   学习配置列表
+     * @return 剩余周目
+     */
+    int residueWeek(TUserStudy studyRecord, List<TStudy> studyList);
+
+    /**
+     * 校验超级听力是否通过
+     *
+     * @param game   游戏信息
+     * @param userid 用户信息
+     */
+    void checkClearance(TGame game, Integer userid);
+
+    /**
+     * 获取当前周目游戏难度
+     *
+     * @param studyRecord 学习进度
+     * @param week        周目
+     * @return 难度
+     */
+    Integer userGameDifficulty(TUserStudy studyRecord, Integer week);
 }

--
Gitblit v1.7.1