From 80b5033b8d5b918c7ca2523bc2a69139c2bab438 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 15 六月 2024 19:21:33 +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/controller/TStudyController.java | 210 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 145 insertions(+), 65 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 8fd86f9..89fc3b6 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.RedisConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -28,7 +27,6 @@
import javax.annotation.Resource;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -143,8 +141,14 @@
// 查询出error字段不为空的数据
wrapper.isNotNull("error");
List<TSubject> list1 = subjectService.list(wrapper);
- res.setRecords(list1);
- res.setTotal(list1.size());
+ List<TSubject> tSubjects = new ArrayList<>();
+ for (TSubject tSubject : list1) {
+ if (!tSubject.getError().isEmpty()){
+ tSubjects.add(tSubject);
+ }
+ }
+ res.setRecords(tSubjects);
+ res.setTotal(tSubjects.size());
return R.ok(res);
case 3:
List<TSubject> list2 = subjectService.list(wrapper);
@@ -658,9 +662,6 @@
}
-
-
-
/**
* 可兑换商品推荐
*/
@@ -669,6 +670,7 @@
public R<List<TGoodsVO>> studySchedule() {
return R.ok(goodsClient.goodRecommend().getData());
}
+
/**
* 首次页面加载时调用,获取学习进度及学习时长等信息
*
@@ -685,6 +687,7 @@
TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week);
return R.ok(result);
}
+
/**
* 查询周目列表
*
@@ -701,6 +704,7 @@
List<StudyWeekDTO> result = studyService.weekList(type, quarter);
return R.ok(result);
}
+
/**
* 进入题组后，获取题组学习进度信息
*
@@ -948,72 +952,112 @@
@GetMapping("/gameHearing")
@ApiOperation(value = "自主游戏1-超级听力", tags = {"学习端-听-自主游戏"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true),
@ApiImplicitParam(value = "难度(0入门、1中级、2困难)", name = "difficulty", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
})
- public R<StudyGamerResultVO> gameHearing(@RequestParam Integer difficulty, @RequestParam Integer week) {
- TGame game = gameService.lambdaQuery().eq(TGame::getWeek, week)
- .eq(TGame::getDisabled, 0).one();
+ public R<StudyGamerResultVO> gameHearing(@RequestParam Integer quarter, @RequestParam Integer difficulty, @RequestParam Integer week) {
+ TGame game = gameService.gameHearing(quarter, week);
+ if (null == game) {
+ throw new GlobalException("当前季度该周目暂无配置游戏数据！");
+ }
game.setIntegral(game.getIntegral().split(",")[difficulty]);
game.setTime(game.getTime().split(",")[difficulty]);
// 检验是否完成难度
studyService.checkDifficulty(difficulty, week, game);
List<String> subjectId = getSubjectId(week);
+ List<String> newSubjectId = subjectId.stream().map(data -> {
+ if (data.startsWith(Constants.REDUCE)) {
+ data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
+ }
+ return data;
+ }).distinct().collect(Collectors.toList());
// 判断周目下题目是否足够
- if (subjectId.size() < game.getCount()) {
+ if (newSubjectId.size() < game.getCount()) {
throw new GlobalException("当前周目下day1 - day5题目不足！");
}
// 根据游戏设置数量获取图片及语音
List<String> subjectData = new ArrayList<>();
Random random = new Random();
// 获取列表大小
- int dataSize = subjectId.size();
+ int dataSize = newSubjectId.size();
// 生成随机索引并获取数据
for (int i = 0; i < game.getCount(); i++) {
// 生成随机索引
int randomIndex = random.nextInt(dataSize);
// 获取对应的数据并加入结果列表
- subjectData.add(subjectId.get(randomIndex));
+ subjectData.add(newSubjectId.get(randomIndex));
+ newSubjectId.remove(randomIndex);
+ dataSize = newSubjectId.size();
}
- return R.ok(new StudyGamerResultVO(game,
- subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
+ List<TSubject> subjectList = getSubjectList(subjectData);
+ return R.ok(new StudyGamerResultVO(game, subjectList));
}
/**
* 自主游戏2-超级记忆
*
- * @param difficulty 难度(0入门、1中级、2困难)
- * @param week 所属周目
+ * @param quarter 季度
+ * @param week 所属周目
*/
@GetMapping("/gameMemory")
@ApiOperation(value = "自主游戏2-超级记忆", tags = {"学习端-听-自主游戏"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "难度(0入门、1中级、2困难)", name = "difficulty", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
})
- public R<StudyGamerResultVO> gameMemory(@RequestParam Integer difficulty, @RequestParam Integer week) {
- TGame game = gameService.lambdaQuery().eq(TGame::getWeek, week).eq(TGame::getDisabled, 0).one();
- // 检验是否完成难度
- studyService.checkDifficulty(difficulty, week, game);
+ public R<StudyGamerResultVO> gameMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
+ TGame game = gameService.gameHearing(quarter, week);
+ if (null == game) {
+ throw new GlobalException("当前季度该周目暂无配置游戏数据！");
+ }
List<String> subjectId = getSubjectId(week);
+ List<String> newSubjectId = subjectId.stream().map(data -> {
+ if (data.startsWith(Constants.REDUCE)) {
+ data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
+ }
+ return data;
+ }).distinct().collect(Collectors.toList());
// 判断周目下题目是否足够
- if (subjectId.size() < game.getCount()) {
+ if (newSubjectId.size() < game.getAnswerCount()) {
throw new GlobalException("当前周目下day1 - day5题目不足！");
}
// 根据游戏设置数量获取图片及语音
List<String> subjectData = new ArrayList<>();
Random random = new Random();
// 获取列表大小
- int dataSize = subjectId.size();
+ int dataSize = newSubjectId.size();
// 生成随机索引并获取数据
for (int i = 0; i < game.getCount(); i++) {
// 生成随机索引
int randomIndex = random.nextInt(dataSize);
// 获取对应的数据并加入结果列表
- subjectData.add(subjectId.get(randomIndex));
+ subjectData.add(newSubjectId.get(randomIndex));
+ newSubjectId.remove(randomIndex);
+ dataSize = newSubjectId.size();
}
- return R.ok(new StudyGamerResultVO(game,
- subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
+ List<TSubject> subjectList = getSubjectList(subjectData);
+ // 格子翻倍，前端需要做连连看
+ List<TSubject> resultList = new ArrayList<>();
+ for (int i = 0; i < Constants.TWO; i++) {
+ resultList.addAll(subjectList);
+ }
+ // 框架记忆数量翻倍，前端需要根据数量画格子
+ game.setAnswerCount(game.getAnswerCount() * 2);
+ return R.ok(new StudyGamerResultVO(game, resultList));
+ }
+
+ private List<TSubject> getSubjectList(List<String> subjectData) {
+ List<TSubject> subjectList = new ArrayList<>();
+ for (String subjectDatum : subjectData) {
+ if (subjectDatum.startsWith("-")) {
+ subjectDatum = subjectDatum.replace("-", "");
+ }
+ TSubject subject = subjectService.lambdaQuery().eq(TSubject::getId, subjectDatum)
+ .eq(TSubject::getState, 1).one();
+ subjectList.add(subject);
+ }
+ return subjectList;
}
/**
@@ -1031,11 +1075,25 @@
* 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
*/
Integer userid = tokenService.getLoginUserStudy().getUserid();
- TGame game = gameService.getById(completeStudy.getGameId());
+ TGame game = gameService.lambdaQuery().eq(TGame::getId, completeStudy.getGameId()).eq(TGame::getDisabled, 0).one();
+ if (null == game) {
+ throw new GlobalException("游戏信息异常！");
+ }
// 积分明细
List<TIntegralRecord> integralRecordList = integralRecordService.lambdaQuery().eq(TIntegralRecord::getUserId, userid)
.eq(TIntegralRecord::getGameId, game.getId()).eq(TIntegralRecord::getDisabled, 0).list();
- Integer availableIntegral = gameService.countIntegral(userid, game, completeStudy, integralRecordList);
+ // 本次游戏总共能获取的积分数量
+ Integer integral;
+ if (completeStudy.getGameName().equals(Constants.HEARING)) {
+ // 本次游戏总积分
+ integral = Integer.parseInt(game.getIntegral().split(",")[completeStudy.getDifficulty()]);
+ } else if (completeStudy.getGameName().equals(Constants.MEMORY)) {
+ integral = game.getAnswerIntegral();
+ } else {
+ throw new GlobalException("该次游戏积分计算异常！");
+ }
+ int gameAvailableIntegral = integral * (completeStudy.getAccuracy() / 100);
+ Integer availableIntegral = gameService.countIntegral(userid, game, completeStudy, gameAvailableIntegral, integralRecordList);
// 游戏测试记录
Boolean add = gameRecordService.add(completeStudy);
// 可获得积分不为null时，才添加积分明细记录
@@ -1051,27 +1109,31 @@
private List<String> getSubjectId(Integer week) {
// 当前week下day1 - day5所有题目
- List<String> subjectId = redisService.getCacheList(RedisConstants.HEARING_TREE);
- if (null == subjectId || subjectId.isEmpty()) {
- List<String> listenSubject = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
- .eq(TStudyListen::getDisabled, 0).list().stream().map(TStudyListen::getSubject).collect(Collectors.toList());
- List<String> inductionSubject = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
- .eq(TStudyInduction::getDisabled, 0).list().stream().map(TStudyInduction::getSubject).collect(Collectors.toList());
- List<String> lookSubject = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
- .eq(TStudyLook::getDisabled, 0).list().stream().map(TStudyLook::getSubject).collect(Collectors.toList());
- List<String> pairSubject = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
- .eq(TStudyPair::getDisabled, 0).list().stream().map(TStudyPair::getSubject).collect(Collectors.toList());
- listenSubject.addAll(inductionSubject);
- listenSubject.addAll(lookSubject);
- listenSubject.addAll(pairSubject);
- // 获取具体subject信息
- subjectId = new ArrayList<>();
- for (String subject : listenSubject) {
- subjectId.addAll(Arrays.asList(subject.split(",")));
- }
- redisService.setCacheList(RedisConstants.HEARING_TREE, subjectId);
- redisService.expire(RedisConstants.HEARING_TREE, RedisConstants.THIRTY, TimeUnit.MINUTES);
+ List<String> subjectId = new ArrayList<>();
+ List<String> listenSubject = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
+ .eq(TStudyListen::getDisabled, 0).list().stream().map(TStudyListen::getSubject).collect(Collectors.toList());
+ List<String> inductionSubject = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
+ .eq(TStudyInduction::getDisabled, 0).list().stream().map(TStudyInduction::getSubject).collect(Collectors.toList());
+ List<String> lookSubject = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
+ .eq(TStudyLook::getDisabled, 0).list().stream().map(TStudyLook::getSubject).collect(Collectors.toList());
+ List<String> pairSubject = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
+ .eq(TStudyPair::getDisabled, 0).list().stream().map(TStudyPair::getSubject).collect(Collectors.toList());
+ List<String> studyAnswerList = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
+ .eq(TStudyAnswer::getDisabled, 0).list().stream().map(data -> String.valueOf(data.getSubject())).collect(Collectors.toList());
+ // 自主学习1-4需要单独处理
+ for (String s : listenSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
}
+ for (String s : inductionSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
+ }
+ for (String s : lookSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
+ }
+ for (String s : pairSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
+ }
+ subjectId.addAll(studyAnswerList);
return subjectId;
}
@@ -1083,16 +1145,16 @@
@GetMapping("/lookPictureDbu")
@ApiOperation(value = "自主故事1-看图配音", tags = {"学习端-听-自主故事"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "所属季度", name = "quarter", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
})
- public R<StudyStoryListenResultVO> lookPictureDbu(@RequestParam Integer week) {
+ public R<StudyStoryListenResultVO> lookPictureDbu(@RequestParam Integer quarter, @RequestParam Integer week) {
// 看图配音信息
- TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
- // 获取对应图片语音
+ TStoryListen listen = gettStoryListen(quarter, week);
List<String> list = Arrays.asList(listen.getLookStory().split(","));
- List<TSubject> subjectList;
+ List<TStory> subjectList;
if (!list.isEmpty()) {
- subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
+ subjectList = storyService.lambdaQuery().in(TStory::getId, list).eq(TStory::getDisabled, 0).list();
} else {
subjectList = new ArrayList<>();
}
@@ -1107,20 +1169,38 @@
@GetMapping("/frameworkMemory")
@ApiOperation(value = "自主故事2-框架记忆", tags = {"学习端-听-自主故事"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "所属季度", name = "quarter", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
})
- public R<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer week) {
- // 看图配音信息
- TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
+ public R<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
+ TStoryListen listen = gettStoryListen(quarter, week);
// 获取对应图片语音
List<String> list = Arrays.asList(listen.getStory().split(","));
- List<TSubject> subjectList;
+ List<TStory> subjectList;
if (!list.isEmpty()) {
- subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
+ subjectList = storyService.lambdaQuery().in(TStory::getId, list).eq(TStory::getDisabled, 0).list();
} else {
subjectList = new ArrayList<>();
}
return R.ok(new StudyStoryListenResultVO(listen, subjectList));
+ }
+
+ private TStoryListen gettStoryListen(Integer quarter, Integer week) {
+ // 看图配音信息
+ List<TStoryListen> storyListenList = storyListenService.storyDetail(quarter, week);
+ if (storyListenList.isEmpty()) {
+ throw new GlobalException("当前季度该周目下未配置故事信息！");
+ }
+ // 获取对应图片语音
+ TStoryListen listen;
+ if (storyListenList.size() == Constants.ONE) {
+ listen = storyListenList.get(Constants.ZERO);
+ } else {
+ // 随机获取一组题
+ Random rand = new Random();
+ listen = storyListenList.get(rand.nextInt(storyListenList.size()));
+ }
+ return listen;
}
/**
@@ -1181,11 +1261,11 @@
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
.eq(TUserStudy::getDisabled, 0).one();
// 查询剩余周目
- if (studyRecord!=null){
+ if (studyRecord != null) {
int size = studyService.list(new QueryWrapper<TStudy>()
.eq("type", 1)).size();
- studyRecord.setSurplus(size-studyRecord.getWeek());
- }else{
+ studyRecord.setSurplus(size - studyRecord.getWeek());
+ } else {
TUserStudy tUserStudy = new TUserStudy();
tUserStudy.setSurplus(studyService.list(new QueryWrapper<TStudy>()
.eq("type", 1)).size());
@@ -1235,9 +1315,9 @@
@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<IPage<TIntegralRecord>> integralDetailParent(String time,
- @RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize) {
- if(tokenService.getLoginUser1() == null){
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
--
Gitblit v1.7.1