From b265007b416705588737a34b01fdb5dbd7f58511 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 15:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 54 ++++++++++++++++++++++++------------------------------
1 files changed, 24 insertions(+), 30 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 c7c51cf..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
@@ -2,11 +2,15 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.GlobalException;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.StudyWeekDTO;
import com.ruoyi.study.mapper.TStudyMapper;
-import com.ruoyi.study.service.*;
+import com.ruoyi.study.service.ITGameRecordService;
+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;
@@ -27,11 +31,11 @@
@Resource
private ITUserStudyService userStudyService;
@Resource
- private ITStudyListenService studyListenService;
- @Resource
private ITSubjectService subjectService;
@Resource
private ITGameRecordService gameRecordService;
+ @Resource
+ private TokenService tokenService;
private final static Map<String, Integer> GAME_DIFFICULTY_MAP = new HashMap<>();
@@ -58,7 +62,7 @@
throw new GlobalException("游戏等级异常，请重试！");
}
// 获取用户游戏进度
- Long userId = SecurityUtils.getUserId();
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
List<TGameRecord> list = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId).eq(TGameRecord::getGameId, game.getId()).list();
boolean contains = list.stream().map(TGameRecord::getGameDifficulty).collect(Collectors.toList()).contains(level);
if (!contains) {
@@ -67,60 +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);
- result.put("data", data);
- // todo 有问有答
- return result;
+ List<String> ids = new ArrayList<>();
+ ids.add(String.valueOf(data.getSubject()));
+ ids.add(String.valueOf(data.getAnswerSubject()));
+ // 有问有答
+ 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