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 | 675 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 490 insertions(+), 185 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 9ec5522..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
@@ -2,10 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -13,6 +11,7 @@
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.study.domain.*;
import com.ruoyi.study.dto.*;
import com.ruoyi.study.service.*;
@@ -76,9 +75,13 @@
private ITUserService userService;
@Resource
private TokenService tokenService;
+ @Resource
+ private ITSubjectRecordService subjectRecordService;
+ @Resource
+ private ManagementClient managementClient;
@PostMapping("/storyList")
- @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
+// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) {
PageInfo<TStory> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
QueryWrapper<TStory> wrapper = new QueryWrapper<>();
@@ -114,7 +117,7 @@
}
@PostMapping("/subjectList")
- @ApiOperation(value = "配置学习类型选择题目", tags = {"题目管理"})
+// @ApiOperation(value = "配置学习类型选择题目", tags = {"题目管理"})
public R<PageInfo<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
PageInfo<TSubject> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
@@ -138,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);
@@ -342,13 +351,13 @@
TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
.eq("week", dto.getWeek())
.eq("type", dto.getType()));
- if (one!=null){
+ if (one != null) {
one.setType(dto.getType());
one.setWeek(dto.getWeek());
one.setTitle(dto.getTitle());
one.setQuarter(dto.getQuarter());
studyService.saveOrUpdate(one);
- }else{
+ } else {
TStudy tStudy = new TStudy();
tStudy.setType(dto.getType());
tStudy.setWeek(dto.getWeek());
@@ -429,7 +438,7 @@
List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())
.eq("week", dto.getWeek()));
- if (!list8.isEmpty()){
+ if (!list8.isEmpty()) {
res.setQuarter(list8.get(0).getQuarter());
res.setTitle(list8.get(0).getTitle());
}
@@ -451,7 +460,7 @@
for (TStudyListen tStudyListen : list) {
StringBuilder temp = new StringBuilder();
StudyListenVO studyListenVO = new StudyListenVO();
- if (StringUtils.hasLength(tStudyListen.getSubject())){
+ if (StringUtils.hasLength(tStudyListen.getSubject())) {
for (String s : tStudyListen.getSubject().split(",")) {
TSubject byId = subjectService.getById(s);
temp.append(byId.getName()).append(",");
@@ -475,7 +484,7 @@
StringBuilder names = new StringBuilder();
StringBuilder sorts = new StringBuilder();
StudyLookVO studyLookVO1 = new StudyLookVO();
- if (StringUtils.hasLength(tStudyLook.getSubject())){
+ if (StringUtils.hasLength(tStudyLook.getSubject())) {
for (String s : tStudyLook.getSubject().split(",")) {
TSubject byId = subjectService.getById(s);
names.append(byId.getName()).append(",");
@@ -503,7 +512,7 @@
for (TStudyInduction tStudyInduction : list2) {
StringBuilder names = new StringBuilder();
StudyInductionVO studyInductionVO = new StudyInductionVO();
- if (StringUtils.hasLength(tStudyInduction.getSubject())){
+ if (StringUtils.hasLength(tStudyInduction.getSubject())) {
for (String s : tStudyInduction.getSubject().split(",")) {
String replace = s.replace("-", "");
TSubject byId = subjectService.getById(replace);
@@ -525,34 +534,34 @@
for (TStudyAnswer tStudyAnswer : list3) {
StringBuilder names = new StringBuilder();
StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
- if (tStudyAnswer.getIsAnswer() != null){
+ if (tStudyAnswer.getIsAnswer() != null) {
if (tStudyAnswer.getIsAnswer() == 1) {
- if (tStudyAnswer.getSubject()!=null){
+ if (tStudyAnswer.getSubject() != null) {
TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
names.append(byId.getName()).append(",");
}
- if (tStudyAnswer.getAnswerSubject()!=null) {
+ if (tStudyAnswer.getAnswerSubject() != null) {
TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
names.append(byId1.getName()).append(",");
}
} else {
- if (tStudyAnswer.getSubject()!=null) {
+ if (tStudyAnswer.getSubject() != null) {
TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
names.append(byId.getName()).append(",");
}
- if (tStudyAnswer.getAnswerSubject()!=null) {
+ if (tStudyAnswer.getAnswerSubject() != null) {
TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
names.append(byId1.getName()).append(",");
}
}
}
- if (StringUtils.hasLength(names)){
+ 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());
+ studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
answerVOS.add(studyAnswerVO);
}
@@ -565,7 +574,7 @@
for (TStudyPair tStudyPair : list4) {
StringBuilder names = new StringBuilder();
StudyPairVO studyPairVO = new StudyPairVO();
- if (StringUtils.hasLength(tStudyPair.getSubject())){
+ if (StringUtils.hasLength(tStudyPair.getSubject())) {
for (String s : tStudyPair.getSubject().split(",")) {
TSubject byId = subjectService.getById(s);
names.append(byId.getName()).append(",");
@@ -601,38 +610,41 @@
StringBuilder names1 = new StringBuilder();
StringBuilder sort = new StringBuilder();
StringBuilder sort1 = new StringBuilder();
- if (StringUtils.hasLength(tStory.getStory())){
+ if (StringUtils.hasLength(tStory.getStory())) {
for (String s : tStory.getStory().split(",")) {
TStory byId = storyService.getById(s);
names.append(byId.getName()).append(",");
}
}
- if (StringUtils.hasLength(tStory.getLookStory())){
+ if (StringUtils.hasLength(tStory.getLookStory())) {
for (String s : tStory.getLookStory().split(",")) {
TStory byId = storyService.getById(s);
names1.append(byId.getName()).append(",");
}
}
- if (StringUtils.hasLength(tStory.getSort())){
+ if (StringUtils.hasLength(tStory.getSort())) {
for (String s : tStory.getSort().split(",")) {
sort.append(s).append(",");
}
}
- if (StringUtils.hasLength(tStory.getLookSort())){
+ if (StringUtils.hasLength(tStory.getLookSort())) {
for (String s : tStory.getLookSort().split(",")) {
sort1.append(s).append(",");
}
}
- if (StringUtils.hasLength(names)){
+ if (StringUtils.hasLength(names)) {
storyVO.setName(names.substring(0, names.length() - 1));
- }if (StringUtils.hasLength(sort)){
+ }
+ if (StringUtils.hasLength(sort)) {
storyVO.setSort(sort.substring(0, sort.length() - 1));
- }if (StringUtils.hasLength(names1)){
+ }
+ if (StringUtils.hasLength(names1)) {
storyVO.setLookName(names1.substring(0, names1.length() - 1));
- }if (StringUtils.hasLength(sort1)){
+ }
+ if (StringUtils.hasLength(sort1)) {
storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
}
storyVO.setIntegral(tStory.getIntegral());
@@ -649,21 +661,14 @@
return R.ok(res);
}
+
/**
- * 查询周目列表
- *
- * @param type 所属类型
- * @param quarter 季度
+ * 可兑换商品推荐
*/
- @GetMapping("/weekList")
- @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);
+ @GetMapping("/goodRecommend")
+ @ApiOperation(value = "可兑换商品推荐", tags = {"学习端-首页"})
+ public R<List<TGoodsVO>> studySchedule() {
+ return R.ok(goodsClient.goodRecommend().getData());
}
/**
@@ -673,33 +678,59 @@
* @param day 所属day
*/
@GetMapping("/studySchedule")
- @ApiOperation(value = "获取用户学习进度", tags = {"获取用户学习进度"})
+ @ApiOperation(value = "获取用户学习进度", tags = {"学习端-首页"})
@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);
+ TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week);
return R.ok(result);
}
/**
- * 可兑换商品推荐
+ * 查询周目列表
+ *
+ * @param type 所属类型
+ * @param quarter 季度
*/
- @GetMapping("/goodRecommend")
- @ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
- public R<List<TGoodsVO>> studySchedule() {
- return R.ok(goodsClient.goodRecommend().getData());
+ @GetMapping("/weekList")
+ @ApiOperation(value = "根据季度获取周目列表 ", tags = {"学习端-首页"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "所属类型 1.0只有类型听 传1", name = "type", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "季度 首次进入季度quarter默认传1", 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);
+ }
+
+ /**
+ * 进入题组后，获取题组学习进度信息
+ *
+ * @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);
}
/**
* 退出学习，记录学习进度、当日学习时长...
*/
@PostMapping("/exitLearning")
- @ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"退出学习(记录学习进度等信息)"})
- public R<Boolean> exitLearning(@RequestBody TUserStudy userStudy) {
+ @ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"学习端-题目"})
+ public R<Boolean> exitLearning(@RequestBody TSubjectRecord subjectRecord) {
// 学习时长处理
- return R.ok(userStudyService.updateById(userStudy));
+ return R.ok(subjectRecordService.updateById(subjectRecord));
}
/**
@@ -709,21 +740,26 @@
* @param day 所属day
*/
@GetMapping("/listenSelectPicture")
- @ApiOperation(value = "自主学习1-听音选图", tags = {"自主学习1-听音选图"})
+ @ApiOperation(value = "自主学习1-听音选图", tags = {"学习端-听-自主学习"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "所属季度", name = "quarter", dataType = "Integer", required = true),
@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) {
+ public R<StudyListenResultVO> listenSelectPicture(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
- 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 = studyListenService.listenSelectPicture(quarter, week, day);
+ for (TStudyListen studyListen : studyListens) {
+ if (studyListen.getIsVip() == 1) {
+ // 需要会员查看
+ if (!isVip) {
+ // 不是会员
+ return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
+ }
+ }
}
- List<TStudyListen> studyListens = wrapper.list();
return R.ok(studyService.listenSelectPicture(week, day, studyListens));
}
@@ -734,22 +770,26 @@
* @param day 所属day
*/
@GetMapping("/pictureSelectVoice")
- @ApiOperation(value = "自主学习2-看图选音", tags = {"自主学习2-看图选音"})
+ @ApiOperation(value = "自主学习2-看图选音", tags = {"学习端-听-自主学习"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "所属季度", name = "quarter", dataType = "Integer", required = true),
@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) {
+ public R<StudyLookResultVO> pictureSelectVoice(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
- LambdaQueryChainWrapper<TStudyLook> wrapper = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
- .eq(TStudyLook::getDay, day).eq(TStudyLook::getDisabled, 0);
// 非会员只能查看非会员题目，会员可以查看所有题目
- if (!isVip) {
- wrapper.eq(TStudyLook::getIsVip, 0);
+ List<TStudyLook> lookList = studyLookService.pictureSelectVoice(quarter, week, day);
+ for (TStudyLook studyListen : lookList) {
+ if (studyListen.getIsVip() == 1) {
+ // 需要会员查看
+ if (!isVip) {
+ // 不是会员
+ return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
+ }
+ }
}
- 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));
}
@@ -760,21 +800,26 @@
* @param day 所属day
*/
@GetMapping("/induceExclude")
- @ApiOperation(value = "自主学习3-归纳排除", tags = {"自主学习3-归纳排除"})
+ @ApiOperation(value = "自主学习3-归纳排除", tags = {"学习端-听-自主学习"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "所属季度", name = "quarter", dataType = "Integer", required = true),
@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) {
+ public R<StudyInductionResultVO> induceExclude(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
- LambdaQueryChainWrapper<TStudyInduction> wrapper = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
- .eq(TStudyInduction::getDay, day).eq(TStudyInduction::getDisabled, 0);
// 非会员只能查看非会员题目，会员可以查看所有题目
- if (!isVip) {
- wrapper.eq(TStudyInduction::getIsVip, 0);
+ List<TStudyInduction> inductionList = studyInductionService.induceExclude(quarter, week, day);
+ for (TStudyInduction studyListen : inductionList) {
+ if (studyListen.getIsVip() == 1) {
+ // 需要会员查看
+ if (!isVip) {
+ // 不是会员
+ return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
+ }
+ }
}
- List<TStudyInduction> inductionList = wrapper.list();
return R.ok(studyService.induceExclude(week, day, inductionList));
}
@@ -785,21 +830,26 @@
* @param day 所属day
*/
@GetMapping("/questionsAndAnswers")
- @ApiOperation(value = "自主学习4-有问有答", tags = {"自主学习4-有问有答"})
+ @ApiOperation(value = "自主学习4-有问有答", tags = {"学习端-听-自主学习"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "所属季度", name = "quarter", dataType = "Integer", required = true),
@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) {
+ public R<StudyAnswerResultVO> questionsAndAnswers(@RequestParam Integer quarter, @RequestParam Integer week, @RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
- LambdaQueryChainWrapper<TStudyAnswer> wrapper = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
- .eq(TStudyAnswer::getDay, day).eq(TStudyAnswer::getDisabled, 0);
// 非会员只能查看非会员题目，会员可以查看所有题目
- if (!isVip) {
- wrapper.eq(TStudyAnswer::getIsVip, 0);
+ List<TStudyAnswer> answerList = studyAnswerService.questionsAndAnswers(quarter, week, day);
+ for (TStudyAnswer studyListen : answerList) {
+ if (studyListen.getIsVip() == 1) {
+ // 需要会员查看
+ if (!isVip) {
+ // 不是会员
+ return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
+ }
+ }
}
- List<TStudyAnswer> answerList = wrapper.list();
return R.ok(studyService.questionsAndAnswers(week, day, answerList));
}
@@ -810,22 +860,87 @@
* @param day 所属day
*/
@GetMapping("/pictureMateVoice")
- @ApiOperation(value = "自主学习5-音图相配", tags = {"自主学习5-音图相配"})
+ @ApiOperation(value = "自主学习5-音图相配", tags = {"学习端-听-自主学习"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "所属季度", name = "quarter", dataType = "Integer", required = true),
@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) {
+ public R<StudyPairResultVO> pictureMateVoice(@RequestParam Integer quarter, @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);
+ List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
+ for (TStudyPair pair : pairList) {
+ if (pair.getIsVip() == 1) {
+ // 需要会员查看
+ if (!isVip) {
+ // 不是会员
+ return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
+ }
+ }
}
- TStudyPair pair = wrapper.one();
- return R.ok(studyService.pictureMateVoice(week, day, pair));
+ return R.ok(studyService.pictureMateVoice(week, day, pairList));
+ }
+
+ /**
+ * 学习完成，生成学习记录，积分明细记录
+ *
+ * @param completeStudy 完成学习信息
+ */
+ @PostMapping("/completeLearning")
+ @ApiOperation(value = "完成学习", tags = {"学习端-听-自主学习"})
+ public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
+ // 登录用户id
+ Integer userId = tokenService.getLoginUserStudy().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("题目信息异常！");
+ }
+ // 获取user详细信息，改变积分
+ TUser user = userService.getById(userId);
+ user.setIntegral(user.getIntegral() + sum);
+ update = userService.updateById(user);
+ // 生成积分明细记录
+ TIntegralRecord integralRecord = new TIntegralRecord();
+ integralRecord.setIntegral(String.valueOf(sum));
+ integralRecord.setMethod(Constants.COMPLETE_LEARNING);
+ integralRecord.setUserId(userId);
+ update = update && integralRecordService.save(integralRecord);
+ }
+ // 学习配置列表
+ List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0).orderByAsc(TStudy::getWeek).list();
+ if (studyList.isEmpty()) {
+ throw new GlobalException("学习配置列表未配置或数据失效！");
+ }
+ // 更改学习记录
+ Boolean updateStudyRecord = userStudyService.exchangeStudyRecord(studyList, userId, completeStudy);
+ return R.ok(update && updateStudyRecord);
}
/**
@@ -835,74 +950,114 @@
* @param week 所属周目
*/
@GetMapping("/gameHearing")
- @ApiOperation(value = "自主游戏1-超级听力", tags = {"自主游戏1-超级听力(difficulty: 0入门、1中级、2高级)"})
+ @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 = {"自主游戏2-超级记忆(difficulty: 0入门、1中级、2高级)"})
+ @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;
}
/**
@@ -912,39 +1067,73 @@
* @param completeStudy 学习信息
*/
@PostMapping("/gameAchievement")
- @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"完成游戏-记录游戏测试成绩"})
+ @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-听-自主游戏"})
public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
- TGame game = gameService.getById(completeStudy.getGameId());
+ /*
+ * 游戏测试需要根据正确率计算本次测试可获得积分
+ * 并且需要判断如果该游戏用户已获取一部分积分，再次测试后正确率增长，只能获取高于上次正确率的部分积分
+ * 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
+ */
+ Integer userid = tokenService.getLoginUserStudy().getUserid();
+ 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 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);
- // 添加积分明细记录
- add = add && integralRecordService.add(game.getIntegral(), completeStudy.getMethod());
- // 用户账户添加积分
+ // 可获得积分不为null时，才添加积分明细记录
+ if (null != availableIntegral) {
+ add = add && integralRecordService.add(String.valueOf(availableIntegral), Constants.COMPLETE_GAME, completeStudy.getGameId(), null);
+ // 用户账户添加积分
+ TUser user = userService.getById(userid);
+ user.setIntegral(user.getIntegral() + availableIntegral);
+ add = add && userService.updateById(user);
+ }
return R.ok(add);
}
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);
+ 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;
}
@@ -954,17 +1143,22 @@
* @param week 周目
*/
@GetMapping("/lookPictureDbu")
- @ApiOperation(value = "自主故事1-看图配音", tags = {"自主故事1-看图配音"})
+ @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(","));
- return R.ok(new StudyStoryListenResultVO(listen,
- subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
+ 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));
}
/**
@@ -973,87 +1167,161 @@
* @param week 周目
*/
@GetMapping("/frameworkMemory")
- @ApiOperation(value = "自主故事2-框架记忆", tags = {"自主故事2-框架记忆"})
+ @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(","));
- return R.ok(new StudyStoryListenResultVO(listen,
- subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
+ 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));
}
- /**
- * 学习完成，生成学习记录，积分明细记录
- *
- * @param completeStudy 完成学习信息
- */
- @PostMapping("/completeLearning")
- @ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
- public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
- // 登录用户id
- Integer userId = tokenService.getLoginUserStudy().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(userId);
- return R.ok(update && integralRecordService.save(integralRecord));
+ 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;
}
/**
* 完成故事类型
*/
@GetMapping("/completeStory")
- @ApiOperation(value = "完成故事学习", tags = {"完成故事学习"})
+ @ApiOperation(value = "完成故事学习", tags = {"学习端-听-自主故事"})
@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)
+ @ApiImplicitParam(value = "故事id", name = "storyId", dataType = "Integer", required = true)
})
- public R<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId,
- @RequestParam String method) {
- // 添加积分明细记录
- Boolean add = integralRecordService.add(String.valueOf(integral), method);
+ public R<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId) {
+ TStoryListen storyListen = storyListenService.lambdaQuery().eq(TStoryListen::getId, storyId).eq(TStoryListen::getDisabled, 0).one();
+ if (null == storyListen) {
+ throw new GlobalException("当前故事学习失败，故事信息异常，请重试！");
+ }
// 用户信息
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));
+ // 故事只有首次才能获取积分
+ 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), Constants.COMPLETE_STORY, 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 = {"个人中心-学习记录"})
+ @ApiOperation(value = "个人中心-学习记录", tags = {"学习端-个人中心"})
public R<StudyRecordResultVO> studyRecord() {
Integer userId = tokenService.getLoginUserStudy().getUserid();
+
// 学习记录
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
.eq(TUserStudy::getDisabled, 0).one();
// 游戏测试成绩
List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
.eq(TGameRecord::getDisabled, 0).list();
- return R.ok(new StudyRecordResultVO(studyRecord,gameRecordList));
+ return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
+ }
+
+ @GetMapping("/record")
+ @ApiOperation(value = "游戏测试成绩", tags = {"家长端-游戏测试成绩"})
+ public R<StudyRecordResultVO> record() {
+ LoginUserParent loginUser1 = tokenService.getLoginUser1();
+ if (loginUser1 == null) {
+ return R.tokenError("登陆失效,请重新登录");
+ }
+ Integer userId = loginUser1.getUserid();
+
+ // 学习记录
+ TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
+ .eq(TUserStudy::getDisabled, 0).one();
+ // 查询剩余周目
+ if (studyRecord != null) {
+ int size = studyService.list(new QueryWrapper<TStudy>()
+ .eq("type", 1)).size();
+ studyRecord.setSurplus(size - studyRecord.getWeek());
+ } else {
+ TUserStudy tUserStudy = new TUserStudy();
+ tUserStudy.setSurplus(studyService.list(new QueryWrapper<TStudy>()
+ .eq("type", 1)).size());
+ studyRecord = tUserStudy;
+ }
+ // 游戏测试成绩
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
+ .eq(TGameRecord::getDisabled, 0).list();
+ return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
+ }
+
+ @GetMapping("/getIntegral")
+ @ApiOperation(value = "获取剩余积分", tags = {"家长端-获取剩余积分"})
+ public R<Integer> getIntegral() {
+ Integer userId = tokenService.getLoginUser1().getUserid();
+ return R.ok(userService.getById(userId).getIntegral());
+ }
+
+ @GetMapping("/getIntegralStudy")
+ @ApiOperation(value = "获取剩余积分", tags = {"学习端-获取剩余积分"})
+ public R<Integer> getIntegralStudy() {
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
+ return R.ok(userService.getById(userId).getIntegral());
}
@GetMapping("/integralDetail")
- @ApiOperation(value = "个人中心-积分明细", tags = {"个人中心-积分明细"})
+ @ApiOperation(value = "个人中心-积分明细", tags = {"学习端-个人中心"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "查询时间", name = "time", dataType = "Integer"),
+ @ApiImplicitParam(value = "查询时间 格式yyyy-MM", 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) {
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
+ if (tokenService.getLoginUserStudy() == null) {
+ return R.tokenError("登录失效");
+ }
return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUserStudy().getUserid(), time));
+ }
+
+ @GetMapping("/integralDetailParent")
+ @ApiOperation(value = "个人中心-积分明细", tags = {"家长端"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "查询时间 格式yyyy-MM", name = "time", dataType = "Integer"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
+ @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) {
+ return R.tokenError("登录失效");
+ }
+
+ return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUser1().getUserid(), time));
}
/**
@@ -1063,7 +1331,7 @@
* @param method 变动源
*/
@GetMapping("/addIntegralDetail")
- @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
+// @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
@ApiImplicitParams({
@ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
@ApiImplicitParam(value = "变动源(完成学习、完成游戏...)", name = "method", dataType = "String", required = true)
@@ -1084,6 +1352,31 @@
return R.ok(integralRecordService.save(integralRecord));
}
+ @GetMapping("/addIntegralDetail1")
+// @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "变动源(完成学习、完成游戏...)", name = "method", dataType = "String", required = true)
+ })
+ public R addIntegralDetail1(@RequestParam("integral") String integral, @RequestParam("method") String method) {
+ // 当前登录用户
+ LoginUserParent userStudy = tokenService.getLoginUser1();
+ if (userStudy == null) {
+ return R.tokenError("登录失效");
+ }
+ // 生成积分明细信息
+ TIntegralRecord integralRecord = new TIntegralRecord();
+ integralRecord.setIntegral(integral);
+ integralRecord.setMethod(method);
+ 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));
+ }
+
/**
* 用户积分变动(增加或减少)-用于远程调用
*
@@ -1091,7 +1384,7 @@
* @param method 变动源
*/
@GetMapping("/exchangeIntegral")
- @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+// @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)) {
@@ -1102,5 +1395,17 @@
return R.ok(userService.updateById(user));
}
+ @GetMapping("/exchangeIntegral1")
+// @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ public R<Boolean> exchangeIntegral1(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
+ TUser user = userService.getById(tokenService.getLoginUser1().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