| | |
| | | |
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.ruoyi.common.core.constant.Constants; |
| | | import com.ruoyi.common.core.domain.R; |
| | |
| | | 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()); |
| | |
| | | studyPairVO.setIsVip(tStudyPair.getIsVip()); |
| | | pairVOS.add(studyPairVO); |
| | | } |
| | | |
| | | } |
| | | List<TGame> list5 = gameService.list(new QueryWrapper<TGame>() |
| | | .eq("week", week)); |
| | |
| | | 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>() |
| | |
| | | if (null == loginStudy) { |
| | | return R.tokenError("登录失效!"); |
| | | } |
| | | TUserStudy result = studyService.studySchedule(String.valueOf(loginStudy.getUserid()), week); |
| | | if (null != result) { |
| | | 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(result, week); |
| | | result.setComputeSchedule(computeSchedule); |
| | | 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)); |
| | | } |
| | | return R.ok(result); |
| | | return R.ok(studyRecord); |
| | | } |
| | | |
| | | /** |
| | |
| | | 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("/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(); |
| | | 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); |
| | | } |
| | | |
| | | /** |
| | |
| | | .eq(TSubjectRecord::getDisabled, 0).one(); |
| | | // 返回结果 |
| | | SubjectRecordResultVO result; |
| | | SubjectRecordResultVO data = subjectRecordService.recordResult(subjectRecord, loginStudy.getUserid()); |
| | | if (null != subjectRecord) { |
| | | subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 1) |
| | | .eq(TSubjectRecord::getId, subjectRecord.getId()).update(); |
| | |
| | | .collect(Collectors.toList()); |
| | | result = new SubjectRecordResultVO(teamIds, topicIds, subjectRecord.getAnswerNumber(), subjectRecord.getCorrectNumber()); |
| | | } else { |
| | | result = new SubjectRecordResultVO(); |
| | | result = null; |
| | | } |
| | | subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 0) |
| | | .eq(TSubjectRecord::getUserId, loginStudy.getUserid()).update(); |
| | |
| | | int completionRate = exitLearn.getTopicIds().split(",").length * 5; |
| | | Integer type = exitLearn.getType(); |
| | | // 更新用户学习完成率 |
| | | LambdaUpdateChainWrapper<TUserStudy> wrapper = userStudyService.lambdaUpdate(); |
| | | if (Constants.ONE.equals(type) && userStudy.getListen() < completionRate) { |
| | | // 听音选图 |
| | | wrapper.set(TUserStudy::getListen, completionRate); |
| | | userStudy.setListen(completionRate); |
| | | } else if (Constants.TWO.equals(type) && userStudy.getLook() < completionRate) { |
| | | // 看图选音 |
| | | wrapper.set(TUserStudy::getLook, completionRate); |
| | | userStudy.setLook(completionRate); |
| | | } else if (Constants.THREE.equals(type) && userStudy.getInduction() < completionRate) { |
| | | // 归纳排除 |
| | | wrapper.set(TUserStudy::getInduction, completionRate); |
| | | userStudy.setInduction(completionRate); |
| | | } else if (Constants.FOUR.equals(type) && userStudy.getAnswer() < completionRate) { |
| | | // 有问有答 |
| | | wrapper.set(TUserStudy::getAnswer, completionRate); |
| | | userStudy.setAnswer(completionRate); |
| | | } else if (Constants.FIVE.equals(type) && userStudy.getPair() < completionRate) { |
| | | // 音图相配 |
| | | wrapper.set(TUserStudy::getPair, completionRate); |
| | | userStudy.setPair(completionRate); |
| | | } |
| | | wrapper.eq(TUserStudy::getUserId, userid).update(); |
| | | } |
| | | // 学习时长更新 |
| | | 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)); |
| | | } |
| | | |
| | |
| | | record.setType(Constants.ZERO); |
| | | update = update && studyRecordService.save(record); |
| | | } |
| | | // 学习配置列表 |
| | | 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); |
| | | 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(update && updateStudyRecord); |
| | | } |
| | | |
| | |
| | | }) |
| | | 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("请选择符合规则的游戏难度!"); |
| | |
| | | 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)) { |
| | |
| | | @PostMapping("/gameAchievement") |
| | | @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-听-自主游戏"}) |
| | | public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) { |
| | | LoginUserParent userStudy = tokenService.getLoginUserStudy(); |
| | | if (null == userStudy) { |
| | | LoginUserParent loginUserStudy = tokenService.getLoginUserStudy(); |
| | | if (null == loginUserStudy) { |
| | | return R.tokenError("登录失效!"); |
| | | } |
| | | /* |
| | |
| | | * 并且需要判断如果该游戏用户已获取一部分积分,再次测试后正确率增长,只能获取高于上次正确率的部分积分 |
| | | * 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分 |
| | | */ |
| | | Integer userid = userStudy.getUserid(); |
| | | Integer userid = loginUserStudy.getUserid(); |
| | | TGame game = gameService.lambdaQuery().eq(TGame::getId, completeStudy.getGameId()).eq(TGame::getDisabled, 0).one(); |
| | | if (null == game) { |
| | | throw new GlobalException("游戏信息异常!"); |
| | |
| | | user.setIntegral(user.getIntegral() + availableIntegral); |
| | | add = add && userService.updateById(user); |
| | | } |
| | | return R.ok(add); |
| | | // 超级记忆逻辑 |
| | | 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); |
| | | } |
| | | // 学习时长更新 |
| | | 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); |
| | | } |
| | | |
| | | 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) { |
| | |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(value = "故事id", name = "storyId", dataType = "Integer", required = true), |
| | | @ApiImplicitParam(value = "类型(1:看图配音;2:超级记忆)", name = "type", dataType = "Integer", required = true), |
| | | @ApiImplicitParam(value = "正确率", name = "accuracy", dataType = "Integer") |
| | | @ApiImplicitParam(value = "正确率", name = "accuracy", dataType = "Integer"), |
| | | @ApiImplicitParam(value = "学习时长(秒)", name = "studyTime", dataType = "Integer", required = true) |
| | | }) |
| | | public R<Boolean> completeStory(@RequestParam Integer storyId, @RequestParam Integer type, Integer accuracy) { |
| | | public R<Boolean> 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("当前故事学习失败,故事信息异常,请重试!"); |
| | | } |
| | | LoginUserParent userStudy = tokenService.getLoginUserStudy(); |
| | | if (null == userStudy) { |
| | | LoginUserParent loginUserStudy = tokenService.getLoginUserStudy(); |
| | | if (null == loginUserStudy) { |
| | | return R.tokenError("登录失效!"); |
| | | } |
| | | // 用户信息 |
| | | Integer userId = userStudy.getUserid(); |
| | | Integer userId = loginUserStudy.getUserid(); |
| | | Boolean result = true; |
| | | // 学习时长更新 |
| | | 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("学习时长更新失败!"); |
| | | } |
| | | // 根据故事类型不同,逻辑处理 |
| | | if (Constants.ONE.equals(type)) { |
| | | if (null == accuracy) { |
| | | throw new GlobalException("自主故事-看图配音正确率异常!"); |
| | |
| | | if (list.isEmpty()) { |
| | | obtainedIntegral = 0; |
| | | } else { |
| | | obtainedIntegral = list.stream().map(TUserStudyRecord::getObtainedIntegral).mapToInt(Integer::intValue).sum(); |
| | | obtainedIntegral = list.stream().map(TUserStudyRecord::getObtainedIntegral) |
| | | .mapToInt(Integer::intValue).sum(); |
| | | } |
| | | // 可获得积分计算 |
| | | if (integral > obtainedIntegral) { |
| | |
| | | // 学习记录 |
| | | 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(); |
| | | 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)); |
| | | // 剩余周目 |
| | | int size = studyService.list(new QueryWrapper<TStudy>() |
| | | .eq("type", 1)).size(); |
| | | studyRecord.setSurplus(size - studyRecord.getWeek()); |
| | | } |
| | | return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList)); |
| | | } |
| | | |
| | |
| | | @ApiOperation(value = "游戏测试成绩", tags = {"家长端-游戏测试成绩"}) |
| | | public R<StudyRecordResultVO> record() { |
| | | LoginUserParent loginUser1 = tokenService.getLoginUser1(); |
| | | System.err.println("用户登录信息:" + loginUser1); |
| | | if (loginUser1 == null) { |
| | | return R.tokenError("登陆失效,请重新登录"); |
| | | } |
| | |
| | | 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; |
| | | } |
| | | // 游戏测试成绩 |
| | | // 学习时长格式转换 |
| | | 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)); |
| | | return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList)); |
| | | } |
| | | |
| | |
| | | @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, |
| | | Integer pageNum, |
| | | Integer pageSize) { |
| | | @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)); |
| | | } |
| | | |
| | |
| | | public R<Boolean> addIntegralDetail(@RequestParam("integral") String integral, @RequestParam("method") String method) { |
| | | // 当前登录用户 |
| | | LoginUserParent userStudy = tokenService.getLoginUserStudy(); |
| | | // 生成积分明细信息 |
| | | TIntegralRecord integralRecord = new TIntegralRecord(); |
| | | integralRecord.setIntegral(integral); |
| | | integralRecord.setMethod(method); |
| | | integralRecord.setUserId(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("/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); |
| | |
| | | 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) { |