From f991c73f56f35665bcbe8ce2252c04ea82032b10 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期一, 27 五月 2024 18:06:31 +0800
Subject: [PATCH] feat: 修复登录bug;数据校验规则优化
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 560 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 373 insertions(+), 187 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 3a3babb..43045c2 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,28 +4,31 @@
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.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.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -74,6 +77,8 @@
private ITUserService userService;
@Resource
private TokenService tokenService;
+ @Resource
+ private ITSubjectRecordService subjectRecordService;
@PostMapping("/storyList")
@ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
@@ -116,8 +121,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());
@@ -175,6 +180,9 @@
TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
.eq("week", week)
.eq("type", type));
+ one.setQuarter(dto.getQuarter());
+ one.setTitle(dto.getTitle());
+ studyService.updateById(one);
GameDTO game = dto.getGame();
StoryListenDTO storyListen = dto.getStoryListen();
if (day == 6) {
@@ -268,6 +276,7 @@
TStudyLook tStudyLook = new TStudyLook();
tStudyLook.setStudyId(one.getId());
tStudyLook.setDay(day);
+ tStudyLook.setSort(studyLookDTO.getSort());
tStudyLook.setSubject(studyLookDTO.getSubject());
tStudyLook.setIntegral(studyLookDTO.getIntegral());
tStudyLook.setWeek(week);
@@ -287,6 +296,7 @@
tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
tStudyInduction.setWeek(week);
tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
+ studyInductionService.save(tStudyInduction);
}
studyAnswerService.remove(new QueryWrapper<TStudyAnswer>()
.eq("studyId", one.getId())
@@ -332,12 +342,23 @@
*/
@PostMapping("/addWeek")
public R<Object> addWeek(@RequestBody AddWeekDTO dto) {
- TStudy tStudy = new TStudy();
- tStudy.setType(dto.getType());
- tStudy.setWeek(dto.getWeek());
- tStudy.setTitle(dto.getTitle());
- tStudy.setQuarter(dto.getQuarter());
- studyService.save(tStudy);
+ TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
+ .eq("week", dto.getWeek())
+ .eq("type", dto.getType()));
+ if (one != null) {
+ one.setType(dto.getType());
+ one.setWeek(dto.getWeek());
+ one.setTitle(dto.getTitle());
+ one.setQuarter(dto.getQuarter());
+ studyService.saveOrUpdate(one);
+ } else {
+ TStudy tStudy = new TStudy();
+ tStudy.setType(dto.getType());
+ tStudy.setWeek(dto.getWeek());
+ tStudy.setTitle(dto.getTitle());
+ tStudy.setQuarter(dto.getQuarter());
+ studyService.saveOrUpdate(tStudy);
+ }
return R.ok();
}
@@ -354,8 +375,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);
@@ -393,6 +414,7 @@
return R.ok(res);
}
+
/**
* 通过类型、周目、day查询学习配置
*
@@ -401,11 +423,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<>();
@@ -424,14 +454,19 @@
for (TStudyListen tStudyListen : list) {
StringBuilder temp = new StringBuilder();
StudyListenVO studyListenVO = new StudyListenVO();
- for (String s : tStudyListen.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- temp.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyListen.getSubject())) {
+ for (String s : tStudyListen.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ temp.append(byId.getName()).append(",");
+ }
+ String string = temp.toString();
+ studyListenVO.setName(string.substring(0, string.length() - 1));
+ studyListenVO.setIntegral(tStudyListen.getIntegral());
+ studyListenVO.setSubject(tStudyListen.getSubject());
+ studyListenVO.setIsVip(tStudyListen.getIsVip());
+ listenVOS.add(studyListenVO);
}
- String string = temp.toString();
- studyListenVO.setName(string.substring(0, string.length() - 1));
- studyListenVO.setIntegral(tStudyListen.getIntegral());
- listenVOS.add(studyListenVO);
+
}
// 看音选图
List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
@@ -443,20 +478,25 @@
StringBuilder names = new StringBuilder();
StringBuilder sorts = new StringBuilder();
StudyLookVO studyLookVO1 = new StudyLookVO();
- for (String s : tStudyLook.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
- String[] split = tStudyLook.getSort().split(",");
- String s1 = split[index];
- sorts.append(s1).append(",");
- index++;
+ if (StringUtils.hasLength(tStudyLook.getSubject())) {
+ for (String s : tStudyLook.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ names.append(byId.getName()).append(",");
+ String[] split = tStudyLook.getSort().split(",");
+ String s1 = split[index];
+ sorts.append(s1).append(",");
+ index++;
+ }
+ String string = names.toString();
+ String string1 = sorts.toString();
+ studyLookVO1.setName(string.substring(0, string.length() - 1));
+ studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
+ studyLookVO1.setIntegral(tStudyLook.getIntegral());
+ studyLookVO1.setSubject(tStudyLook.getSubject());
+ studyLookVO1.setIsVip(tStudyLook.getIsVip());
+ lookVOS.add(studyLookVO1);
}
- String string = names.toString();
- String string1 = sorts.toString();
- studyLookVO1.setName(string.substring(0, string.length() - 1));
- studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
- studyLookVO1.setIntegral(tStudyLook.getIntegral());
- lookVOS.add(studyLookVO1);
+
}
// 归纳排除
List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
@@ -466,20 +506,20 @@
for (TStudyInduction tStudyInduction : list2) {
StringBuilder names = new StringBuilder();
StudyInductionVO studyInductionVO = new StudyInductionVO();
- for (String s : tStudyInduction.getSubject().split(",")) {
- String replace = s.replace("-", "");
- if (s.contains("-")) {
+ if (StringUtils.hasLength(tStudyInduction.getSubject())) {
+ for (String s : tStudyInduction.getSubject().split(",")) {
+ String replace = s.replace("-", "");
TSubject byId = subjectService.getById(replace);
- names.append("-").append(byId.getName()).append(",");
- } else {
- TSubject byId = subjectService.getById(s);
names.append(byId.getName()).append(",");
}
+ String string = names.toString();
+ studyInductionVO.setName(string.substring(0, string.length() - 1));
+ studyInductionVO.setIntegral(tStudyInduction.getIntegral());
+ studyInductionVO.setSubject(tStudyInduction.getSubject());
+ studyInductionVO.setIsVip(tStudyInduction.getIsVip());
+ inductionVOS.add(studyInductionVO);
}
- String string = names.toString();
- studyInductionVO.setName(string.substring(0, string.length() - 1));
- studyInductionVO.setIntegral(tStudyInduction.getIntegral());
- inductionVOS.add(studyInductionVO);
+
}
// 有问有答
List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
@@ -488,21 +528,37 @@
for (TStudyAnswer tStudyAnswer : list3) {
StringBuilder names = new StringBuilder();
StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
- if (tStudyAnswer.getIsAnswer() == 1) {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append("-").append(byId.getName()).append(",");
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append("-").append(byId1.getName()).append(",");
- } else {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append(byId.getName()).append(",");
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append("-").append(byId1.getName()).append(",");
+ if (tStudyAnswer.getIsAnswer() != null) {
+ if (tStudyAnswer.getIsAnswer() == 1) {
+ if (tStudyAnswer.getSubject() != null) {
+ TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
+ names.append(byId.getName()).append(",");
+ }
+ if (tStudyAnswer.getAnswerSubject() != null) {
+ TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
+ names.append(byId1.getName()).append(",");
+ }
+ } else {
+ if (tStudyAnswer.getSubject() != null) {
+ TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
+ names.append(byId.getName()).append(",");
+ }
+ if (tStudyAnswer.getAnswerSubject() != null) {
+ TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
+ names.append(byId1.getName()).append(",");
+ }
+ }
}
- String string = names.toString();
- studyAnswerVO.setName(string.substring(0, string.length() - 1));
- studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
- answerVOS.add(studyAnswerVO);
+ if (StringUtils.hasLength(names)) {
+ String string = names.toString();
+ studyAnswerVO.setName(string.substring(0, string.length() - 1));
+ studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
+ studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
+ studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
+ studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
+ answerVOS.add(studyAnswerVO);
+ }
+
}
// 音图相配
List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
@@ -512,14 +568,19 @@
for (TStudyPair tStudyPair : list4) {
StringBuilder names = new StringBuilder();
StudyPairVO studyPairVO = new StudyPairVO();
- for (String s : tStudyPair.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyPair.getSubject())) {
+ for (String s : tStudyPair.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ names.append(byId.getName()).append(",");
+ }
+ String string = names.toString();
+ studyPairVO.setName(string.substring(0, string.length() - 1));
+ studyPairVO.setIntegral(tStudyPair.getIntegral());
+ studyPairVO.setSubject(tStudyPair.getSubject());
+ studyPairVO.setIsVip(tStudyPair.getIsVip());
+ pairVOS.add(studyPairVO);
}
- String string = names.toString();
- studyPairVO.setName(string.substring(0, string.length() - 1));
- studyPairVO.setIntegral(tStudyPair.getIntegral());
- pairVOS.add(studyPairVO);
+
}
List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
.eq("week", week));
@@ -537,58 +598,52 @@
.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();
StringBuilder sort1 = new StringBuilder();
- for (String s : tStory.getStory().split(",")) {
- TStory byId = storyService.getById(s);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStory.getStory())) {
+ for (String s : tStory.getStory().split(",")) {
+ TStory byId = storyService.getById(s);
+ names.append(byId.getName()).append(",");
+ }
}
- for (String s : tStory.getLookStory().split(",")) {
- TStory byId = storyService.getById(s);
- names1.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStory.getLookStory())) {
+ for (String s : tStory.getLookStory().split(",")) {
+ TStory byId = storyService.getById(s);
+ names1.append(byId.getName()).append(",");
+ }
}
- for (String s : tStory.getSort().split(",")) {
- sort.append(s).append(",");
+ if (StringUtils.hasLength(tStory.getSort())) {
+ for (String s : tStory.getSort().split(",")) {
+ sort.append(s).append(",");
+ }
}
- for (String s : tStory.getLookSort().split(",")) {
- sort1.append(s).append(",");
+ if (StringUtils.hasLength(tStory.getLookSort())) {
+ for (String s : tStory.getLookSort().split(",")) {
+ sort1.append(s).append(",");
+ }
}
- storyVO.setName(names.substring(0, names.length() - 1));
- storyVO.setSort(sort.substring(0, sort.length() - 1));
+ if (StringUtils.hasLength(names)) {
+ storyVO.setName(names.substring(0, names.length() - 1));
+
+ }
+ if (StringUtils.hasLength(sort)) {
+ storyVO.setSort(sort.substring(0, sort.length() - 1));
+
+ }
+ if (StringUtils.hasLength(names1)) {
+ storyVO.setLookName(names1.substring(0, names1.length() - 1));
+
+ }
+ if (StringUtils.hasLength(sort1)) {
+ storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
+ }
storyVO.setIntegral(tStory.getIntegral());
- storyVO.setLookName(names1.substring(0, names.length() - 1));
- storyVO.setLookSort(sort1.substring(0, sort.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);
@@ -607,7 +662,11 @@
* @param quarter 季度
*/
@GetMapping("/weekList")
- @ApiOperation(value = "周目列表", tags = {"周目列表"})
+ @ApiOperation(value = "根据季度获取周目列表", tags = {"根据季度获取周目列表"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "所属类型", name = "type", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true)
+ })
public R<List<StudyWeekDTO>> weekList(@RequestParam(defaultValue = "1") Integer type, @RequestParam Integer quarter) {
List<StudyWeekDTO> result = studyService.weekList(type, quarter);
return R.ok(result);
@@ -621,8 +680,12 @@
*/
@GetMapping("/studySchedule")
@ApiOperation(value = "获取用户学习进度", tags = {"获取用户学习进度"})
- public R<TUserStudy> studySchedule(Integer week, Integer day) {
- TUserStudy result = studyService.studySchedule(String.valueOf(SecurityUtils.getUserId()), week, day);
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public R<TUserStudy> studySchedule(@RequestParam Integer week, @RequestParam Integer day) {
+ TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week, day);
return R.ok(result);
}
@@ -632,7 +695,25 @@
@GetMapping("/goodRecommend")
@ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
public R<List<TGoodsVO>> studySchedule() {
- return goodsClient.goodRecommend(String.valueOf(SecurityUtils.getUserId()));
+ return R.ok(goodsClient.goodRecommend().getData());
+ }
+
+ /**
+ * 进入题组后，获取题组学习进度信息
+ *
+ * @param week 周目
+ * @param day 所属day
+ */
+ @GetMapping("/teamSchedule")
+ @ApiOperation(value = "获取题组学习进度信息", tags = {"获取题组学习进度信息"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", 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);
}
/**
@@ -640,9 +721,9 @@
*/
@PostMapping("/exitLearning")
@ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"退出学习(记录学习进度等信息)"})
- public R<Boolean> exitLearning(@RequestBody TUserStudy userStudy) {
+ public R<Boolean> exitLearning(@RequestBody TSubjectRecord subjectRecord) {
// 学习时长处理
- return R.ok(userStudyService.updateById(userStudy));
+ return R.ok(subjectRecordService.updateById(subjectRecord));
}
/**
@@ -653,11 +734,20 @@
*/
@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 R<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();
+ 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 R.ok(studyService.listenSelectPicture(week, day, studyListens));
}
@@ -669,7 +759,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 R<StudyLookResultVO> pictureSelectVoice(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
LambdaQueryChainWrapper<TStudyLook> wrapper = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
@@ -691,7 +785,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 R<StudyInductionResultVO> induceExclude(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
LambdaQueryChainWrapper<TStudyInduction> wrapper = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
@@ -712,7 +810,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 R<StudyAnswerResultVO> questionsAndAnswers(@RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
LambdaQueryChainWrapper<TStudyAnswer> wrapper = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
@@ -733,11 +835,46 @@
*/
@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();
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ })
+ public R<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 R.ok(studyService.pictureMateVoice(week, day, pair));
+ }
+
+ /**
+ * 学习完成，生成学习记录，积分明细记录
+ *
+ * @param completeStudy 完成学习信息
+ */
+ @PostMapping("/completeLearning")
+ @ApiOperation(value = "完成学习", tags = {"完成学习"})
+ public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
+ // 登录用户id
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
+ // 获取user详细信息，改变积分
+ boolean update = true;
+ if (completeStudy.getIsComplete()) {
+ TUser user = userService.getById(userId);
+ user.setIntegral(user.getIntegral() + completeStudy.getIntegral());
+ update = userService.updateById(user);
+ }
+ // 生成积分明细记录
+ TIntegralRecord integralRecord = new TIntegralRecord();
+ integralRecord.setIntegral(String.valueOf(completeStudy.getIntegral()));
+ integralRecord.setMethod(completeStudy.getMethod());
+ integralRecord.setUserId(userId);
+ return R.ok(update && integralRecordService.save(integralRecord));
}
/**
@@ -748,13 +885,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 R<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);
@@ -774,8 +913,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 R.ok(new StudyGamerResultVO(game,
+ subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
}
/**
@@ -786,10 +925,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 R<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);
@@ -809,8 +950,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 R.ok(new StudyGamerResultVO(game,
+ subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
}
/**
@@ -821,13 +962,28 @@
*/
@PostMapping("/gameAchievement")
@ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"完成游戏-记录游戏测试成绩"})
- public R<?> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ /*
+ * 游戏测试需要根据正确率计算本次测试可获得积分
+ * 并且需要判断如果该游戏用户已获取一部分积分，再次测试后正确率增长，只能获取高于上次正确率的部分积分
+ * 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
+ */
+ Integer userid = tokenService.getLoginUserStudy().getUserid();
TGame game = gameService.getById(completeStudy.getGameId());
+ // 积分明细
+ 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);
// 游戏测试记录
Boolean add = gameRecordService.add(completeStudy);
- // 添加积分明细记录
- add = add && integralRecordService.add(game.getIntegral(), completeStudy.getMethod());
- // 用户账户添加积分
+ // 可获得积分不为null时，才添加积分明细记录
+ if (null != availableIntegral) {
+ add = add && integralRecordService.add(String.valueOf(availableIntegral), completeStudy.getMethod(), completeStudy.getGameId(), null);
+ // 用户账户添加积分
+ TUser user = userService.getById(userid);
+ user.setIntegral(user.getIntegral() + availableIntegral);
+ add = add && userService.updateById(user);
+ }
return R.ok(add);
}
@@ -852,6 +1008,7 @@
subjectId.addAll(Arrays.asList(subject.split(",")));
}
redisService.setCacheList(RedisConstants.HEARING_TREE, subjectId);
+ redisService.expire(RedisConstants.HEARING_TREE, RedisConstants.THIRTY, TimeUnit.MINUTES);
}
return subjectId;
}
@@ -863,15 +1020,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 R<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 R.ok(new StudyStoryListenResultVO(listen,
+ subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
}
/**
@@ -881,37 +1039,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 R<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);
- }
-
- /**
- * 学习完成，生成学习记录，积分明细记录
- *
- * @param completeStudy 完成学习信息
- */
- @PostMapping("/completeLearning")
- @ApiOperation(value = "完成学习", tags = {"完成学习"})
- public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
- // 登录用户id
- Long userId = SecurityUtils.getUserId();
- // 获取user详细信息，改变积分
- TUser user = userService.getById(userId);
- user.setIntegral(user.getIntegral() + completeStudy.getIntegral());
- boolean update = userService.updateById(user);
- // 生成积分明细记录
- 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));
+ return R.ok(new StudyStoryListenResultVO(listen,
+ subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
}
/**
@@ -919,38 +1056,58 @@
*/
@GetMapping("/completeStory")
@ApiOperation(value = "完成故事学习", tags = {"完成故事学习"})
- public R<?> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId,
- @RequestParam @ApiParam("完成答题/完成听故事") String method) {
- // 添加积分明细记录
- Boolean add = integralRecordService.add(String.valueOf(integral), 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 R<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId,
+ @RequestParam String method) {
+ TStoryListen storyListen = storyListenService.lambdaQuery().eq(TStoryListen::getId, storyId).eq(TStoryListen::getDisabled, 0).one();
+ if (null == storyListen) {
+ throw new GlobalException("当前故事学习失败，故事信息异常，请重试！");
+ }
// 用户信息
- Long userId = SecurityUtils.getUserId();
- TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
- // 返回结果
- user.setIntegral(user.getIntegral() + integral);
- return R.ok(add && userService.updateById(user));
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
+ // 故事只有首次才能获取积分
+ TIntegralRecord integralRecord = integralRecordService.lambdaQuery().eq(TIntegralRecord::getUserId, userId)
+ .eq(TIntegralRecord::getStoryId, storyId).eq(TIntegralRecord::getDisabled, 0).one();
+ Boolean result = true;
+ if (null == integralRecord) {
+ // 添加积分明细记录
+ result = integralRecordService.add(String.valueOf(integral), method, null, storyId);
+ TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
+ // 添加积分
+ user.setIntegral(user.getIntegral() + integral);
+ result = result && userService.updateById(user);
+ }
+ return R.ok(result);
}
@GetMapping("/studyRecord")
@ApiOperation(value = "个人中心-学习记录", tags = {"个人中心-学习记录"})
- public R<Map<String, Object>> studyRecord() {
- Long userId = SecurityUtils.getUserId();
- Map<String, Object> result = new HashMap<>(8);
+ public R<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 R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
}
@GetMapping("/integralDetail")
@ApiOperation(value = "个人中心-积分明细", tags = {"个人中心-积分明细"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "查询时间", name = "time", dataType = "Integer"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
+ })
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));
+ return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUserStudy().getUserid(), time));
}
/**
@@ -961,14 +1118,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