From eb048c01b8734cc765ab744b128d0edc18f20beb Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 21 六月 2024 11:56:12 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 103 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 73 insertions(+), 30 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 3ce58ac..b6fc43c 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
@@ -79,6 +79,8 @@
private IUserStudyRecordService studyRecordService;
@Resource
private ManagementClient managementClient;
+ @Resource
+ private ITUserPresentRecordService userPresentRecordService;
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
@@ -751,7 +753,11 @@
@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);
}
@@ -784,11 +790,39 @@
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();
- boolean update = userService.lambdaUpdate().set(TUser::getIntegral, user.getIntegral() + Integer.parseInt(integral))
- .eq(TUser::getId, loginStudy.getUserid()).update();
- return R.ok(update);
+ 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() >= 10 * 60) {
+ // 赠送积分
+ 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);
+ }
+ }
+ return R.ok(result);
}
/**
@@ -857,7 +891,6 @@
Integer day = exitLearn.getDay();
if (userStudy.getWeek().equals(exitLearn.getWeek()) && userStudy.getDay().equals(exitLearn.getDay())) {
// 计算完成率
- List<String> teamList = Arrays.stream(exitLearn.getTeamIds().split(",")).collect(Collectors.toList());
Integer type = exitLearn.getType();
// 更新用户学习完成率
if (Constants.ONE.equals(type)) {
@@ -867,7 +900,7 @@
for (TStudyListen studyListen : studyListens) {
item += studyListen.getSubject().split(",").length;
}
- int i = exitLearn.getTopicIds().split(",").length / item;
+ int i = (int) ((double) (exitLearn.getTopicIds().split(",").length / item) * 100);
if (i > userStudy.getListen()) {
userStudy.setListen(100 - i);
}
@@ -876,7 +909,7 @@
List<TStudyLook> lookList = studyLookService.pictureSelectVoice(quarter, week, day);
if (!lookList.isEmpty()) {
int item = lookList.size();
- int i = exitLearn.getSchedule() / item;
+ int i = (int) ((double) (exitLearn.getSchedule() / item)) * 100;
if (i > userStudy.getLook()) {
userStudy.setLook(100 - i);
}
@@ -886,7 +919,7 @@
List<TStudyInduction> inductionList = studyInductionService.induceExclude(quarter, week, day);
if (!inductionList.isEmpty()) {
int item = inductionList.size();
- int i = exitLearn.getSchedule() / item;
+ int i = (int) ((double) (exitLearn.getSchedule() / item)) * 100;
if (i > userStudy.getInduction()) {
userStudy.setInduction(100 - i);
}
@@ -895,7 +928,7 @@
// 有问有答
List<TStudyAnswer> answerList = studyAnswerService.questionsAndAnswers(quarter, week, day);
if (answerList.size() % Constants.TWO == Constants.ZERO) {
- int i = exitLearn.getSchedule() / (answerList.size() / 2);
+ int i = (int) ((double) (exitLearn.getSchedule() / (answerList.size() / 2))) * 100;
if (i > userStudy.getAnswer()) {
userStudy.setAnswer(100 - i);
}
@@ -904,7 +937,7 @@
// 音图相配
List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
int item = pairList.size();
- int i = exitLearn.getSchedule() / item;
+ int i = (int) ((double) (exitLearn.getSchedule() / item)) * 100;
if (i > userStudy.getPair()) {
userStudy.setPair(100 - i);
}
@@ -939,7 +972,7 @@
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
for (TStudyListen studyListen : studyListens) {
- if (studyListen.getIsVip() == 1) {
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
if (!isVip) {
// 不是会员
@@ -970,7 +1003,7 @@
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyLook> lookList = studyLookService.pictureSelectVoice(quarter, week, day);
for (TStudyLook studyListen : lookList) {
- if (studyListen.getIsVip() == 1) {
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
if (!isVip) {
// 不是会员
@@ -1001,7 +1034,7 @@
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyInduction> inductionList = studyInductionService.induceExclude(quarter, week, day);
for (TStudyInduction studyListen : inductionList) {
- if (studyListen.getIsVip() == 1) {
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
if (!isVip) {
// 不是会员
@@ -1032,7 +1065,7 @@
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyAnswer> answerList = studyAnswerService.questionsAndAnswers(quarter, week, day);
for (TStudyAnswer studyListen : answerList) {
- if (studyListen.getIsVip() == 1) {
+ if (studyListen.getIsVip() == 0) {
// 需要会员查看
if (!isVip) {
// 不是会员
@@ -1063,7 +1096,7 @@
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
for (TStudyPair pair : pairList) {
- if (pair.getIsVip() == 1) {
+ if (pair.getIsVip() == 0) {
// 需要会员查看
if (!isVip) {
// 不是会员
@@ -1102,6 +1135,7 @@
.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;
@@ -1315,6 +1349,17 @@
user.setIntegral(user.getIntegral() + availableIntegral);
add = add && userService.updateById(user);
}
+ // 学习时长更新
+ 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());
+ }
+ boolean update = userStudyService.updateById(userStudy);
// 超级记忆逻辑
if (Constants.MEMORY.equals(completeStudy.getGameName())) {
// 学习配置列表
@@ -1332,17 +1377,6 @@
String rate = game.getRate().split(",")[completeStudy.getDifficulty()];
add = add && completeStudy.getAccuracy() >= Integer.parseInt(rate);
}
- // 学习时长更新
- 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());
- }
- boolean update = userStudyService.updateById(userStudy);
return R.ok(add && update);
}
@@ -1555,9 +1589,11 @@
Integer totalStudy = studyRecord.getTotalStudy();
studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
// 剩余周目
- int size = studyService.list(new QueryWrapper<TStudy>()
- .eq("type", 1)).size();
- studyRecord.setSurplus(size - studyRecord.getWeek());
+ 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));
}
@@ -1633,7 +1669,14 @@
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")
--
Gitblit v1.7.1