From 8c425b4789a2b04c26987a037577b1880bce5e3e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 六月 2024 09:04:59 +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 | 126 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 38 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 a5ca771..224def4 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
@@ -809,7 +809,7 @@
data.setIsDelete(0);
result = result && userPresentRecordService.save(data);
} else {
- if (System.currentTimeMillis() - record.getPresentTime().getTime() >= 10 * 60 * 1000) {
+ if (System.currentTimeMillis() - record.getPresentTime().getTime() >= (long) Integer.parseInt(sysSet.getTime()) * 60 * 1000) {
// 赠送积分
result = userService.lambdaUpdate()
.set(TUser::getIntegral, user.getIntegral() + Integer.parseInt(integral))
@@ -820,6 +820,12 @@
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);
@@ -1115,7 +1121,7 @@
*/
@PostMapping("/completeLearning")
@ApiOperation(value = "完成学习", tags = {"学习端-听-自主学习"})
- public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
+ public R<Integer> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
LoginUserParent userStudy = tokenService.getLoginUserStudy();
if (null == userStudy) {
return R.tokenError("登录失效！");
@@ -1176,7 +1182,7 @@
userStudyRecord = createUserStudy(userId);
}
Boolean updateStudyRecord = userStudyService.exchangeStudyRecord(userStudyRecord, userId, completeStudy);
- return R.ok(update && updateStudyRecord);
+ return R.ok(sum > obtainedIntegral ? sum - obtainedIntegral : 0);
}
/**
@@ -1222,7 +1228,7 @@
throw new GlobalException("当前周目下day1 - day5题目不足！");
}
// 根据游戏设置数量获取图片及语音
- List<String> subjectData = getData(game, newSubjectId);
+ List<String> subjectData = getData(game, newSubjectId, 1);
List<TSubject> subjectList = getSubjectList(subjectData);
return R.ok(new StudyGameResultVO(game, subjectList));
}
@@ -1240,6 +1246,10 @@
@ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
})
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("当前季度该周目暂无配置游戏数据！");
@@ -1254,6 +1264,8 @@
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));
@@ -1271,16 +1283,22 @@
throw new GlobalException("当前周目下day1 - day5题目不足！");
}
// 根据游戏设置数量获取图片及语音
- return getData(game, newSubjectId);
+ return getData(game, newSubjectId, 2);
}
- private List<String> getData(TGame game, List<String> newSubjectId) {
+ private List<String> getData(TGame game, List<String> newSubjectId, int num) {
List<String> subjectData = new ArrayList<>();
Random random = new Random();
// 获取列表大小
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);
// 获取对应的数据并加入结果列表
@@ -1312,7 +1330,7 @@
*/
@PostMapping("/gameAchievement")
@ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-听-自主游戏"})
- public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
+ public R<Integer> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
if (null == loginUserStudy) {
return R.tokenError("登录失效！");
@@ -1323,19 +1341,31 @@
* 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
*/
Integer userid = loginUserStudy.getUserid();
- TGame game = gameService.lambdaQuery().eq(TGame::getId, completeStudy.getGameId()).eq(TGame::getDisabled, 0).one();
+ 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 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(",")[completeStudy.getDifficulty()]);
+ 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("该次游戏积分计算异常！");
@@ -1345,8 +1375,9 @@
// 游戏测试记录
Boolean add = gameRecordService.add(completeStudy);
// 可获得积分不为null时，才添加积分明细记录
- if (null != availableIntegral) {
- add = add && integralRecordService.add(String.valueOf(availableIntegral), Constants.COMPLETE_GAME, 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);
@@ -1363,25 +1394,23 @@
userStudy.setTodayStudy(userStudy.getTodayStudy() + completeStudy.getUseTime());
userStudy.setWeekStudy(userStudy.getWeekStudy() + completeStudy.getUseTime());
userStudy.setMonthStudy(userStudy.getMonthStudy() + completeStudy.getUseTime());
- boolean update = userStudyService.updateById(userStudy);
+ 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())) {
- // 学习配置列表
- List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
- .orderByAsc(TStudy::getWeek).list();
- if (studyList.isEmpty()) {
- throw new GlobalException("学习配置列表未配置或数据失效！");
- }
// 超级记忆正确率达到通关率标准，才能进入下一周目学习
+ // 校验是否通关超级听力与超级记忆，通关则学习记录更新为下一周目
userStudyService.checkRate(game, userid, completeStudy, studyList);
- add = add && completeStudy.getAccuracy() >= Integer.parseInt(game.getAnswerRate());
} else {
// 超级听力需根据正确率判断是否允许进入下一难度
- userStudyService.gameHearing(game, userid, completeStudy);
- String rate = game.getRate().split(",")[completeStudy.getDifficulty()];
- add = add && completeStudy.getAccuracy() >= Integer.parseInt(rate);
+ userStudyService.gameHearing(game, userid, completeStudy, studyList);
}
- return R.ok(add && update);
+ return R.ok(availableIntegral);
}
private TUserStudy createUserStudy(Integer userid) {
@@ -1492,7 +1521,7 @@
@ApiImplicitParam(value = "正确率", name = "accuracy", dataType = "Integer"),
@ApiImplicitParam(value = "学习时长(秒)", name = "studyTime", dataType = "Integer", required = true)
})
- public R<Boolean> completeStory(@RequestParam Integer storyId, @RequestParam Integer type,
+ 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();
@@ -1507,30 +1536,37 @@
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);
}
+ 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("自主故事-看图配音正确率异常！");
}
// 看图配音模式，也需要根据游戏正确率计算积分
- int integral = storyListen.getLookIntegral() * (accuracy / 100);
+ 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;
@@ -1539,31 +1575,45 @@
.mapToInt(Integer::intValue).sum();
}
// 可获得积分计算
- if (integral > obtainedIntegral) {
+ int i = integral - obtainedIntegral;
+ if (i > 0) {
TUserStudyRecord data = new TUserStudyRecord();
data.setUserId(userId);
- data.setObtainedIntegral(integral - obtainedIntegral);
+ 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).one();
+ .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);
+ 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(result);
+ return R.ok(sum);
}
@GetMapping("/studyRecord")
@@ -1596,7 +1646,7 @@
List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
.eq(TStudy::getType, Constants.ONE)
.orderByAsc(TStudy::getWeek).list();
- int size = studyService.residueWeek(studyRecord,studyList);
+ int size = studyService.residueWeek(studyRecord, studyList);
studyRecord.setSurplus(size);
}
return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
--
Gitblit v1.7.1