From 72d4afb7b0f12753846ffb9baf0d593635df55a3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 六月 2024 15:47:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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 81afdb0..d7ddbc8 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
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.StudyWeekDTO;
+import com.ruoyi.study.vo.*;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -31,10 +31,9 @@
*
* @param userId 用户id
* @param week 周目
- * @param day 所属day
* @return 学习信息
*/
- TUserStudy studySchedule(String userId, Integer week, Integer day);
+ TUserStudy studySchedule(String userId, Integer week);
/**
* 自主学习1-听音选图
@@ -44,7 +43,7 @@
* @param studyListens 数据集合
* @return 单个题组下所包含的所有图片及语音
*/
- Map<String, Object> listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens);
+ StudyListenResultVO listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens);
/**
* 自主游戏1-超级听力
@@ -63,27 +62,27 @@
* @param lookList 数据集合
* @return 单个题组下所包含的所有图片及语音
*/
- Map<String, Object> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList);
+ StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList);
/**
* 自主学习3-归纳排除
*
- * @param week 周目
- * @param day 所属day
+ * @param week 周目
+ * @param day 所属day
* @param inductionList 归纳排除
* @return 题目信息
*/
- Map<String, Object> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList);
+ StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList);
/**
* 自主学习4-有问有答
*
- * @param week 周目
- * @param day 所属day
+ * @param week 周目
+ * @param day 所属day
* @param answerList 有问有答
* @return 题目信息
*/
- Map<String, Object> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList);
+ StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList);
/**
* 自主学习5-音图相配
@@ -93,6 +92,24 @@
* @param pair 音图相配
* @return 题目信息
*/
- Map<String, Object> pictureMateVoice(Integer week, Integer day, TStudyPair pair);
+ StudyPairResultVO pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair);
+ /**
+ * 计算用户当前week的学习进度
+ *
+ * @param result 用户学习信息
+ * @param week 周目
+ * @return 当前week学习进度
+ */
+ int computeSchedule(TUserStudy result, Integer week);
+
+ /**
+ * 获取本次学习可获得总积分
+ *
+ * @param studyIds 题组id
+ * @param type 类型
+ * @param accuracy 正确率
+ * @return 积分
+ */
+ int computeTotalIntegral(List<String> studyIds, Integer type, Integer accuracy);
}
--
Gitblit v1.7.1