From e11362ca4849da567a77d8b5e5be510df9fb0741 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期一, 17 六月 2024 11:51:51 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 389 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 254 insertions(+), 135 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 89fc3b6..f24d629 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
@@ -2,16 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.TGoodsVO;
import com.ruoyi.management.api.feignClient.ManagementClient;
+import com.ruoyi.management.api.model.TSysSet;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.*;
import com.ruoyi.study.service.*;
@@ -70,13 +71,13 @@
@Resource
private ITIntegralRecordService integralRecordService;
@Resource
- private RedisService redisService;
- @Resource
private ITUserService userService;
@Resource
private TokenService tokenService;
@Resource
private ITSubjectRecordService subjectRecordService;
+ @Resource
+ private IUserStudyRecordService studyRecordService;
@Resource
private ManagementClient managementClient;
@@ -143,7 +144,7 @@
List<TSubject> list1 = subjectService.list(wrapper);
List<TSubject> tSubjects = new ArrayList<>();
for (TSubject tSubject : list1) {
- if (!tSubject.getError().isEmpty()){
+ if (!tSubject.getError().isEmpty()) {
tSubjects.add(tSubject);
}
}
@@ -667,24 +668,40 @@
*/
@GetMapping("/goodRecommend")
@ApiOperation(value = "可兑换商品推荐", tags = {"学习端-首页"})
- public R<List<TGoodsVO>> studySchedule() {
+ public R<List<TGoodsVO>> goodRecommend() {
return R.ok(goodsClient.goodRecommend().getData());
+ }
+
+ /**
+ * 获取正确及错误提示音效
+ */
+ @GetMapping("/promptVoice")
+ @ApiOperation(value = "获取正确及错误提示音效", tags = {"学习端-首页"})
+ public R<TSysSet> promptVoice() {
+ return R.ok(managementClient.promptVoice().getData());
}
/**
* 首次页面加载时调用,获取学习进度及学习时长等信息
*
* @param week 周目
- * @param day 所属day
*/
@GetMapping("/studySchedule")
@ApiOperation(value = "获取用户学习进度", tags = {"学习端-首页"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true)
})
- public R<TUserStudy> studySchedule(@RequestParam Integer week, @RequestParam Integer day) {
- TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week);
+ public R<TUserStudy> studySchedule(@RequestParam Integer week) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TUserStudy result = studyService.studySchedule(String.valueOf(loginStudy.getUserid()), week);
+ if (null != result) {
+ // 计算当前周 day 1-5的总进度
+ int computeSchedule = studyService.computeSchedule(result, week);
+ result.setComputeSchedule(computeSchedule);
+ }
return R.ok(result);
}
@@ -715,12 +732,39 @@
@ApiOperation(value = "获取题组学习进度信息", tags = {"学习端-题目"})
@ApiImplicitParams({
@ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "类型(1:听音选图,2:看图选音,3:归纳排除,4:有问有答,5:音图相配)", name = "type", dataType = "Integer", required = true)
})
- public R<TSubjectRecord> teamSchedule(@RequestParam Integer week, @RequestParam Integer day) {
- TSubjectRecord subjectRecord = subjectRecordService.lambdaQuery().eq(TSubjectRecord::getWeek, week).eq(TSubjectRecord::getDay, day)
- .eq(TSubjectRecord::getUserId, tokenService.getLoginUserStudy().getUserid()).eq(TSubjectRecord::getDisabled, 0).one();
- return R.ok(subjectRecord);
+ public R<SubjectRecordResultVO> teamSchedule(@RequestParam Integer week, @RequestParam Integer day,
+ @RequestParam Integer type) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TSubjectRecord subjectRecord = subjectRecordService.lambdaQuery().eq(TSubjectRecord::getWeek, week)
+ .eq(TSubjectRecord::getDay, day)
+ .eq(TSubjectRecord::getType, type)
+ .eq(TSubjectRecord::getUserId, loginStudy.getUserid())
+ .eq(TSubjectRecord::getDisabled, 0).one();
+ // 返回结果
+ SubjectRecordResultVO result;
+ SubjectRecordResultVO data = subjectRecordService.recordResult(subjectRecord, loginStudy.getUserid());
+ if (null != subjectRecord) {
+ subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 1)
+ .eq(TSubjectRecord::getId, subjectRecord.getId()).update();
+ // 题组id
+ List<Integer> teamIds = Arrays.stream(subjectRecord.getBeforeSubject().split(",")).map(Integer::parseInt)
+ .collect(Collectors.toList());
+ // 题目id
+ List<Integer> topicIds = Arrays.stream(subjectRecord.getCompleteSubject().split(",")).map(Integer::parseInt)
+ .collect(Collectors.toList());
+ result = new SubjectRecordResultVO(teamIds, topicIds, subjectRecord.getAnswerNumber(), subjectRecord.getCorrectNumber());
+ } else {
+ result = new SubjectRecordResultVO();
+ }
+ subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 0)
+ .eq(TSubjectRecord::getUserId, loginStudy.getUserid()).update();
+ return R.ok(result);
}
/**
@@ -728,9 +772,43 @@
*/
@PostMapping("/exitLearning")
@ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"学习端-题目"})
- public R<Boolean> exitLearning(@RequestBody TSubjectRecord subjectRecord) {
- // 学习时长处理
- return R.ok(subjectRecordService.updateById(subjectRecord));
+ public R<Boolean> exitLearning(@RequestBody ExitLearnVO exitLearn) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userid = loginStudy.getUserid();
+ // 判断当前week和day是否已完成学习
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ throw new GlobalException("登录用户学习记录不存在！");
+ }
+ if (userStudy.getWeek().equals(exitLearn.getWeek()) && userStudy.getDay().equals(exitLearn.getDay())) {
+ // 计算完成率
+ int completionRate = exitLearn.getTopicIds().split(",").length * 5;
+ Integer type = exitLearn.getType();
+ // 更新用户学习完成率
+ LambdaUpdateChainWrapper<TUserStudy> wrapper = userStudyService.lambdaUpdate();
+ if (Constants.ONE.equals(type) && userStudy.getListen() < completionRate) {
+ // 听音选图
+ wrapper.set(TUserStudy::getListen, completionRate);
+ } else if (Constants.TWO.equals(type) && userStudy.getLook() < completionRate) {
+ // 看图选音
+ wrapper.set(TUserStudy::getLook, completionRate);
+ } else if (Constants.THREE.equals(type) && userStudy.getInduction() < completionRate) {
+ // 归纳排除
+ wrapper.set(TUserStudy::getInduction, completionRate);
+ } else if (Constants.FOUR.equals(type) && userStudy.getAnswer() < completionRate) {
+ // 有问有答
+ wrapper.set(TUserStudy::getAnswer, completionRate);
+ } else if (Constants.FIVE.equals(type) && userStudy.getPair() < completionRate) {
+ // 音图相配
+ wrapper.set(TUserStudy::getPair, completionRate);
+ }
+ wrapper.eq(TUserStudy::getUserId, userid).update();
+ }
+ return R.ok(subjectRecordService.exitLearning(exitLearn, userid));
}
/**
@@ -746,7 +824,8 @@
@ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
})
- public R<StudyListenResultVO> listenSelectPicture(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
+ public R<StudyListenResultVO> listenSelectPicture(@RequestParam Integer quarter, @RequestParam Integer week,
+ @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
// 非会员只能查看非会员题目，会员可以查看所有题目
@@ -776,7 +855,8 @@
@ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
})
- public R<StudyLookResultVO> pictureSelectVoice(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
+ public R<StudyLookResultVO> pictureSelectVoice(@RequestParam Integer quarter, @RequestParam Integer week,
+ @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
// 非会员只能查看非会员题目，会员可以查看所有题目
@@ -806,7 +886,8 @@
@ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
})
- public R<StudyInductionResultVO> induceExclude(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
+ public R<StudyInductionResultVO> induceExclude(@RequestParam Integer quarter, @RequestParam Integer week,
+ @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
// 非会员只能查看非会员题目，会员可以查看所有题目
@@ -836,7 +917,8 @@
@ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
})
- public R<StudyAnswerResultVO> questionsAndAnswers(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
+ public R<StudyAnswerResultVO> questionsAndAnswers(@RequestParam Integer quarter, @RequestParam Integer week,
+ @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
// 非会员只能查看非会员题目，会员可以查看所有题目
@@ -866,7 +948,8 @@
@ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
})
- public R<StudyPairResultVO> pictureMateVoice(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
+ public R<StudyPairResultVO> pictureMateVoice(@RequestParam Integer quarter, @RequestParam Integer week,
+ @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
// 非会员只能查看非会员题目，会员可以查看所有题目
@@ -891,50 +974,59 @@
@PostMapping("/completeLearning")
@ApiOperation(value = "完成学习", tags = {"学习端-听-自主学习"})
public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
// 登录用户id
- Integer userId = tokenService.getLoginUserStudy().getUserid();
+ Integer userId = userStudy.getUserid();
// 判断是否已完成该题组
boolean update = true;
- if (completeStudy.getIsComplete()) {
- List<Integer> studyIds = completeStudy.getStudyIds();
- Integer type = completeStudy.getType();
- int sum;
- if (Constants.ONE.equals(type)) {
- List<TStudyListen> studyListens = studyListenService.lambdaQuery().in(TStudyListen::getId, studyIds)
- .eq(TStudyListen::getDisabled, 0).list();
- sum = studyListens.stream().mapToInt(TStudyListen::getIntegral).sum();
- } else if (Constants.TWO.equals(type)) {
- List<TStudyLook> studyListens = studyLookService.lambdaQuery().in(TStudyLook::getId, studyIds)
- .eq(TStudyLook::getDisabled, 0).list();
- sum = studyListens.stream().mapToInt(TStudyLook::getIntegral).sum();
- } else if (Constants.THREE.equals(type)) {
- List<TStudyInduction> studyListens = studyInductionService.lambdaQuery().in(TStudyInduction::getId, studyIds)
- .eq(TStudyInduction::getDisabled, 0).list();
- sum = studyListens.stream().mapToInt(TStudyInduction::getIntegral).sum();
- } else if (Constants.FOUR.equals(type)) {
- List<TStudyAnswer> studyListens = studyAnswerService.lambdaQuery().in(TStudyAnswer::getId, studyIds)
- .eq(TStudyAnswer::getDisabled, 0).list();
- sum = studyListens.stream().mapToInt(TStudyAnswer::getIntegral).sum();
- } else if (Constants.FIVE.equals(type)) {
- List<TStudyPair> studyListens = studyPairService.lambdaQuery().in(TStudyPair::getId, studyIds)
- .eq(TStudyPair::getDisabled, 0).list();
- sum = studyListens.stream().mapToInt(TStudyPair::getIntegral).sum();
- } else {
- return R.fail("题目信息异常！");
- }
+ List<String> studyIds = Arrays.stream(completeStudy.getStudyIds().split(","))
+ .collect(Collectors.toList());
+ Integer type = completeStudy.getType();
+ // 可获取的总积分数量以及获取用户该学习已获取的积分数量，并计算本次可获取的剩余积分数量
+ int sum = studyService.computeTotalIntegral(studyIds, type, completeStudy.getAccuracy());
+ // 用户已获取的积分数量
+ int obtainedIntegral;
+ List<TUserStudyRecord> list = studyRecordService.lambdaQuery()
+ .eq(TUserStudyRecord::getQuarter, completeStudy.getQuarter())
+ .eq(TUserStudyRecord::getWeek, completeStudy.getWeek())
+ .eq(TUserStudyRecord::getDay, completeStudy.getDay())
+ .eq(TUserStudyRecord::getType, 0)
+ .eq(TUserStudyRecord::getUserId, userId).list();
+ if (list.isEmpty()) {
+ obtainedIntegral = 0;
+ } else {
+ obtainedIntegral = list.stream().map(TUserStudyRecord::getObtainedIntegral)
+ .mapToInt(Integer::intValue).sum();
+ }
+ // 计算本次可获取积分数量
+ if (sum > obtainedIntegral) {
+ int integral = sum - obtainedIntegral;
// 获取user详细信息，改变积分
TUser user = userService.getById(userId);
- user.setIntegral(user.getIntegral() + sum);
- update = userService.updateById(user);
+ int i = user.getIntegral() + integral;
+ update = userService.lambdaUpdate().eq(TUser::getId, userId).set(TUser::getIntegral, i).update();
// 生成积分明细记录
TIntegralRecord integralRecord = new TIntegralRecord();
- integralRecord.setIntegral(String.valueOf(sum));
+ integralRecord.setIntegral(String.valueOf(integral));
integralRecord.setMethod(Constants.COMPLETE_LEARNING);
integralRecord.setUserId(userId);
update = update && integralRecordService.save(integralRecord);
+ // 生成学习完成记录
+ TUserStudyRecord record = new TUserStudyRecord();
+ record.setUserId(userId);
+ record.setQuarter(completeStudy.getQuarter());
+ record.setWeek(completeStudy.getWeek());
+ record.setDay(completeStudy.getDay());
+ record.setObtainedIntegral(integral);
+ record.setType(Constants.ZERO);
+ update = update && studyRecordService.save(record);
}
// 学习配置列表
- List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0).orderByAsc(TStudy::getWeek).list();
+ List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .orderByAsc(TStudy::getWeek).list();
if (studyList.isEmpty()) {
throw new GlobalException("学习配置列表未配置或数据失效！");
}
@@ -956,7 +1048,12 @@
@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 quarter, @RequestParam Integer difficulty, @RequestParam Integer week) {
+ public R<StudyGameResultVO> gameHearing(@RequestParam Integer quarter, @RequestParam Integer difficulty,
+ @RequestParam Integer week) {
+ Integer[] array = {0, 1, 2};
+ if (!Arrays.stream(array).collect(Collectors.toList()).contains(difficulty)) {
+ throw new GlobalException("请选择符合规则的游戏难度！");
+ }
TGame game = gameService.gameHearing(quarter, week);
if (null == game) {
throw new GlobalException("当前季度该周目暂无配置游戏数据！");
@@ -977,21 +1074,9 @@
throw new GlobalException("当前周目下day1 - day5题目不足！");
}
// 根据游戏设置数量获取图片及语音
- List<String> subjectData = new ArrayList<>();
- Random random = new Random();
- // 获取列表大小
- int dataSize = newSubjectId.size();
- // 生成随机索引并获取数据
- for (int i = 0; i < game.getCount(); i++) {
- // 生成随机索引
- int randomIndex = random.nextInt(dataSize);
- // 获取对应的数据并加入结果列表
- subjectData.add(newSubjectId.get(randomIndex));
- newSubjectId.remove(randomIndex);
- dataSize = newSubjectId.size();
- }
+ List<String> subjectData = getData(game, newSubjectId);
List<TSubject> subjectList = getSubjectList(subjectData);
- return R.ok(new StudyGamerResultVO(game, subjectList));
+ return R.ok(new StudyGameResultVO(game, subjectList));
}
/**
@@ -1006,12 +1091,27 @@
@ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true),
@ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
})
- public R<StudyGamerResultVO> gameMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
+ public R<StudyGameMemoryVO> 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> subjectData = getSubjectData(game, subjectId);
+ List<TSubject> subjectList = getSubjectList(subjectData);
+ // 返回数据
+ List<GameMemoryPhotoVO> photoList = new ArrayList<>();
+ List<GameMemoryVoiceVO> voiceList = new ArrayList<>();
+ for (TSubject tSubject : subjectList) {
+ photoList.add(new GameMemoryPhotoVO(tSubject.getId(), tSubject.getImg()));
+ voiceList.add(new GameMemoryVoiceVO(tSubject.getId(), tSubject.getCorrect()));
+ }
+ // 框架记忆数量翻倍，前端需要根据数量画格子
+ game.setAnswerCount(game.getAnswerCount() * 2);
+ return R.ok(new StudyGameMemoryVO(game, photoList, voiceList));
+ }
+
+ private List<String> getSubjectData(TGame game, List<String> subjectId) {
List<String> newSubjectId = subjectId.stream().map(data -> {
if (data.startsWith(Constants.REDUCE)) {
data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
@@ -1023,6 +1123,10 @@
throw new GlobalException("当前周目下day1 - day5题目不足！");
}
// 根据游戏设置数量获取图片及语音
+ return getData(game, newSubjectId);
+ }
+
+ private List<String> getData(TGame game, List<String> newSubjectId) {
List<String> subjectData = new ArrayList<>();
Random random = new Random();
// 获取列表大小
@@ -1036,15 +1140,7 @@
newSubjectId.remove(randomIndex);
dataSize = newSubjectId.size();
}
- 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));
+ return subjectData;
}
private List<TSubject> getSubjectList(List<String> subjectData) {
@@ -1069,12 +1165,16 @@
@PostMapping("/gameAchievement")
@ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-听-自主游戏"})
public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
/*
* 游戏测试需要根据正确率计算本次测试可获得积分
* 并且需要判断如果该游戏用户已获取一部分积分，再次测试后正确率增长，只能获取高于上次正确率的部分积分
* 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
*/
- Integer userid = tokenService.getLoginUserStudy().getUserid();
+ Integer userid = userStudy.getUserid();
TGame game = gameService.lambdaQuery().eq(TGame::getId, completeStudy.getGameId()).eq(TGame::getDisabled, 0).one();
if (null == game) {
throw new GlobalException("游戏信息异常！");
@@ -1092,7 +1192,7 @@
} else {
throw new GlobalException("该次游戏积分计算异常！");
}
- int gameAvailableIntegral = integral * (completeStudy.getAccuracy() / 100);
+ int gameAvailableIntegral = (int) (integral * ((double) completeStudy.getAccuracy() / 100));
Integer availableIntegral = gameService.countIntegral(userid, game, completeStudy, gameAvailableIntegral, integralRecordList);
// 游戏测试记录
Boolean add = gameRecordService.add(completeStudy);
@@ -1150,15 +1250,14 @@
})
public R<StudyStoryListenResultVO> lookPictureDbu(@RequestParam Integer quarter, @RequestParam Integer week) {
// 看图配音信息
- TStoryListen listen = gettStoryListen(quarter, week);
- List<String> list = Arrays.asList(listen.getLookStory().split(","));
- List<TStory> subjectList;
- if (!list.isEmpty()) {
- subjectList = storyService.lambdaQuery().in(TStory::getId, list).eq(TStory::getDisabled, 0).list();
- } else {
- subjectList = new ArrayList<>();
- }
- return R.ok(new StudyStoryListenResultVO(listen, subjectList));
+ TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
+ // 题组信息
+ StudyStoryVO studyStory = new StudyStoryVO();
+ studyStory.setId(storyListen.getId());
+ studyStory.setIntegral(storyListen.getLookIntegral());
+ // 故事语音及图片信息
+ List<TStory> list = storyService.lookPictureDbu(storyListen, 0);
+ return R.ok(new StudyStoryListenResultVO(studyStory, list));
}
/**
@@ -1173,34 +1272,15 @@
@ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
})
public R<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
- TStoryListen listen = gettStoryListen(quarter, week);
- // 获取对应图片语音
- List<String> list = Arrays.asList(listen.getStory().split(","));
- List<TStory> subjectList;
- if (!list.isEmpty()) {
- 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;
+ TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
+ // 题组信息
+ StudyStoryVO studyStory = new StudyStoryVO();
+ studyStory.setId(storyListen.getId());
+ studyStory.setIntegral(storyListen.getIntegral());
+ // 故事语音及图片信息
+ List<TStory> list = storyService.lookPictureDbu(storyListen, 1);
+ return R.ok(new StudyStoryListenResultVO(studyStory, list));
}
/**
@@ -1209,27 +1289,63 @@
@GetMapping("/completeStory")
@ApiOperation(value = "完成故事学习", tags = {"学习端-听-自主故事"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "故事id", name = "storyId", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "故事id", name = "storyId", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "类型(1:看图配音；2:超级记忆)", name = "type", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "正确率", name = "accuracy", dataType = "Integer")
})
- public R<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId) {
- TStoryListen storyListen = storyListenService.lambdaQuery().eq(TStoryListen::getId, storyId).eq(TStoryListen::getDisabled, 0).one();
+ public R<Boolean> completeStory(@RequestParam Integer storyId, @RequestParam Integer type, Integer accuracy) {
+ TStoryListen storyListen = storyListenService.lambdaQuery().eq(TStoryListen::getId, storyId)
+ .eq(TStoryListen::getDisabled, 0).one();
if (null == storyListen) {
throw new GlobalException("当前故事学习失败，故事信息异常，请重试！");
}
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
// 用户信息
- Integer userId = tokenService.getLoginUserStudy().getUserid();
- // 故事只有首次才能获取积分
- TIntegralRecord integralRecord = integralRecordService.lambdaQuery().eq(TIntegralRecord::getUserId, userId)
- .eq(TIntegralRecord::getStoryId, storyId).eq(TIntegralRecord::getDisabled, 0).one();
+ Integer userId = userStudy.getUserid();
Boolean result = true;
- if (null == integralRecord) {
- // 添加积分明细记录
- result = integralRecordService.add(String.valueOf(integral), Constants.COMPLETE_STORY, null, storyId);
- TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
- // 添加积分
- user.setIntegral(user.getIntegral() + integral);
- result = result && userService.updateById(user);
+ if (Constants.ONE.equals(type)) {
+ if (null == accuracy) {
+ throw new GlobalException("自主故事-看图配音正确率异常！");
+ }
+ // 看图配音模式，也需要根据游戏正确率计算积分
+ int integral = storyListen.getLookIntegral() * (accuracy / 100);
+ int obtainedIntegral;
+ List<TUserStudyRecord> list = studyRecordService.lambdaQuery()
+ .eq(TUserStudyRecord::getStoryId, storyId)
+ .eq(TUserStudyRecord::getType, 1)
+ .eq(TUserStudyRecord::getUserId, userId).list();
+ if (list.isEmpty()) {
+ obtainedIntegral = 0;
+ } else {
+ obtainedIntegral = list.stream().map(TUserStudyRecord::getObtainedIntegral).mapToInt(Integer::intValue).sum();
+ }
+ // 可获得积分计算
+ if (integral > obtainedIntegral) {
+ TUserStudyRecord data = new TUserStudyRecord();
+ data.setUserId(userId);
+ data.setObtainedIntegral(integral - obtainedIntegral);
+ data.setType(Constants.ONE);
+ data.setStoryId(storyId);
+ result = studyRecordService.save(data);
+ }
+ } else {
+ // 超级记忆只有首次才能获取积分
+ TIntegralRecord integralRecord = integralRecordService.lambdaQuery()
+ .eq(TIntegralRecord::getUserId, userId)
+ .eq(TIntegralRecord::getStoryId, storyId)
+ .eq(TIntegralRecord::getDisabled, 0).one();
+ if (null == integralRecord) {
+ // 添加积分明细记录
+ result = integralRecordService.add(String.valueOf(storyListen.getIntegral()),
+ Constants.COMPLETE_STORY, null, storyId);
+ TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
+ // 添加积分
+ user.setIntegral(user.getIntegral() + storyListen.getIntegral());
+ result = result && userService.updateById(user);
+ }
}
return R.ok(result);
}
@@ -1237,8 +1353,11 @@
@GetMapping("/studyRecord")
@ApiOperation(value = "个人中心-学习记录", tags = {"学习端-个人中心"})
public R<StudyRecordResultVO> studyRecord() {
- Integer userId = tokenService.getLoginUserStudy().getUserid();
-
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userId = userStudy.getUserid();
// 学习记录
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
.eq(TUserStudy::getDisabled, 0).one();
--
Gitblit v1.7.1