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/controller/TStudyController.java | 278 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 174 insertions(+), 104 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 959c61a..0d2c86a 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,19 +4,21 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
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.domain.AjaxResult;
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.common.security.utils.SecurityUtils;
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.TGoodsVO;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.*;
import com.ruoyi.study.service.*;
import com.ruoyi.study.vo.*;
+import com.ruoyi.system.api.model.LoginUserParent;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
@@ -114,8 +116,8 @@
public R<PageInfo<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
PageInfo<TSubject> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
- if (StringUtils.hasLength(query.getName())){
- wrapper.like("name",query.getName());
+ if (StringUtils.hasLength(query.getName())) {
+ wrapper.like("name", query.getName());
}
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
@@ -352,8 +354,8 @@
.eq("type", 1));
studyListVO.setWeeks(count.size());
- // todo 补充开始学习人数
- studyListVO.setCount(0);
+ List<TUserStudy> list7 = userStudyService.list(new QueryWrapper<TUserStudy>());
+ studyListVO.setCount(list7.size());
studyListVO.setName("听");
// 查询听类型有多少周目
res.add(studyListVO);
@@ -391,6 +393,7 @@
return R.ok(res);
}
+
/**
* 通过类型、周目、day查询学习配置
*
@@ -399,11 +402,19 @@
@PostMapping("/getStudySet")
public R<StudyVO> getStudySet(@RequestBody StudyDTO dto) {
StudyVO res = new StudyVO();
- // todo 开始学习人数后续补充
- res.setCount(0);
+ List<TUserStudy> list7 = userStudyService.list(new QueryWrapper<TUserStudy>());
+ res.setCount(list7.size());
+ // 查询已有周目数量
int type = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())).size();
res.setWeeks(type);
+ List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
+ .eq("type", dto.getType())
+ .eq("week", dto.getWeek()));
+ if (!list8.isEmpty()){
+ res.setQuarter(list8.get(0).getQuarter());
+ res.setTitle(list8.get(0).getTitle());
+ }
List<StudyListenVO> listenVOS = new ArrayList<>();
List<GameVO> gameVOS = new ArrayList<>();
List<StoryVO> storyVOS = new ArrayList<>();
@@ -535,6 +546,8 @@
.eq("week", week));
for (TStoryListen tStory : list6) {
StoryVO storyVO = new StoryVO();
+ storyVO.setStory(tStory.getStory());
+ storyVO.setLookStory(tStory.getLookStory());
StringBuilder names = new StringBuilder();
StringBuilder names1 = new StringBuilder();
StringBuilder sort = new StringBuilder();
@@ -556,38 +569,12 @@
storyVO.setName(names.substring(0, names.length() - 1));
storyVO.setSort(sort.substring(0, sort.length() - 1));
storyVO.setIntegral(tStory.getIntegral());
- storyVO.setLookName(names1.substring(0, names.length() - 1));
- storyVO.setLookSort(sort1.substring(0, sort.length() - 1));
+ storyVO.setLookName(names1.substring(0, names1.length() - 1));
+ storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
storyVO.setLookIntegral(tStory.getLookIntegral());
storyVOS.add(storyVO);
}
- int temp = 0;
- if (!list.isEmpty()) {
- temp = list.get(0).getStudyId();
- }
- if (!list1.isEmpty()) {
- temp = list1.get(0).getStudyId();
- }
- if (!list2.isEmpty()) {
- temp = list2.get(0).getStudyId();
- }
- if (!list3.isEmpty()) {
- temp = list3.get(0).getStudyId();
- }
- if (!list4.isEmpty()) {
- temp = list4.get(0).getStudyId();
- }
- if (!list5.isEmpty()) {
- temp = list5.get(0).getStudyId();
- }
- if (!list6.isEmpty()) {
- temp = list6.get(0).getStudyId();
- }
- if (temp == 0) {
- res.setTitle("");
- } else {
- res.setTitle(studyService.getById(temp).getTitle());
- }
+
res.setAnswer(answerVOS);
res.setPair(pairVOS);
res.setListen(listenVOS);
@@ -606,9 +593,13 @@
*/
@GetMapping("/weekList")
@ApiOperation(value = "周目列表", tags = {"周目列表"})
- public R<List<StudyWeekDTO>> weekList(@RequestParam(defaultValue = "1") Integer type, @RequestParam Integer quarter) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "所属类型", name = "type", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true)
+ })
+ public AjaxResult<List<StudyWeekDTO>> weekList(@RequestParam(defaultValue = "1") Integer type, @RequestParam Integer quarter) {
List<StudyWeekDTO> result = studyService.weekList(type, quarter);
- return R.ok(result);
+ return AjaxResult.success(result);
}
/**
@@ -619,9 +610,13 @@
*/
@GetMapping("/studySchedule")
@ApiOperation(value = "获取用户学习进度", tags = {"获取用户学习进度"})
- public R<TUserStudy> studySchedule(Integer week, Integer day) {
- TUserStudy result = studyService.studySchedule(String.valueOf(SecurityUtils.getUserId()), week, day);
- return R.ok(result);
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public AjaxResult<TUserStudy> studySchedule(@RequestParam Integer week, @RequestParam Integer day) {
+ TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week, day);
+ return AjaxResult.success(result);
}
/**
@@ -629,8 +624,8 @@
*/
@GetMapping("/goodRecommend")
@ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
- public R<List<TGoodsVO>> studySchedule() {
- return goodsClient.goodRecommend(String.valueOf(SecurityUtils.getUserId()));
+ public AjaxResult<List<TGoodsVO>> studySchedule() {
+ return AjaxResult.success(goodsClient.goodRecommend());
}
/**
@@ -638,9 +633,9 @@
*/
@PostMapping("/exitLearning")
@ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"退出学习(记录学习进度等信息)"})
- public R<Boolean> exitLearning(@RequestBody TUserStudy userStudy) {
+ public AjaxResult<Boolean> exitLearning(@RequestBody TUserStudy userStudy) {
// 学习时长处理
- return R.ok(userStudyService.updateById(userStudy));
+ return AjaxResult.success(userStudyService.updateById(userStudy));
}
/**
@@ -651,12 +646,21 @@
*/
@GetMapping("/listenSelectPicture")
@ApiOperation(value = "自主学习1-听音选图", tags = {"自主学习1-听音选图"})
- public R<Map<String, Object>> listenSelectPicture(@RequestParam Integer week, @RequestParam Integer day) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyListenResultVO> listenSelectPicture(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
- List<TStudyListen> studyListens = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
- .eq(TStudyListen::getDay, day).eq(TStudyListen::getDisabled, 0).list();
- return R.ok(studyService.listenSelectPicture(week, day, studyListens));
+ LambdaQueryChainWrapper<TStudyListen> wrapper = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
+ .eq(TStudyListen::getDay, day).eq(TStudyListen::getDisabled, 0);
+ // 非会员只能查看非会员题目，会员可以查看所有题目
+ if (!isVip) {
+ wrapper.eq(TStudyListen::getIsVip, 0);
+ }
+ List<TStudyListen> studyListens = wrapper.list();
+ return AjaxResult.success(studyService.listenSelectPicture(week, day, studyListens));
}
/**
@@ -667,7 +671,11 @@
*/
@GetMapping("/pictureSelectVoice")
@ApiOperation(value = "自主学习2-看图选音", tags = {"自主学习2-看图选音"})
- public R<Map<String, Object>> pictureSelectVoice(@RequestParam Integer week, @RequestParam Integer day) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyLookResultVO> pictureSelectVoice(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
LambdaQueryChainWrapper<TStudyLook> wrapper = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
@@ -678,7 +686,7 @@
}
List<TStudyLook> lookList = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
.eq(TStudyLook::getDay, day).eq(TStudyLook::getDisabled, 0).list();
- return R.ok(studyService.pictureSelectVoice(week, day, lookList));
+ return AjaxResult.success(studyService.pictureSelectVoice(week, day, lookList));
}
/**
@@ -689,7 +697,11 @@
*/
@GetMapping("/induceExclude")
@ApiOperation(value = "自主学习3-归纳排除", tags = {"自主学习3-归纳排除"})
- public R<Map<String, Object>> induceExclude(@RequestParam Integer week, @RequestParam Integer day) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyInductionResultVO> induceExclude(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
LambdaQueryChainWrapper<TStudyInduction> wrapper = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
@@ -699,7 +711,7 @@
wrapper.eq(TStudyInduction::getIsVip, 0);
}
List<TStudyInduction> inductionList = wrapper.list();
- return R.ok(studyService.induceExclude(week, day, inductionList));
+ return AjaxResult.success(studyService.induceExclude(week, day, inductionList));
}
/**
@@ -710,7 +722,11 @@
*/
@GetMapping("/questionsAndAnswers")
@ApiOperation(value = "自主学习4-有问有答", tags = {"自主学习4-有问有答"})
- public R<Map<String, Object>> questionsAndAnswers(@RequestParam Integer week, @RequestParam Integer day) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyAnswerResultVO> questionsAndAnswers(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
LambdaQueryChainWrapper<TStudyAnswer> wrapper = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
@@ -720,7 +736,7 @@
wrapper.eq(TStudyAnswer::getIsVip, 0);
}
List<TStudyAnswer> answerList = wrapper.list();
- return R.ok(studyService.questionsAndAnswers(week, day, answerList));
+ return AjaxResult.success(studyService.questionsAndAnswers(week, day, answerList));
}
/**
@@ -731,11 +747,21 @@
*/
@GetMapping("/pictureMateVoice")
@ApiOperation(value = "自主学习5-音图相配", tags = {"自主学习5-音图相配"})
- public R<Map<String, Object>> pictureMateVoice(@RequestParam Integer week, @RequestParam Integer day) {
- // 判断当前登录用户是否为 会员 todo
- TStudyPair pair = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
- .eq(TStudyPair::getDay, day).eq(TStudyPair::getDisabled, 0).one();
- return R.ok(studyService.pictureMateVoice(week, day, pair));
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyPairResultVO> pictureMateVoice(@RequestParam Integer week, @RequestParam Integer day) {
+ // 判断当前登录用户是否为 会员
+ Boolean isVip = userService.isVip();
+ LambdaQueryChainWrapper<TStudyPair> wrapper = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
+ .eq(TStudyPair::getDay, day).eq(TStudyPair::getDisabled, 0);
+ // 非会员只能查看非会员题目，会员可以查看所有题目
+ if (!isVip) {
+ wrapper.eq(TStudyPair::getIsVip, 0);
+ }
+ TStudyPair pair = wrapper.one();
+ return AjaxResult.success(studyService.pictureMateVoice(week, day, pair));
}
/**
@@ -746,13 +772,15 @@
*/
@GetMapping("/gameHearing")
@ApiOperation(value = "自主游戏1-超级听力", tags = {"自主游戏1-超级听力(difficulty: 0入门、1中级、2高级)"})
- public R<Map<String, Object>> gameHearing(@RequestParam Integer difficulty, @RequestParam Integer week) {
- Map<String, Object> result = new HashMap<>(8);
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "难度(0入门、1中级、2困难)", name = "difficulty", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyGamerResultVO> gameHearing(@RequestParam Integer difficulty, @RequestParam Integer week) {
TGame game = gameService.lambdaQuery().eq(TGame::getWeek, week)
.eq(TGame::getDisabled, 0).one();
game.setIntegral(game.getIntegral().split(",")[difficulty]);
game.setTime(game.getTime().split(",")[difficulty]);
- result.put("game", game);
// 检验是否完成难度
studyService.checkDifficulty(difficulty, week, game);
List<String> subjectId = getSubjectId(week);
@@ -772,8 +800,8 @@
// 获取对应的数据并加入结果列表
subjectData.add(subjectId.get(randomIndex));
}
- result.put("subject", subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list());
- return R.ok(result);
+ return AjaxResult.success(new StudyGamerResultVO(game,
+ subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
}
/**
@@ -784,10 +812,12 @@
*/
@GetMapping("/gameMemory")
@ApiOperation(value = "自主游戏2-超级记忆", tags = {"自主游戏2-超级记忆(difficulty: 0入门、1中级、2高级)"})
- public R<Map<String, Object>> gameMemory(@RequestParam Integer difficulty, @RequestParam Integer week) {
- Map<String, Object> result = new HashMap<>(8);
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "难度(0入门、1中级、2困难)", name = "difficulty", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyGamerResultVO> gameMemory(@RequestParam Integer difficulty, @RequestParam Integer week) {
TGame game = gameService.lambdaQuery().eq(TGame::getWeek, week).eq(TGame::getDisabled, 0).one();
- result.put("game", game);
// 检验是否完成难度
studyService.checkDifficulty(difficulty, week, game);
List<String> subjectId = getSubjectId(week);
@@ -807,8 +837,8 @@
// 获取对应的数据并加入结果列表
subjectData.add(subjectId.get(randomIndex));
}
- result.put("subject", subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list());
- return R.ok(result);
+ return AjaxResult.success(new StudyGamerResultVO(game,
+ subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
}
/**
@@ -819,14 +849,14 @@
*/
@PostMapping("/gameAchievement")
@ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"完成游戏-记录游戏测试成绩"})
- public R<?> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ public AjaxResult<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
TGame game = gameService.getById(completeStudy.getGameId());
// 游戏测试记录
Boolean add = gameRecordService.add(completeStudy);
// 添加积分明细记录
add = add && integralRecordService.add(game.getIntegral(), completeStudy.getMethod());
// 用户账户添加积分
- return R.ok(add);
+ return AjaxResult.success(add);
}
private List<String> getSubjectId(Integer week) {
@@ -861,15 +891,16 @@
*/
@GetMapping("/lookPictureDbu")
@ApiOperation(value = "自主故事1-看图配音", tags = {"自主故事1-看图配音"})
- public R<Map<String, Object>> lookPictureDbu(@RequestParam Integer week) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyStoryListenResultVO> lookPictureDbu(@RequestParam Integer week) {
// 看图配音信息
TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
// 获取对应图片语音
List<String> list = Arrays.asList(listen.getLookStory().split(","));
- Map<String, Object> result = new HashMap<>(8);
- result.put("listen", listen);
- result.put("info", subjectService.lambdaQuery().in(TSubject::getId, list).list());
- return R.ok(result);
+ return AjaxResult.success(new StudyStoryListenResultVO(listen,
+ subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
}
/**
@@ -879,15 +910,16 @@
*/
@GetMapping("/frameworkMemory")
@ApiOperation(value = "自主故事2-框架记忆", tags = {"自主故事2-框架记忆"})
- public R<Map<String, Object>> frameworkMemory(@RequestParam Integer week) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
+ })
+ public AjaxResult<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer week) {
// 看图配音信息
TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
// 获取对应图片语音
List<String> list = Arrays.asList(listen.getStory().split(","));
- Map<String, Object> result = new HashMap<>(8);
- result.put("listen", listen);
- result.put("info", subjectService.lambdaQuery().in(TSubject::getId, list).list());
- return R.ok(result);
+ return AjaxResult.success(new StudyStoryListenResultVO(listen,
+ subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
}
/**
@@ -896,10 +928,10 @@
* @param completeStudy 完成学习信息
*/
@PostMapping("/completeLearning")
- @ApiOperation(value = "完成学习", tags = {"完成学习"})
- public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
+ @ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
+ public AjaxResult<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
// 登录用户id
- Long userId = SecurityUtils.getUserId();
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
// 获取user详细信息，改变积分
TUser user = userService.getById(userId);
user.setIntegral(user.getIntegral() + completeStudy.getIntegral());
@@ -908,8 +940,8 @@
TIntegralRecord integralRecord = new TIntegralRecord();
integralRecord.setIntegral(String.valueOf(completeStudy.getIntegral()));
integralRecord.setMethod(completeStudy.getMethod());
- integralRecord.setUserId(SecurityUtils.getUserId().intValue());
- return R.ok(update && integralRecordService.save(integralRecord));
+ integralRecord.setUserId(userId);
+ return AjaxResult.success(update && integralRecordService.save(integralRecord));
}
/**
@@ -917,38 +949,47 @@
*/
@GetMapping("/completeStory")
@ApiOperation(value = "完成故事学习", tags = {"完成故事学习"})
- public R<?> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId,
- @RequestParam @ApiParam("完成答题/完成听故事") String method) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "故事id", name = "storyId", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "完成答题/完成听故事", name = "method", dataType = "String", required = true)
+ })
+ public AjaxResult<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId,
+ @RequestParam String method) {
// 添加积分明细记录
Boolean add = integralRecordService.add(String.valueOf(integral), method);
// 用户信息
- Long userId = SecurityUtils.getUserId();
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
// 返回结果
user.setIntegral(user.getIntegral() + integral);
- return R.ok(add && userService.updateById(user));
+ return AjaxResult.success(add && userService.updateById(user));
}
@GetMapping("/studyRecord")
@ApiOperation(value = "个人中心-学习记录", tags = {"个人中心-学习记录"})
- public R<Map<String, Object>> studyRecord() {
- Long userId = SecurityUtils.getUserId();
- Map<String, Object> result = new HashMap<>(8);
+ public AjaxResult<StudyRecordResultVO> studyRecord() {
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
// 学习记录
- result.put("record", userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
- .eq(TUserStudy::getDisabled, 0).one());
+ TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
+ .eq(TUserStudy::getDisabled, 0).one();
// 游戏测试成绩
- result.put("gameAchievement", gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
- .eq(TGameRecord::getDisabled, 0).list());
- return R.ok(result);
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
+ .eq(TGameRecord::getDisabled, 0).list();
+ return AjaxResult.success(new StudyRecordResultVO(studyRecord,gameRecordList));
}
@GetMapping("/integralDetail")
@ApiOperation(value = "个人中心-积分明细", tags = {"个人中心-积分明细"})
- public R<IPage<TIntegralRecord>> integralDetail(String time,
- @RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize) {
- return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), SecurityUtils.getUserId(), time));
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "查询时间", name = "time", dataType = "Integer"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
+ })
+ public AjaxResult<IPage<TIntegralRecord>> integralDetail(String time,
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
+ return AjaxResult.success(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUserStudy().getUserid(), time));
}
/**
@@ -959,14 +1000,43 @@
*/
@GetMapping("/addIntegralDetail")
@ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "变动源(完成学习、完成游戏...)", name = "method", dataType = "String", required = true)
+ })
public R<Boolean> addIntegralDetail(@RequestParam("integral") String integral, @RequestParam("method") String method) {
+ // 当前登录用户
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ // 生成积分明细信息
TIntegralRecord integralRecord = new TIntegralRecord();
integralRecord.setIntegral(integral);
integralRecord.setMethod(method);
- integralRecord.setUserId(SecurityUtils.getUserId().intValue());
+ integralRecord.setUserId(userStudy.getUserid());
integralRecord.setDisabled(Boolean.FALSE);
+ integralRecord.setCreateBy(userStudy.getPhone());
+ integralRecord.setCreateTime(new Date());
+ integralRecord.setUpdateBy(userStudy.getPhone());
+ integralRecord.setUpdateTime(new Date());
return R.ok(integralRecordService.save(integralRecord));
}
+ /**
+ * 用户积分变动(增加或减少)-用于远程调用
+ *
+ * @param integral 积分变动信息
+ * @param method 变动源
+ */
+ @GetMapping("/exchangeIntegral")
+ @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ public R<Boolean> exchangeIntegral(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
+ TUser user = userService.getById(tokenService.getLoginUserStudy().getUserid());
+ if (Constants.BURDEN.equals(method)) {
+ user.setIntegral(user.getIntegral() - integral);
+ } else {
+ user.setIntegral(user.getIntegral() + integral);
+ }
+ return R.ok(userService.updateById(user));
+ }
+
}
--
Gitblit v1.7.1