From 5a57b1b73022877150bb7a5fba58d1a636874dfa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 15:01:31 +0800
Subject: [PATCH] 1020更新
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 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 4b6653e..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,8 +1,8 @@
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.CompleteGameDTO;
import com.ruoyi.study.dto.StudyWeekDTO;
import com.ruoyi.study.vo.*;
@@ -23,17 +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 studyRecord 学习进度
+ * @param week 所属周目
* @return 学习信息
*/
- TUserStudy studySchedule(String userId);
+ 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-超级听力
@@ -63,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-归纳排除
@@ -73,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-有问有答
@@ -83,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-音图相配
@@ -93,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的学习进度
@@ -115,11 +117,28 @@
int computeTotalIntegral(List<String> studyIds, Integer type, Integer accuracy);
/**
- * 超级记忆正确率达到通关率标准，才能进入下一周目学习
+ * 计算剩余学习周目
*
- * @param game 游戏信息
- * @param userid 用户id
- * @param completeStudy 游戏完成信息
+ * @param studyRecord 学习进度信息
+ * @param studyList 学习配置列表
+ * @return 剩余周目
*/
- void checkRate(TGame game, Integer userid, CompleteGameDTO completeStudy);
+ 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