From f138375f15c072d10335c20ecec9b35f1da78ee4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 03 七月 2024 16:17:59 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 1094 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 871 insertions(+), 223 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 520d7ab..36683b1 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,17 +2,16 @@
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;
-import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.TGoodsVO;
+import com.ruoyi.management.api.feignClient.ManagementClient;
+import com.ruoyi.management.api.model.TSysSet;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.*;
import com.ruoyi.study.service.*;
@@ -27,8 +26,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -72,13 +71,17 @@
@Resource
private ITIntegralRecordService integralRecordService;
@Resource
- private RedisService redisService;
- @Resource
private ITUserService userService;
@Resource
private TokenService tokenService;
@Resource
private ITSubjectRecordService subjectRecordService;
+ @Resource
+ private IUserStudyRecordService studyRecordService;
+ @Resource
+ private ManagementClient managementClient;
+ @Resource
+ private ITUserPresentRecordService userPresentRecordService;
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
@@ -95,18 +98,26 @@
wrapper.like("type", query.getType());
}
wrapper.eq("state", 1);
+ List<TStory> tStories = new ArrayList<>();
+
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- res.setRecords(list);
- res.setTotal(list.size());
+ List<TStory> tSubjects = new ArrayList<>(list);
+ res.setRecords(tSubjects);
+ res.setTotal(tSubjects.size());
return R.ok(res);
case 1:
// 查询出error字段不为空的数据
wrapper.isNotNull("error");
List<TStory> list1 = storyService.list(wrapper);
- res.setRecords(list1);
- res.setTotal(list1.size());
+ for (TStory tStory : list1) {
+ if (tStory.getError() != null && (!tStory.getError().isEmpty())) {
+ tStories.add(tStory);
+ }
+ }
+ res.setRecords(tStories);
+ res.setTotal(tStories.size());
return R.ok(res);
}
@@ -141,8 +152,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);
@@ -150,9 +167,17 @@
res.setTotal(list2.size());
return R.ok(res);
case 4:
+ // 查询出error字段不为空的数据
+ wrapper.isNotNull("error");
List<TSubject> list3 = subjectService.list(wrapper);
- res.setRecords(list3);
- res.setTotal(list3.size());
+ List<TSubject> tSubjects3 = new ArrayList<>();
+ for (TSubject tSubject : list3) {
+ if (!tSubject.getError().isEmpty()) {
+ tSubjects3.add(tSubject);
+ }
+ }
+ res.setRecords(tSubjects3);
+ res.setTotal(tSubjects3.size());
return R.ok(res);
case 5:
List<TSubject> list4 = subjectService.list(wrapper);
@@ -199,10 +224,14 @@
studyId.setAnswerTime(game.getAnswerTime());
studyId.setAnswerIntegral(game.getAnswerIntegral());
studyId.setAnswerCount(game.getAnswerCount());
+ studyId.setRate(game.getRate());
+ studyId.setAnswerRate(game.getAnswerRate());
gameService.updateById(studyId);
} else {
TGame tGame = new TGame();
tGame.setWeek(dto.getWeek());
+ tGame.setAnswerRate(game.getAnswerRate());
+ tGame.setRate(game.getRate());
tGame.setStudyId(one.getId());
tGame.setCount(game.getCount());
tGame.setIntegral(game.getIntegral());
@@ -580,7 +609,6 @@
studyPairVO.setIsVip(tStudyPair.getIsVip());
pairVOS.add(studyPairVO);
}
-
}
List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
.eq("week", week));
@@ -592,6 +620,8 @@
gameVO.setAnswerTime(tGame.getAnswerTime());
gameVO.setAnswerIntegral(tGame.getAnswerIntegral());
gameVO.setAnswerCount(tGame.getAnswerCount());
+ gameVO.setRate(tGame.getRate());
+ gameVO.setAnswerRate(tGame.getAnswerRate());
gameVOS.add(gameVO);
}
List<TStoryListen> list6 = storyListenService.list(new QueryWrapper<TStoryListen>()
@@ -656,33 +686,64 @@
}
-
-
-
/**
* 可兑换商品推荐
*/
@GetMapping("/goodRecommend")
@ApiOperation(value = "可兑换商品推荐", tags = {"学习端-首页"})
- public R<List<TGoodsVO>> studySchedule() {
+ public R<List<TGoodsVO>> goodRecommend() {
return R.ok(goodsClient.goodRecommend().getData());
}
+
+ /**
+ * 获取正确及错误提示音效
+ */
+ @GetMapping("/promptVoice")
+ @ApiOperation(value = "获取正确及错误提示音效", tags = {"学习端-首页"})
+ public R<TSysSet> promptVoice() {
+ return R.ok(managementClient.promptVoice().getData());
+ }
+
/**
* 首次页面加载时调用,获取学习进度及学习时长等信息
*
* @param week 周目
- * @param day 所属day
*/
@GetMapping("/studySchedule")
@ApiOperation(value = "获取用户学习进度", tags = {"学习端-首页"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true)
})
- public R<TUserStudy> studySchedule(@RequestParam Integer week, @RequestParam Integer day) {
- TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week, day);
- return R.ok(result);
+ public R<TUserStudy> studySchedule(@RequestParam Integer week) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userid = loginStudy.getUserid();
+ TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, loginStudy.getUserid())
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null != studyRecord) {
+ // 计算当前周 day 1-5的总进度
+ int computeSchedule = studyService.computeSchedule(studyRecord, week);
+ studyRecord.setComputeSchedule(computeSchedule);
+ // 学习时长格式转换
+ Integer todayStudy = studyRecord.getTodayStudy();
+ studyRecord.setTodayStudy(Math.round((float) todayStudy / 3600));
+ Integer weekStudy = studyRecord.getWeekStudy();
+ studyRecord.setWeekStudy(Math.round((float) weekStudy / 3600));
+ Integer monthStudy = studyRecord.getMonthStudy();
+ studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
+ // 总时长还需计算上游戏测试成绩时长
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userid)
+ .eq(TGameRecord::getDisabled, 0).list();
+ int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
+ Integer totalStudy = studyRecord.getTotalStudy();
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ studyRecord = studyService.studySchedule(studyRecord, week);
+ }
+ return R.ok(studyRecord);
}
+
/**
* 查询周目列表
*
@@ -696,9 +757,84 @@
@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);
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ List<StudyWeekDTO> result = studyService.weekList(type, quarter, loginUserStudy.getUserid());
return R.ok(result);
}
+
+ /**
+ * 获取在线时间赠送积分信息
+ */
+ @GetMapping("/onlineDuration")
+ @ApiOperation(value = "获取在线时间赠送积分信息(单位分钟)", tags = {"学习端-首页"})
+ public R<String> onlineDuration() {
+ TSysSet sysSet = managementClient.promptVoice().getData();
+ if (null == sysSet) {
+ throw new GlobalException("获取在线时间赠送积分信息失败！");
+ }
+ // 返回在线时长
+ return R.ok(sysSet.getTime());
+ }
+
+ /**
+ * 根据在线时间赠送积分(定时任务)
+ */
+ @GetMapping("/giveIntegral")
+ @ApiOperation(value = "根据在线时间赠送积分(定时任务)", tags = {"学习端-首页"})
+ public R<Boolean> giveIntegral() {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TSysSet sysSet = managementClient.promptVoice().getData();
+ if (null == sysSet) {
+ throw new GlobalException("获取在线时间赠送积分信息失败！");
+ }
+ String integral = sysSet.getIntegral();
+ // 计算时间间隔
+ TUserPresentRecord record = userPresentRecordService.lambdaQuery()
+ .eq(TUserPresentRecord::getUserId, loginStudy.getUserid())
+ .orderByDesc(TUserPresentRecord::getPresentTime)
+ .eq(TUserPresentRecord::getIsDelete, 0).last("limit 1").one();
+ boolean result = true;
+ TUser user = userService.lambdaQuery().eq(TUser::getId, loginStudy.getUserid())
+ .eq(TUser::getDisabled, 0).one();
+ if (null == record) {
+ // 赠送积分
+ result = userService.lambdaUpdate().set(TUser::getIntegral, user.getIntegral() + Integer.parseInt(integral))
+ .eq(TUser::getId, loginStudy.getUserid()).update();
+ // 添加赠送积分记录
+ TUserPresentRecord data = new TUserPresentRecord();
+ data.setUserId(loginStudy.getUserid());
+ data.setPresentTime(new Date());
+ data.setIsDelete(0);
+ result = result && userPresentRecordService.save(data);
+ } else {
+ if (System.currentTimeMillis() - record.getPresentTime().getTime() >= (long) Integer.parseInt(sysSet.getTime()) * 60 * 1000) {
+ // 赠送积分
+ result = userService.lambdaUpdate()
+ .set(TUser::getIntegral, user.getIntegral() + Integer.parseInt(integral))
+ .eq(TUser::getId, loginStudy.getUserid()).update();
+ // 添加赠送积分记录
+ TUserPresentRecord data = new TUserPresentRecord();
+ data.setUserId(loginStudy.getUserid());
+ data.setPresentTime(new Date());
+ data.setIsDelete(0);
+ result = result && userPresentRecordService.save(data);
+ // 生成积分明细
+ TIntegralRecord integralRecord = new TIntegralRecord();
+ integralRecord.setIntegral(sysSet.getIntegral());
+ integralRecord.setMethod(Constants.ONLINE_DURATION);
+ integralRecord.setUserId(loginStudy.getUserid());
+ result = result && integralRecordService.save(integralRecord);
+ }
+ }
+ return R.ok(result);
+ }
+
/**
* 进入题组后，获取题组学习进度信息
*
@@ -709,12 +845,38 @@
@ApiOperation(value = "获取题组学习进度信息", tags = {"学习端-题目"})
@ApiImplicitParams({
@ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "类型(1:听音选图,2:看图选音,3:归纳排除,4:有问有答,5:音图相配)", name = "type", dataType = "Integer", required = true)
})
- public R<TSubjectRecord> teamSchedule(@RequestParam Integer week, @RequestParam Integer day) {
- TSubjectRecord subjectRecord = subjectRecordService.lambdaQuery().eq(TSubjectRecord::getWeek, week).eq(TSubjectRecord::getDay, day)
- .eq(TSubjectRecord::getUserId, tokenService.getLoginUserStudy().getUserid()).eq(TSubjectRecord::getDisabled, 0).one();
- return R.ok(subjectRecord);
+ public R<SubjectRecordResultVO> teamSchedule(@RequestParam Integer week, @RequestParam Integer day,
+ @RequestParam Integer type) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TSubjectRecord subjectRecord = subjectRecordService.lambdaQuery().eq(TSubjectRecord::getWeek, week)
+ .eq(TSubjectRecord::getDay, day)
+ .eq(TSubjectRecord::getType, type)
+ .eq(TSubjectRecord::getUserId, loginStudy.getUserid())
+ .eq(TSubjectRecord::getDisabled, 0).one();
+ // 返回结果
+ SubjectRecordResultVO result;
+ if (null != subjectRecord) {
+ subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 1)
+ .eq(TSubjectRecord::getId, subjectRecord.getId()).update();
+ // 题组id
+ List<Integer> teamIds = Arrays.stream(subjectRecord.getBeforeSubject().split(",")).map(Integer::parseInt)
+ .collect(Collectors.toList());
+ // 题目id
+ List<Integer> topicIds = Arrays.stream(subjectRecord.getCompleteSubject().split(",")).map(Integer::parseInt)
+ .collect(Collectors.toList());
+ result = new SubjectRecordResultVO(teamIds, topicIds, subjectRecord.getAnswerNumber(), subjectRecord.getCorrectNumber());
+ } else {
+ result = null;
+ }
+ subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 0)
+ .eq(TSubjectRecord::getUserId, loginStudy.getUserid()).update();
+ return R.ok(result);
}
/**
@@ -722,9 +884,108 @@
*/
@PostMapping("/exitLearning")
@ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"学习端-题目"})
- public R<Boolean> exitLearning(@RequestBody TSubjectRecord subjectRecord) {
- // 学习时长处理
- return R.ok(subjectRecordService.updateById(subjectRecord));
+ public R<Boolean> exitLearning(@RequestBody ExitLearnVO exitLearn) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userid = loginStudy.getUserid();
+ // 判断当前week和day是否已完成学习
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = createUserStudy(userid);
+ }
+ Integer quarter = exitLearn.getQuarter();
+ Integer week = exitLearn.getWeek();
+ Integer day = exitLearn.getDay();
+ int schedule = exitLearn.getSchedule() == null ? 0 : exitLearn.getSchedule();
+ if (userStudy.getWeek().equals(exitLearn.getWeek()) && userStudy.getDay().equals(exitLearn.getDay())) {
+ // 计算完成率
+ Integer type = exitLearn.getType();
+ // 更新用户学习完成率
+ if (Constants.ONE.equals(type)) {
+ // 听音选图
+ List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
+ int item = 0;
+ for (TStudyListen studyListen : studyListens) {
+ item += studyListen.getSubject().split(",").length;
+ }
+ int i = (int) ((double) (exitLearn.getTopicIds().split(",").length / item) * 100);
+ if (i > userStudy.getListen()) {
+ userStudy.setListen(100 - i);
+ }
+ } else if (Constants.TWO.equals(type)) {
+ // 看图选音
+ List<TStudyLook> lookList = studyLookService.pictureSelectVoice(quarter, week, day);
+ if (!lookList.isEmpty()) {
+ int item = lookList.size();
+ int i = (int) ((double) (schedule / item)) * 100;
+ if (i > userStudy.getLook()) {
+ userStudy.setLook(100 - i);
+ }
+ }
+ } else if (Constants.THREE.equals(type)) {
+ // 归纳排除
+ List<TStudyInduction> inductionList = studyInductionService.induceExclude(quarter, week, day);
+ if (!inductionList.isEmpty()) {
+ int item = inductionList.size();
+ int i = (int) ((double) (schedule / item)) * 100;
+ if (i > userStudy.getInduction()) {
+ userStudy.setInduction(100 - i);
+ }
+ }
+ } else if (Constants.FOUR.equals(type)) {
+ // 有问有答
+ List<TStudyAnswer> answerList = studyAnswerService.questionsAndAnswers(quarter, week, day);
+ if (answerList.size() % Constants.TWO == Constants.ZERO) {
+ int i = (int) ((double) (schedule / (answerList.size() / 2))) * 100;
+ if (i > userStudy.getAnswer()) {
+ userStudy.setAnswer(100 - i);
+ }
+ }
+ } else if (Constants.FIVE.equals(type)) {
+ // 音图相配
+ List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
+ int item = pairList.size();
+ int i = (int) ((double) (schedule / item)) * 100;
+ if (i > userStudy.getPair()) {
+ userStudy.setPair(100 - i);
+ }
+ }
+ }
+ // 学习时长更新
+ userStudy.setTotalStudy(userStudy.getTotalStudy() + exitLearn.getStudyTime());
+ userStudy.setTodayStudy(userStudy.getTodayStudy() + exitLearn.getStudyTime());
+ userStudy.setWeekStudy(userStudy.getWeekStudy() + exitLearn.getStudyTime());
+ userStudy.setMonthStudy(userStudy.getMonthStudy() + exitLearn.getStudyTime());
+ userStudyService.updateById(userStudy);
+ return R.ok(subjectRecordService.exitLearning(exitLearn, userid));
+ }
+
+ /**
+ * 退出游戏/故事学习
+ */
+ @GetMapping("/exitGameOrStory")
+ @ApiOperation(value = "退出游戏/故事学习", tags = {"学习端-题目"})
+ public R<Boolean> exitGameOrStory(@RequestParam("studyTime") Integer studyTime) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userid = loginStudy.getUserid();
+ // 判断当前week和day是否已完成学习
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = createUserStudy(userid);
+ }
+ // 学习时长更新
+ userStudy.setTotalStudy(userStudy.getTotalStudy() + studyTime);
+ userStudy.setTodayStudy(userStudy.getTodayStudy() + studyTime);
+ userStudy.setWeekStudy(userStudy.getWeekStudy() + studyTime);
+ userStudy.setMonthStudy(userStudy.getMonthStudy() + studyTime);
+ return R.ok(userStudyService.updateById(userStudy));
}
/**
@@ -734,26 +995,22 @@
* @param day 所属day
*/
@GetMapping("/listenSelectPicture")
- @ApiOperation(value = "自主学习1-听音选图", tags = {"学习端-首页"})
+ @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 = wrapper.list();
+ List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
for (TStudyListen studyListen : studyListens) {
- if (studyListen.getIsVip() == 1){
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
- if (!isVip){
+ if (!isVip) {
// 不是会员
return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
}
@@ -769,24 +1026,22 @@
* @param day 所属day
*/
@GetMapping("/pictureSelectVoice")
- @ApiOperation(value = "自主学习2-看图选音", tags = {"学习端-首页"})
+ @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);
// 非会员只能查看非会员题目，会员可以查看所有题目
-
- List<TStudyLook> lookList = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
- .eq(TStudyLook::getDay, day).eq(TStudyLook::getDisabled, 0).list();
+ List<TStudyLook> lookList = studyLookService.pictureSelectVoice(quarter, week, day);
for (TStudyLook studyListen : lookList) {
- if (studyListen.getIsVip() == 1){
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
- if (!isVip){
+ if (!isVip) {
// 不是会员
return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
}
@@ -802,25 +1057,22 @@
* @param day 所属day
*/
@GetMapping("/induceExclude")
- @ApiOperation(value = "自主学习3-归纳排除", tags = {"学习端-首页"})
+ @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 = wrapper.list();
+ List<TStudyInduction> inductionList = studyInductionService.induceExclude(quarter, week, day);
for (TStudyInduction studyListen : inductionList) {
- if (studyListen.getIsVip() == 1){
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
- if (!isVip){
+ if (!isVip) {
// 不是会员
return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
}
@@ -836,25 +1088,22 @@
* @param day 所属day
*/
@GetMapping("/questionsAndAnswers")
- @ApiOperation(value = "自主学习4-有问有答", tags = {"学习端-首页"})
+ @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 = wrapper.list();
+ List<TStudyAnswer> answerList = studyAnswerService.questionsAndAnswers(quarter, week, day);
for (TStudyAnswer studyListen : answerList) {
- if (studyListen.getIsVip() == 1){
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
- if (!isVip){
+ if (!isVip) {
// 不是会员
return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
}
@@ -870,29 +1119,28 @@
* @param day 所属day
*/
@GetMapping("/pictureMateVoice")
- @ApiOperation(value = "自主学习5-音图相配", tags = {"学习端-首页"})
+ @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);
- }
- TStudyPair pair = wrapper.one();
- if (pair.getIsVip() == 1){
- // 需要会员查看
- if (!isVip){
- // 不是会员
- return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
+ List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
+ for (TStudyPair pair : pairList) {
+ if (pair.getIsVip() == 0) {
+ // 需要会员查看
+ if (!isVip) {
+ // 不是会员
+ return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
+ }
}
}
- return R.ok(studyService.pictureMateVoice(week, day, pair));
+ return R.ok(studyService.pictureMateVoice(week, day, pairList));
}
/**
@@ -901,23 +1149,69 @@
* @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);
+ @ApiOperation(value = "完成学习", tags = {"学习端-听-自主学习"})
+ public R<Integer> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
}
- // 生成积分明细记录
- TIntegralRecord integralRecord = new TIntegralRecord();
- integralRecord.setIntegral(String.valueOf(completeStudy.getIntegral()));
- integralRecord.setMethod(completeStudy.getMethod());
- integralRecord.setUserId(userId);
- return R.ok(update && integralRecordService.save(integralRecord));
+ // 登录用户id
+ Integer userId = userStudy.getUserid();
+ // 判断是否已完成该题组
+ boolean update = true;
+ List<String> studyIds = Arrays.stream(completeStudy.getStudyIds().split(","))
+ .collect(Collectors.toList());
+ Integer type = completeStudy.getType();
+ // 可获取的总积分数量以及获取用户该学习已获取的积分数量，并计算本次可获取的剩余积分数量
+ int sum = studyService.computeTotalIntegral(studyIds, type, completeStudy.getAccuracy());
+ // 用户已获取的积分数量
+ int obtainedIntegral;
+ List<TUserStudyRecord> list = studyRecordService.lambdaQuery()
+ .eq(TUserStudyRecord::getQuarter, completeStudy.getQuarter())
+ .eq(TUserStudyRecord::getWeek, completeStudy.getWeek())
+ .eq(TUserStudyRecord::getDay, completeStudy.getDay())
+ .eq(TUserStudyRecord::getType, 0)
+ .eq(TUserStudyRecord::getStudyType, completeStudy.getType())
+ .eq(TUserStudyRecord::getUserId, userId).list();
+ if (list.isEmpty()) {
+ obtainedIntegral = 0;
+ } else {
+ obtainedIntegral = list.stream().map(TUserStudyRecord::getObtainedIntegral)
+ .mapToInt(Integer::intValue).sum();
+ }
+ // 计算本次可获取积分数量
+ if (sum > obtainedIntegral) {
+ int integral = sum - obtainedIntegral;
+ // 获取user详细信息，改变积分
+ TUser user = userService.getById(userId);
+ int i = user.getIntegral() + integral;
+ update = userService.lambdaUpdate().eq(TUser::getId, userId).set(TUser::getIntegral, i).update();
+ // 生成积分明细记录
+ TIntegralRecord integralRecord = new TIntegralRecord();
+ integralRecord.setIntegral(String.valueOf(integral));
+ integralRecord.setMethod(Constants.COMPLETE_LEARNING);
+ integralRecord.setUserId(userId);
+ update = update && integralRecordService.save(integralRecord);
+ // 生成学习完成记录
+ TUserStudyRecord record = new TUserStudyRecord();
+ record.setUserId(userId);
+ record.setQuarter(completeStudy.getQuarter());
+ record.setWeek(completeStudy.getWeek());
+ record.setDay(completeStudy.getDay());
+ // 学习类型
+ record.setStudyType(completeStudy.getType());
+ record.setObtainedIntegral(integral);
+ record.setType(Constants.ZERO);
+ update = update && studyRecordService.save(record);
+ }
+ // 更改学习记录
+ TUserStudy userStudyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudyRecord) {
+ userStudyRecord = createUserStudy(userId);
+ }
+ Boolean updateStudyRecord = userStudyService.exchangeStudyRecord(userStudyRecord, userId, completeStudy);
+ return R.ok(sum > obtainedIntegral ? sum - obtainedIntegral : 0);
}
/**
@@ -927,74 +1221,134 @@
* @param week 所属周目
*/
@GetMapping("/gameHearing")
- @ApiOperation(value = "自主游戏1-超级听力", tags = {"学习端-游戏"})
+ @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<StudyGameResultVO> gameHearing(@RequestParam Integer quarter, @RequestParam Integer difficulty,
+ @RequestParam Integer week) {
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer[] array = {0, 1, 2};
+ if (!Arrays.stream(array).collect(Collectors.toList()).contains(difficulty)) {
+ throw new GlobalException("请选择符合规则的游戏难度！");
+ }
+ TGame game = gameService.gameHearing(quarter, week);
+ if (null == game) {
+ throw new GlobalException("当前季度该周目暂无配置游戏数据！");
+ }
game.setIntegral(game.getIntegral().split(",")[difficulty]);
game.setTime(game.getTime().split(",")[difficulty]);
// 检验是否完成难度
- studyService.checkDifficulty(difficulty, week, game);
+ studyService.checkDifficulty(difficulty, week, game, userStudy.getUserid());
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();
- // 生成随机索引并获取数据
- for (int i = 0; i < game.getCount(); i++) {
- // 生成随机索引
- int randomIndex = random.nextInt(dataSize);
- // 获取对应的数据并加入结果列表
- subjectData.add(subjectId.get(randomIndex));
- }
- return R.ok(new StudyGamerResultVO(game,
- subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
+ List<String> subjectData = getData(game, newSubjectId, 1);
+ List<TSubject> subjectList = getSubjectList(subjectData);
+ return R.ok(new StudyGameResultVO(game, subjectList));
}
/**
* 自主游戏2-超级记忆
*
- * @param difficulty 难度(0入门、1中级、2困难)
- * @param week 所属周目
+ * @param quarter 季度
+ * @param week 所属周目
*/
@GetMapping("/gameMemory")
- @ApiOperation(value = "自主游戏2-超级记忆", tags = {"学习端-游戏"})
+ @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<StudyGameMemoryVO> gameMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TGame game = gameService.gameHearing(quarter, week);
+ if (null == game) {
+ throw new GlobalException("当前季度该周目暂无配置游戏数据！");
+ }
List<String> subjectId = getSubjectId(week);
+ List<String> subjectData = getSubjectData(game, subjectId);
+ List<TSubject> subjectList = getSubjectList(subjectData);
+ // 返回数据
+ List<GameMemoryPhotoVO> photoList = new ArrayList<>();
+ List<GameMemoryVoiceVO> voiceList = new ArrayList<>();
+ for (TSubject tSubject : subjectList) {
+ photoList.add(new GameMemoryPhotoVO(tSubject.getId(), tSubject.getImg()));
+ voiceList.add(new GameMemoryVoiceVO(tSubject.getId(), tSubject.getCorrect()));
+ }
+ // 校验超级听力是否通过
+ // studyService.checkClearance(game,userStudy.getUserid());
+ // 框架记忆数量翻倍，前端需要根据数量画格子
+ game.setAnswerCount(game.getAnswerCount() * 2);
+ return R.ok(new StudyGameMemoryVO(game, photoList, voiceList));
+ }
+
+ private List<String> getSubjectData(TGame game, List<String> subjectId) {
+ List<String> newSubjectId = subjectId.stream().map(data -> {
+ if (data.startsWith(Constants.REDUCE)) {
+ data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
+ }
+ return data;
+ }).distinct().collect(Collectors.toList());
// 判断周目下题目是否足够
- if (subjectId.size() < game.getCount()) {
+ if (newSubjectId.size() < game.getAnswerCount()) {
throw new GlobalException("当前周目下day1 - day5题目不足！");
}
// 根据游戏设置数量获取图片及语音
+ return getData(game, newSubjectId, 2);
+ }
+
+ private List<String> getData(TGame game, List<String> newSubjectId, int num) {
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 index;
+ if (1 == num) {
+ index = game.getCount();
+ } else {
+ index = game.getAnswerCount();
+ }
+ for (int i = 0; i < index; 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()));
+ return subjectData;
+ }
+
+ 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;
}
/**
@@ -1004,55 +1358,138 @@
* @param completeStudy 学习信息
*/
@PostMapping("/gameAchievement")
- @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-游戏"})
- public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-听-自主游戏"})
+ public R<Integer> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
/*
* 游戏测试需要根据正确率计算本次测试可获得积分
* 并且需要判断如果该游戏用户已获取一部分积分，再次测试后正确率增长，只能获取高于上次正确率的部分积分
* 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
*/
- Integer userid = tokenService.getLoginUserStudy().getUserid();
- TGame game = gameService.getById(completeStudy.getGameId());
+ Integer userid = loginUserStudy.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 availableIntegral = gameService.countIntegral(userid, game, completeStudy, integralRecordList);
+ Integer difficulty = completeStudy.getDifficulty();
+ List<TIntegralRecord> integralRecordList = integralRecordService.lambdaQuery()
+ .eq(TIntegralRecord::getUserId, userid)
+ .eq(TIntegralRecord::getGameId, game.getId())
+ .eq(TIntegralRecord::getDisabled, 0)
+ .eq(TIntegralRecord::getGameDifficulty, difficulty).list();
+ // 本次游戏总共能获取的积分数量
+ Integer integral;
+ Integer item = null;
+ if (completeStudy.getGameName().equals(Constants.HEARING)) {
+ // 本次游戏总积分
+ integral = Integer.parseInt(game.getIntegral().split(",")[difficulty]);
+ item = completeStudy.getDifficulty();
+ } else if (completeStudy.getGameName().equals(Constants.MEMORY)) {
+ integralRecordList = integralRecordService.lambdaQuery()
+ .eq(TIntegralRecord::getUserId, userid)
+ .eq(TIntegralRecord::getGameId, game.getId())
+ .eq(TIntegralRecord::getDisabled, 0)
+ .last("and gameDifficulty is null").list();
+ integral = game.getAnswerIntegral();
+ } else {
+ throw new GlobalException("该次游戏积分计算异常！");
+ }
+ int gameAvailableIntegral = (int) (integral * ((double) completeStudy.getAccuracy() / 100));
+ Integer availableIntegral = gameService.countIntegral(userid, game, completeStudy, gameAvailableIntegral, integralRecordList);
// 游戏测试记录
Boolean add = gameRecordService.add(completeStudy);
// 可获得积分不为null时，才添加积分明细记录
- if (null != availableIntegral) {
- add = add && integralRecordService.add(String.valueOf(availableIntegral), completeStudy.getMethod(), completeStudy.getGameId(), null);
+ if (null != availableIntegral && !Constants.ZERO.equals(availableIntegral)) {
+ add = add && integralRecordService.add(String.valueOf(availableIntegral),
+ Constants.COMPLETE_GAME, completeStudy.getGameId(), null, item, null);
// 用户账户添加积分
TUser user = userService.getById(userid);
user.setIntegral(user.getIntegral() + availableIntegral);
add = add && userService.updateById(user);
}
- return R.ok(add);
+ // 学习时长更新
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = createUserStudy(userid);
+ }
+ // 学习时长
+ userStudy.setTotalStudy(userStudy.getTotalStudy() + completeStudy.getUseTime());
+ userStudy.setTodayStudy(userStudy.getTodayStudy() + completeStudy.getUseTime());
+ userStudy.setWeekStudy(userStudy.getWeekStudy() + completeStudy.getUseTime());
+ userStudy.setMonthStudy(userStudy.getMonthStudy() + completeStudy.getUseTime());
+ userStudyService.updateById(userStudy);
+ // 学习配置列表
+ List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .orderByAsc(TStudy::getWeek).list();
+ if (studyList.isEmpty()) {
+ throw new GlobalException("学习配置列表未配置或数据失效！");
+ }
+ // 超级记忆逻辑
+ if (Constants.MEMORY.equals(completeStudy.getGameName())) {
+ // 超级记忆正确率达到通关率标准，才能进入下一周目学习
+ // 校验是否通关超级听力与超级记忆，通关则学习记录更新为下一周目
+ userStudyService.checkRate(game, userid, completeStudy, studyList);
+ } else {
+ // 超级听力需根据正确率判断是否允许进入下一难度
+ userStudyService.gameHearing(game, userid, completeStudy, studyList);
+ }
+ return R.ok(availableIntegral);
+ }
+
+ private TUserStudy createUserStudy(Integer userid) {
+ TUserStudy userStudy = new TUserStudy();
+ userStudy.setUserId(userid);
+ // 学习周目
+ TStudy tStudy = studyService.lambdaQuery().eq(TStudy::getQuarter, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).last("limit 1").one();
+ userStudy.setWeek(tStudy.getWeek());
+ userStudy.setDay(Constants.ONE);
+ userStudy.setTotalStudy(Constants.ZERO);
+ userStudy.setTodayStudy(Constants.ZERO);
+ userStudy.setWeekStudy(Constants.ZERO);
+ userStudy.setMonthStudy(Constants.ZERO);
+ userStudy.setListen(Constants.BURDEN_ONE);
+ userStudy.setLook(Constants.BURDEN_ONE);
+ userStudy.setInduction(Constants.BURDEN_ONE);
+ userStudy.setAnswer(Constants.BURDEN_ONE);
+ userStudy.setPair(Constants.BURDEN_ONE);
+ userStudyService.save(userStudy);
+ return userStudy;
}
private List<String> getSubjectId(Integer week) {
// 当前week下day1 - day5所有题目
- List<String> subjectId = redisService.getCacheList(RedisConstants.HEARING_TREE);
- if (null == subjectId || subjectId.isEmpty()) {
- List<String> listenSubject = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
- .eq(TStudyListen::getDisabled, 0).list().stream().map(TStudyListen::getSubject).collect(Collectors.toList());
- List<String> inductionSubject = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
- .eq(TStudyInduction::getDisabled, 0).list().stream().map(TStudyInduction::getSubject).collect(Collectors.toList());
- List<String> lookSubject = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
- .eq(TStudyLook::getDisabled, 0).list().stream().map(TStudyLook::getSubject).collect(Collectors.toList());
- List<String> pairSubject = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
- .eq(TStudyPair::getDisabled, 0).list().stream().map(TStudyPair::getSubject).collect(Collectors.toList());
- listenSubject.addAll(inductionSubject);
- listenSubject.addAll(lookSubject);
- listenSubject.addAll(pairSubject);
- // 获取具体subject信息
- subjectId = new ArrayList<>();
- for (String subject : listenSubject) {
- subjectId.addAll(Arrays.asList(subject.split(",")));
- }
- redisService.setCacheList(RedisConstants.HEARING_TREE, subjectId);
- redisService.expire(RedisConstants.HEARING_TREE, RedisConstants.THIRTY, TimeUnit.MINUTES);
+ List<String> subjectId = new ArrayList<>();
+ List<String> listenSubject = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
+ .eq(TStudyListen::getDisabled, 0).list().stream().map(TStudyListen::getSubject).collect(Collectors.toList());
+ List<String> inductionSubject = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
+ .eq(TStudyInduction::getDisabled, 0).list().stream().map(TStudyInduction::getSubject).collect(Collectors.toList());
+ List<String> lookSubject = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
+ .eq(TStudyLook::getDisabled, 0).list().stream().map(TStudyLook::getSubject).collect(Collectors.toList());
+ List<String> pairSubject = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
+ .eq(TStudyPair::getDisabled, 0).list().stream().map(TStudyPair::getSubject).collect(Collectors.toList());
+ List<String> studyAnswerList = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
+ .eq(TStudyAnswer::getDisabled, 0).list().stream().map(data -> String.valueOf(data.getSubject())).collect(Collectors.toList());
+ // 自主学习1-4需要单独处理
+ for (String s : listenSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
}
+ for (String s : inductionSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
+ }
+ for (String s : lookSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
+ }
+ for (String s : pairSubject) {
+ subjectId.addAll(Arrays.stream(s.split(",")).collect(Collectors.toList()));
+ }
+ subjectId.addAll(studyAnswerList);
return subjectId;
}
@@ -1062,17 +1499,21 @@
* @param week 周目
*/
@GetMapping("/lookPictureDbu")
- @ApiOperation(value = "自主故事1-看图配音", tags = {"学习端-故事"})
+ @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();
- // 获取对应图片语音
- 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()));
+ TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
+ // 题组信息
+ StudyStoryVO studyStory = new StudyStoryVO();
+ studyStory.setId(storyListen.getId());
+ studyStory.setIntegral(storyListen.getLookIntegral());
+ // 故事语音及图片信息
+ List<TStory> list = storyService.lookPictureDbu(storyListen, 0);
+ return R.ok(new StudyStoryListenResultVO(studyStory, list));
}
/**
@@ -1081,70 +1522,174 @@
* @param week 周目
*/
@GetMapping("/frameworkMemory")
- @ApiOperation(value = "自主故事2-框架记忆", tags = {"学习端-故事"})
+ @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) {
+ public R<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
// 看图配音信息
- TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
- // 获取对应图片语音
- 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()));
+ TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
+ // 题组信息
+ StudyStoryVO studyStory = new StudyStoryVO();
+ studyStory.setId(storyListen.getId());
+ studyStory.setIntegral(storyListen.getIntegral());
+ // 故事语音及图片信息
+ List<TStory> list = storyService.lookPictureDbu(storyListen, 1);
+ return R.ok(new StudyStoryListenResultVO(studyStory, list));
}
/**
* 完成故事类型
*/
@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 = "类型(1:看图配音；2:超级记忆)", name = "type", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "正确率", name = "accuracy", dataType = "Integer"),
+ @ApiImplicitParam(value = "学习时长(秒)", name = "studyTime", dataType = "Integer", 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();
+ public R<Integer> completeStory(@RequestParam Integer storyId, @RequestParam Integer type,
+ Integer accuracy, @RequestParam Integer studyTime) {
+ TStoryListen storyListen = storyListenService.lambdaQuery().eq(TStoryListen::getId, storyId)
+ .eq(TStoryListen::getDisabled, 0).one();
if (null == storyListen) {
throw new GlobalException("当前故事学习失败，故事信息异常，请重试！");
}
- // 用户信息
- 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);
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
}
- return R.ok(result);
+ // 用户信息
+ Integer userId = loginUserStudy.getUserid();
+ Boolean result = true;
+ // 学习时长更新
+ TStudy study = studyService.lambdaQuery().eq(TStudy::getId, storyListen.getStudyId())
+ .eq(TStudy::getDisabled, 0).one();
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = createUserStudy(userId);
+ }
+ userStudy.setTotalStudy(userStudy.getTotalStudy() + studyTime);
+ userStudy.setTodayStudy(userStudy.getTodayStudy() + studyTime);
+ userStudy.setWeekStudy(userStudy.getWeekStudy() + studyTime);
+ userStudy.setMonthStudy(userStudy.getMonthStudy() + studyTime);
+ boolean update = userStudyService.updateById(userStudy);
+ if (!update) {
+ throw new GlobalException("学习时长更新失败！");
+ }
+ // 根据故事类型不同，逻辑处理
+ int sum = 0;
+ if (Constants.ONE.equals(type)) {
+ if (null == accuracy) {
+ throw new GlobalException("自主故事-看图配音正确率异常！");
+ }
+ // 看图配音模式，也需要根据游戏正确率计算积分
+ double d = (double) accuracy / 100;
+ int integral = (int) (storyListen.getLookIntegral() * d);
+ int obtainedIntegral;
+ // 看图配音已获取积分数量
+ List<TUserStudyRecord> list = studyRecordService.lambdaQuery()
+ .eq(TUserStudyRecord::getStoryId, storyId)
+ .eq(TUserStudyRecord::getType, 1)
+ .eq(TUserStudyRecord::getQuarter, study.getQuarter())
+ .eq(TUserStudyRecord::getWeek, storyListen.getWeek())
+ .eq(TUserStudyRecord::getUserId, userId).list();
+ if (list.isEmpty()) {
+ obtainedIntegral = 0;
+ } else {
+ obtainedIntegral = list.stream().map(TUserStudyRecord::getObtainedIntegral)
+ .mapToInt(Integer::intValue).sum();
+ }
+ // 可获得积分计算
+ int i = integral - obtainedIntegral;
+ if (i > 0) {
+ TUserStudyRecord data = new TUserStudyRecord();
+ data.setUserId(userId);
+ data.setObtainedIntegral(i);
+ data.setType(Constants.ONE);
+ data.setStoryId(storyId);
+ data.setQuarter(study.getQuarter());
+ data.setWeek(storyListen.getWeek());
+ result = studyRecordService.save(data);
+ sum = i;
+ // 添加积分明细记录
+ result = integralRecordService.add(String.valueOf(sum),
+ Constants.COMPLETE_STORY, null, storyId, null, Constants.ZERO);
+ TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
+ // 添加积分
+ user.setIntegral(user.getIntegral() + sum);
+ result = result && userService.updateById(user);
+ }
+ } else {
+ // 超级记忆只有首次才能获取积分
+ TIntegralRecord integralRecord = integralRecordService.lambdaQuery()
+ .eq(TIntegralRecord::getUserId, userId)
+ .eq(TIntegralRecord::getStoryId, storyId)
+ .eq(TIntegralRecord::getDisabled, 0)
+ .eq(TIntegralRecord::getStoryType, Constants.ONE)
+ .one();
+ if (null == integralRecord) {
+ // 添加积分明细记录
+ result = integralRecordService.add(String.valueOf(storyListen.getIntegral()),
+ Constants.COMPLETE_STORY, null, storyId, null, Constants.ONE);
+ TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
+ // 添加积分
+ user.setIntegral(user.getIntegral() + storyListen.getIntegral());
+ result = result && userService.updateById(user);
+ sum = storyListen.getIntegral();
+ }
+ }
+ return R.ok(sum);
}
@GetMapping("/studyRecord")
@ApiOperation(value = "个人中心-学习记录", tags = {"学习端-个人中心"})
public R<StudyRecordResultVO> studyRecord() {
- Integer userId = tokenService.getLoginUserStudy().getUserid();
-
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userId = userStudy.getUserid();
// 学习记录
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
.eq(TUserStudy::getDisabled, 0).one();
- // 游戏测试成绩
- List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
- .eq(TGameRecord::getDisabled, 0).list();
+ // 总时长还需计算上游戏测试成绩时长
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery()
+ .eq(TGameRecord::getUserId, userId)
+ .eq(TGameRecord::getDisabled, 0)
+ .orderByDesc(TGameRecord::getCreateTime)
+ .list();
+ if (null != studyRecord) {
+ // 学习时长格式转换
+ Integer todayStudy = studyRecord.getTodayStudy();
+ studyRecord.setTodayStudy(Math.round((float) todayStudy / 3600));
+ Integer weekStudy = studyRecord.getWeekStudy();
+ studyRecord.setWeekStudy(Math.round((float) weekStudy / 3600));
+ Integer monthStudy = studyRecord.getMonthStudy();
+ studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
+ // 游戏总时长
+ int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
+ Integer totalStudy = studyRecord.getTotalStudy();
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ // 剩余周目
+ List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).list();
+ int size = studyService.residueWeek(studyRecord, studyList);
+ studyRecord.setSurplus(size);
+ }
return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
}
+
@GetMapping("/record")
@ApiOperation(value = "游戏测试成绩", tags = {"家长端-游戏测试成绩"})
public R<StudyRecordResultVO> record() {
LoginUserParent loginUser1 = tokenService.getLoginUser1();
- if (loginUser1 == null){
+ System.err.println("用户登录信息:" + loginUser1);
+ if (loginUser1 == null) {
return R.tokenError("登陆失效,请重新登录");
}
Integer userId = loginUser1.getUserid();
@@ -1152,28 +1697,83 @@
// 学习记录
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)
+ .orderByDesc(TGameRecord::getCreateTime)
+ .list();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ if (null != studyRecord) {
+ // 学习时长格式转换
+ Integer todayStudy = studyRecord.getTodayStudy();
+ studyRecord.setTodayStudy(Math.round((float) todayStudy / 3600));
+ Integer weekStudy = studyRecord.getWeekStudy();
+ studyRecord.setWeekStudy(Math.round((float) weekStudy / 3600));
+ Integer monthStudy = studyRecord.getMonthStudy();
+ studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
+ // 游戏总时长
+ int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
+ for (TGameRecord tGameRecord : gameRecordList) {
+ tGameRecord.setTime(simpleDateFormat.format(tGameRecord.getCreateTime()));
+ }
+ Integer totalStudy = studyRecord.getTotalStudy();
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ // 剩余周目
+ List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).list();
+ int size = studyService.residueWeek(studyRecord, studyList);
+ studyRecord.setSurplus(size);
+ }
+ return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
+ }
+
+ @PostMapping("/recordManagement/{id}")
+ @ApiOperation(value = "游戏测试成绩", tags = {"管理后台-查看用户详情"})
+ public R<StudyRecordResultVO> recordManagement(@PathVariable("id") Integer id) {
+ // 学习记录
+ TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, id)
+ .eq(TUserStudy::getDisabled, 0).one();
// 查询剩余周目
- if (studyRecord!=null){
+ if (studyRecord != null) {
int size = studyService.list(new QueryWrapper<TStudy>()
.eq("type", 1)).size();
- studyRecord.setSurplus(size-studyRecord.getWeek());
- }else{
+ studyRecord.setSurplus(size - studyRecord.getWeek());
+ } else {
TUserStudy tUserStudy = new TUserStudy();
tUserStudy.setSurplus(studyService.list(new QueryWrapper<TStudy>()
.eq("type", 1)).size());
+ tUserStudy.setTodayStudy(Constants.ZERO);
+ tUserStudy.setTotalStudy(Constants.ZERO);
+ tUserStudy.setWeekStudy(Constants.ZERO);
+ tUserStudy.setMonthStudy(Constants.ZERO);
studyRecord = tUserStudy;
}
- // 游戏测试成绩
- List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
+ // 学习时长格式转换
+ Integer todayStudy = studyRecord.getTodayStudy();
+ studyRecord.setTodayStudy(Math.round((float) todayStudy / 3600));
+ Integer weekStudy = studyRecord.getWeekStudy();
+ studyRecord.setWeekStudy(Math.round((float) weekStudy / 3600));
+ Integer monthStudy = studyRecord.getMonthStudy();
+ studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
+ // 总时长还需计算上游戏测试成绩时长
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, id)
.eq(TGameRecord::getDisabled, 0).list();
- return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
+ int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
+ Integer totalStudy = studyRecord.getTotalStudy();
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ StudyRecordResultVO studyRecordResultVO = new StudyRecordResultVO(studyRecord, gameRecordList);
+ return R.ok(studyRecordResultVO);
}
+
@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() {
@@ -1191,25 +1791,34 @@
public R<IPage<TIntegralRecord>> integralDetail(String time,
@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize) {
- if(tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
- return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUserStudy().getUserid(), time));
+ IPage<TIntegralRecord> page = integralRecordService.integralDetail(new Page<>(pageNum, pageSize),
+ tokenService.getLoginUserStudy().getUserid(), time);
+ for (TIntegralRecord record : page.getRecords()) {
+ if (!record.getIntegral().startsWith("-")) {
+ record.setIntegral("+" + record.getIntegral());
+ }
+ }
+ return R.ok(page);
}
+
@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)
+ @ApiImplicitParam(value = "查询时间 格式yyyy-MM", name = "time"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", required = true),
+ @ApiImplicitParam(value = "每页显示条数", name = "pageSize", required = true)
})
public R<IPage<TIntegralRecord>> integralDetailParent(String time,
- @RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize) {
- if(tokenService.getLoginUser1() == null){
+ @RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize) {
+ System.err.println("页码" + pageNum);
+ System.err.println("页数" + pageSize);
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
-
return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUser1().getUserid(), time));
}
@@ -1240,6 +1849,29 @@
integralRecord.setUpdateTime(new Date());
return R.ok(integralRecordService.save(integralRecord));
}
+
+ @GetMapping("/addIntegralDetailParent")
+// @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "变动源(完成学习、完成游戏...)", name = "method", dataType = "String", required = true)
+ })
+ public R<Boolean> addIntegralDetailParent(@RequestParam("integral") String integral, @RequestParam("method") String method) {
+ // 当前登录用户
+ LoginUserParent userStudy = tokenService.getLoginUser1();
+ // 生成积分明细信息
+ 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));
+ }
+
@GetMapping("/addIntegralDetail1")
// @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
@ApiImplicitParams({
@@ -1249,7 +1881,7 @@
public R addIntegralDetail1(@RequestParam("integral") String integral, @RequestParam("method") String method) {
// 当前登录用户
LoginUserParent userStudy = tokenService.getLoginUser1();
- if (userStudy == null){
+ if (userStudy == null) {
return R.tokenError("登录失效");
}
// 生成积分明细信息
@@ -1282,6 +1914,22 @@
}
return R.ok(userService.updateById(user));
}
+
+ @GetMapping("/exchangeIntegralParent")
+// @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ public R<Boolean> exchangeIntegralParent(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
+ if (tokenService.getLoginUser1() == null) {
+ return R.tokenError("登录失效");
+ }
+ 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));
+ }
+
@GetMapping("/exchangeIntegral1")
// @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
public R<Boolean> exchangeIntegral1(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
--
Gitblit v1.7.1