From ab7045d70310f4c5b150090b7c9fa18dea7ea1e7 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 15:50:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
index 15966db..977f9c3 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.study.service.ITStudyService;
import com.ruoyi.study.service.ITSubjectService;
import com.ruoyi.study.service.ITUserStudyService;
+import com.ruoyi.study.vo.*;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -70,64 +71,50 @@
}
@Override
- public Map<String, Object> listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens) {
+ public StudyListenResultVO listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens) {
// 随机获取一组题
Random rand = new Random();
TStudyListen data = studyListens.get(rand.nextInt(studyListens.size()));
List<TSubject> subjectList = getSubjects(data.getSubject().split(","));
- Map<String, Object> result = new HashMap<>(8);
- result.put("data", data);
- result.put("subject", subjectList);
- return result;
+ return new StudyListenResultVO(data, subjectList);
}
@Override
- public Map<String, Object> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList) {
+ public StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList) {
// 随机获取一组题
Random rand = new Random();
TStudyLook data = lookList.get(rand.nextInt(lookList.size()));
List<TSubject> subjectList = getSubjects(data.getSubject().split(","));
- Map<String, Object> result = new HashMap<>(8);
- result.put("data", data);
- result.put("subject", subjectList);
- return result;
+ return new StudyLookResultVO(data, subjectList);
}
@Override
- public Map<String, Object> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList) {
+ public StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList) {
// 随机获取一组题
Random rand = new Random();
TStudyInduction data = inductionList.get(rand.nextInt(inductionList.size()));
List<TSubject> subjectList = getSubjects(data.getSubject().split(","));
- Map<String, Object> result = new HashMap<>(8);
- result.put("data", data);
- result.put("subject", subjectList);
- return result;
+ return new StudyInductionResultVO(data, subjectList);
}
@Override
- public Map<String, Object> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList) {
+ public StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList) {
// 随机获取一组题
Random rand = new Random();
TStudyAnswer data = answerList.get(rand.nextInt(answerList.size()));
// 获取问题题目 和 回答题目
- Map<String, Object> result = new HashMap<>(8);
List<String> ids = new ArrayList<>();
ids.add(String.valueOf(data.getSubject()));
ids.add(String.valueOf(data.getAnswerSubject()));
- result.put("data", data);
// 有问有答
- result.put("subject", getSubjects(ids.toArray(ids.toArray(new String[0]))));
- return result;
+ List<TSubject> subjects = getSubjects(ids.toArray(ids.toArray(new String[0])));
+ return new StudyAnswerResultVO(data, subjects);
}
@Override
- public Map<String, Object> pictureMateVoice(Integer week, Integer day, TStudyPair pair) {
+ public StudyPairResultVO pictureMateVoice(Integer week, Integer day, TStudyPair pair) {
List<TSubject> subjectList = getSubjects(pair.getSubject().split(","));
- Map<String, Object> result = new HashMap<>(8);
- result.put("data", pair);
- result.put("subject", subjectList);
- return result;
+ return new StudyPairResultVO(pair, subjectList);
}
/**
--
Gitblit v1.7.1