Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinE...

无关风月

2024-06-15 80b5033b8d5b918c7ca2523bc2a69139c2bab438

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -2,10 +2,8 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.RedisConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -13,6 +11,7 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.TGoodsVO;
import com.ruoyi.management.api.feignClient.ManagementClient;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.*;
import com.ruoyi.study.service.*;
@@ -28,7 +27,6 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
@@ -79,6 +77,8 @@
    private TokenService tokenService;
    @Resource
    private ITSubjectRecordService subjectRecordService;
    @Resource
    private ManagementClient managementClient;

    @PostMapping("/storyList")
//    @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
@@ -662,9 +662,6 @@
    }





    /**
     * 可兑换商品推荐
     */
@@ -673,6 +670,7 @@
    public R<List<TGoodsVO>> studySchedule() {
        return R.ok(goodsClient.goodRecommend().getData());
    }

    /**
     * 首次页面加载时调用,获取学习进度及学习时长等信息
     *
@@ -686,9 +684,10 @@
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
    })
    public R<TUserStudy> studySchedule(@RequestParam Integer week, @RequestParam Integer day) {
        TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week, day);
        TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week);
        return R.ok(result);
    }

    /**
     * 查询周目列表
     *
@@ -705,6 +704,7 @@
        List<StudyWeekDTO> result = studyService.weekList(type, quarter);
        return R.ok(result);
    }

    /**
     * 进入题组后，获取题组学习进度信息
     *
@@ -740,26 +740,21 @@
     * @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() == 1) {
                // 需要会员查看
                if (!isVip){
                if (!isVip) {
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
@@ -775,24 +770,21 @@
     * @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() == 1) {
                // 需要会员查看
                if (!isVip){
                if (!isVip) {
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
@@ -808,25 +800,21 @@
     * @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() == 1) {
                // 需要会员查看
                if (!isVip){
                if (!isVip) {
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
@@ -842,25 +830,21 @@
     * @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() == 1) {
                // 需要会员查看
                if (!isVip){
                if (!isVip) {
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
@@ -876,29 +860,27 @@
     * @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() == 1) {
                // 需要会员查看
                if (!isVip) {
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
            }
        }
        return R.ok(studyService.pictureMateVoice(week, day, pair));
        return R.ok(studyService.pictureMateVoice(week, day, pairList));
    }

    /**
@@ -907,23 +889,58 @@
     * @param completeStudy 完成学习信息
     */
    @PostMapping("/completeLearning")
    @ApiOperation(value = "完成学习", tags = {"学习端-题目"})
    @ApiOperation(value = "完成学习", tags = {"学习端-听-自主学习"})
    public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
        // 登录用户id
        Integer userId = tokenService.getLoginUserStudy().getUserid();
        // 获取user详细信息，改变积分
        // 判断是否已完成该题组
        boolean update = true;
        if (completeStudy.getIsComplete()) {
            List<Integer> studyIds = completeStudy.getStudyIds();
            Integer type = completeStudy.getType();
            int sum;
            if (Constants.ONE.equals(type)) {
                List<TStudyListen> studyListens = studyListenService.lambdaQuery().in(TStudyListen::getId, studyIds)
                        .eq(TStudyListen::getDisabled, 0).list();
                sum = studyListens.stream().mapToInt(TStudyListen::getIntegral).sum();
            } else if (Constants.TWO.equals(type)) {
                List<TStudyLook> studyListens = studyLookService.lambdaQuery().in(TStudyLook::getId, studyIds)
                        .eq(TStudyLook::getDisabled, 0).list();
                sum = studyListens.stream().mapToInt(TStudyLook::getIntegral).sum();
            } else if (Constants.THREE.equals(type)) {
                List<TStudyInduction> studyListens = studyInductionService.lambdaQuery().in(TStudyInduction::getId, studyIds)
                        .eq(TStudyInduction::getDisabled, 0).list();
                sum = studyListens.stream().mapToInt(TStudyInduction::getIntegral).sum();
            } else if (Constants.FOUR.equals(type)) {
                List<TStudyAnswer> studyListens = studyAnswerService.lambdaQuery().in(TStudyAnswer::getId, studyIds)
                        .eq(TStudyAnswer::getDisabled, 0).list();
                sum = studyListens.stream().mapToInt(TStudyAnswer::getIntegral).sum();
            } else if (Constants.FIVE.equals(type)) {
                List<TStudyPair> studyListens = studyPairService.lambdaQuery().in(TStudyPair::getId, studyIds)
                        .eq(TStudyPair::getDisabled, 0).list();
                sum = studyListens.stream().mapToInt(TStudyPair::getIntegral).sum();
            } else {
                return R.fail("题目信息异常！");
            }
            // 获取user详细信息，改变积分
            TUser user = userService.getById(userId);
            user.setIntegral(user.getIntegral() + completeStudy.getIntegral());
            user.setIntegral(user.getIntegral() + sum);
            update = userService.updateById(user);
            // 生成积分明细记录
            TIntegralRecord integralRecord = new TIntegralRecord();
            integralRecord.setIntegral(String.valueOf(sum));
            integralRecord.setMethod(Constants.COMPLETE_LEARNING);
            integralRecord.setUserId(userId);
            update = update && integralRecordService.save(integralRecord);
        }
        // 生成积分明细记录
        TIntegralRecord integralRecord = new TIntegralRecord();
        integralRecord.setIntegral(String.valueOf(completeStudy.getIntegral()));
        integralRecord.setMethod(completeStudy.getMethod());
        integralRecord.setUserId(userId);
        return R.ok(update && integralRecordService.save(integralRecord));
        // 学习配置列表
        List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0).orderByAsc(TStudy::getWeek).list();
        if (studyList.isEmpty()) {
            throw new GlobalException("学习配置列表未配置或数据失效！");
        }
        // 更改学习记录
        Boolean updateStudyRecord = userStudyService.exchangeStudyRecord(studyList, userId, completeStudy);
        return R.ok(update && updateStudyRecord);
    }

    /**
@@ -933,74 +950,114 @@
     * @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<StudyGamerResultVO> gameHearing(@RequestParam Integer quarter, @RequestParam Integer difficulty, @RequestParam Integer week) {
        TGame game = gameService.gameHearing(quarter, week);
        if (null == game) {
            throw new GlobalException("当前季度该周目暂无配置游戏数据！");
        }
        game.setIntegral(game.getIntegral().split(",")[difficulty]);
        game.setTime(game.getTime().split(",")[difficulty]);
        // 检验是否完成难度
        studyService.checkDifficulty(difficulty, week, game);
        List<String> subjectId = getSubjectId(week);
        List<String> newSubjectId = subjectId.stream().map(data -> {
            if (data.startsWith(Constants.REDUCE)) {
                data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
            }
            return data;
        }).distinct().collect(Collectors.toList());
        // 判断周目下题目是否足够
        if (subjectId.size() < game.getCount()) {
        if (newSubjectId.size() < game.getCount()) {
            throw new GlobalException("当前周目下day1 - day5题目不足！");
        }
        // 根据游戏设置数量获取图片及语音
        List<String> subjectData = new ArrayList<>();
        Random random = new Random();
        // 获取列表大小
        int dataSize = subjectId.size();
        int dataSize = newSubjectId.size();
        // 生成随机索引并获取数据
        for (int i = 0; i < game.getCount(); i++) {
            // 生成随机索引
            int randomIndex = random.nextInt(dataSize);
            // 获取对应的数据并加入结果列表
            subjectData.add(subjectId.get(randomIndex));
            subjectData.add(newSubjectId.get(randomIndex));
            newSubjectId.remove(randomIndex);
            dataSize = newSubjectId.size();
        }
        return R.ok(new StudyGamerResultVO(game,
                subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
        List<TSubject> subjectList = getSubjectList(subjectData);
        return R.ok(new StudyGamerResultVO(game, subjectList));
    }

    /**
     * 自主游戏2-超级记忆
     *
     * @param difficulty 难度(0入门、1中级、2困难)
     * @param week       所属周目
     * @param quarter 季度
     * @param week    所属周目
     */
    @GetMapping("/gameMemory")
    @ApiOperation(value = "自主游戏2-超级记忆", tags = {"学习端-游戏"})
    @ApiOperation(value = "自主游戏2-超级记忆", tags = {"学习端-听-自主游戏"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "难度(0入门、1中级、2困难)", name = "difficulty", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
    })
    public R<StudyGamerResultVO> gameMemory(@RequestParam Integer difficulty, @RequestParam Integer week) {
        TGame game = gameService.lambdaQuery().eq(TGame::getWeek, week).eq(TGame::getDisabled, 0).one();
        // 检验是否完成难度
        studyService.checkDifficulty(difficulty, week, game);
    public R<StudyGamerResultVO> gameMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
        TGame game = gameService.gameHearing(quarter, week);
        if (null == game) {
            throw new GlobalException("当前季度该周目暂无配置游戏数据！");
        }
        List<String> subjectId = getSubjectId(week);
        List<String> newSubjectId = subjectId.stream().map(data -> {
            if (data.startsWith(Constants.REDUCE)) {
                data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
            }
            return data;
        }).distinct().collect(Collectors.toList());
        // 判断周目下题目是否足够
        if (subjectId.size() < game.getCount()) {
        if (newSubjectId.size() < game.getAnswerCount()) {
            throw new GlobalException("当前周目下day1 - day5题目不足！");
        }
        // 根据游戏设置数量获取图片及语音
        List<String> subjectData = new ArrayList<>();
        Random random = new Random();
        // 获取列表大小
        int dataSize = subjectId.size();
        int dataSize = newSubjectId.size();
        // 生成随机索引并获取数据
        for (int i = 0; i < game.getCount(); i++) {
            // 生成随机索引
            int randomIndex = random.nextInt(dataSize);
            // 获取对应的数据并加入结果列表
            subjectData.add(subjectId.get(randomIndex));
            subjectData.add(newSubjectId.get(randomIndex));
            newSubjectId.remove(randomIndex);
            dataSize = newSubjectId.size();
        }
        return R.ok(new StudyGamerResultVO(game,
                subjectService.lambdaQuery().in(TSubject::getId, subjectData).eq(TSubject::getState, 1).list()));
        List<TSubject> subjectList = getSubjectList(subjectData);
        // 格子翻倍，前端需要做连连看
        List<TSubject> resultList = new ArrayList<>();
        for (int i = 0; i < Constants.TWO; i++) {
            resultList.addAll(subjectList);
        }
        // 框架记忆数量翻倍，前端需要根据数量画格子
        game.setAnswerCount(game.getAnswerCount() * 2);
        return R.ok(new StudyGamerResultVO(game, resultList));
    }

    private List<TSubject> getSubjectList(List<String> subjectData) {
        List<TSubject> subjectList = new ArrayList<>();
        for (String subjectDatum : subjectData) {
            if (subjectDatum.startsWith("-")) {
                subjectDatum = subjectDatum.replace("-", "");
            }
            TSubject subject = subjectService.lambdaQuery().eq(TSubject::getId, subjectDatum)
                    .eq(TSubject::getState, 1).one();
            subjectList.add(subject);
        }
        return subjectList;
    }

    /**
@@ -1010,7 +1067,7 @@
     * @param completeStudy 学习信息
     */
    @PostMapping("/gameAchievement")
    @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-游戏"})
    @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-听-自主游戏"})
    public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
        /*
         * 游戏测试需要根据正确率计算本次测试可获得积分
@@ -1018,16 +1075,30 @@
         * 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
         */
        Integer userid = tokenService.getLoginUserStudy().getUserid();
        TGame game = gameService.getById(completeStudy.getGameId());
        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 integral;
        if (completeStudy.getGameName().equals(Constants.HEARING)) {
            // 本次游戏总积分
            integral = Integer.parseInt(game.getIntegral().split(",")[completeStudy.getDifficulty()]);
        } else if (completeStudy.getGameName().equals(Constants.MEMORY)) {
            integral = game.getAnswerIntegral();
        } else {
            throw new GlobalException("该次游戏积分计算异常！");
        }
        int gameAvailableIntegral = integral * (completeStudy.getAccuracy() / 100);
        Integer availableIntegral = gameService.countIntegral(userid, game, completeStudy, gameAvailableIntegral, integralRecordList);
        // 游戏测试记录
        Boolean add = gameRecordService.add(completeStudy);
        // 可获得积分不为null时，才添加积分明细记录
        if (null != availableIntegral) {
            add = add && integralRecordService.add(String.valueOf(availableIntegral), completeStudy.getMethod(), completeStudy.getGameId(), null);
            add = add && integralRecordService.add(String.valueOf(availableIntegral), Constants.COMPLETE_GAME, completeStudy.getGameId(), null);
            // 用户账户添加积分
            TUser user = userService.getById(userid);
            user.setIntegral(user.getIntegral() + availableIntegral);
@@ -1038,27 +1109,31 @@

    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;
    }

@@ -1068,18 +1143,18 @@
     * @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();
        // 获取对应图片语音
        TStoryListen listen = gettStoryListen(quarter, week);
        List<String> list = Arrays.asList(listen.getLookStory().split(","));
        List<TSubject> subjectList;
        List<TStory> subjectList;
        if (!list.isEmpty()) {
            subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
            subjectList = storyService.lambdaQuery().in(TStory::getId, list).eq(TStory::getDisabled, 0).list();
        } else {
            subjectList = new ArrayList<>();
        }
@@ -1092,36 +1167,52 @@
     * @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) {
        // 看图配音信息
        TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
    public R<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
        TStoryListen listen = gettStoryListen(quarter, week);
        // 获取对应图片语音
        List<String> list = Arrays.asList(listen.getStory().split(","));
        List<TSubject> subjectList;
        List<TStory> subjectList;
        if (!list.isEmpty()) {
            subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
            subjectList = storyService.lambdaQuery().in(TStory::getId, list).eq(TStory::getDisabled, 0).list();
        } else {
            subjectList = new ArrayList<>();
        }
        return R.ok(new StudyStoryListenResultVO(listen,subjectList));
        return R.ok(new StudyStoryListenResultVO(listen, subjectList));
    }

    private TStoryListen gettStoryListen(Integer quarter, Integer week) {
        // 看图配音信息
        List<TStoryListen> storyListenList = storyListenService.storyDetail(quarter, week);
        if (storyListenList.isEmpty()) {
            throw new GlobalException("当前季度该周目下未配置故事信息！");
        }
        // 获取对应图片语音
        TStoryListen listen;
        if (storyListenList.size() == Constants.ONE) {
            listen = storyListenList.get(Constants.ZERO);
        } else {
            // 随机获取一组题
            Random rand = new Random();
            listen = storyListenList.get(rand.nextInt(storyListenList.size()));
        }
        return listen;
    }

    /**
     * 完成故事类型
     */
    @GetMapping("/completeStory")
    @ApiOperation(value = "完成故事学习", tags = {"学习端-故事"})
    @ApiOperation(value = "完成故事学习", tags = {"学习端-听-自主故事"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "故事id", name = "storyId", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "完成答题/完成听故事", name = "method", dataType = "String", required = true)
            @ApiImplicitParam(value = "故事id", name = "storyId", dataType = "Integer", required = true)
    })
    public R<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId,
                                    @RequestParam String method) {
    public R<Boolean> completeStory(@RequestParam Integer integral, @RequestParam Integer storyId) {
        TStoryListen storyListen = storyListenService.lambdaQuery().eq(TStoryListen::getId, storyId).eq(TStoryListen::getDisabled, 0).one();
        if (null == storyListen) {
            throw new GlobalException("当前故事学习失败，故事信息异常，请重试！");
@@ -1134,7 +1225,7 @@
        Boolean result = true;
        if (null == integralRecord) {
            // 添加积分明细记录
            result = integralRecordService.add(String.valueOf(integral), method, null, storyId);
            result = integralRecordService.add(String.valueOf(integral), Constants.COMPLETE_STORY, null, storyId);
            TUser user = userService.lambdaQuery().eq(TUser::getId, userId).one();
            // 添加积分
            user.setIntegral(user.getIntegral() + integral);
@@ -1156,11 +1247,12 @@
                .eq(TGameRecord::getDisabled, 0).list();
        return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
    }

    @GetMapping("/record")
    @ApiOperation(value = "游戏测试成绩", tags = {"家长端-游戏测试成绩"})
    public R<StudyRecordResultVO> record() {
        LoginUserParent loginUser1 = tokenService.getLoginUser1();
        if (loginUser1 == null){
        if (loginUser1 == null) {
            return R.tokenError("登陆失效,请重新登录");
        }
        Integer userId = loginUser1.getUserid();
@@ -1169,11 +1261,11 @@
        TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
                .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());
@@ -1184,12 +1276,14 @@
                .eq(TGameRecord::getDisabled, 0).list();
        return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
    }

    @GetMapping("/getIntegral")
    @ApiOperation(value = "获取剩余积分", tags = {"家长端-获取剩余积分"})
    public R<Integer> getIntegral() {
        Integer userId = tokenService.getLoginUser1().getUserid();
        return R.ok(userService.getById(userId).getIntegral());
    }

    @GetMapping("/getIntegralStudy")
    @ApiOperation(value = "获取剩余积分", tags = {"学习端-获取剩余积分"})
    public R<Integer> getIntegralStudy() {
@@ -1207,26 +1301,27 @@
    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));
    }

    @GetMapping("/integralDetailParent")
    @ApiOperation(value = "个人中心-积分明细", tags = {"家长端"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "查询时间 格式yyyy-MM", name = "time", dataType = "Integer"),
            @ApiImplicitParam(value = "页码", name = "pageNumber", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<TIntegralRecord>> integralDetailParent(String time,
                                                    @RequestParam("pageNumber") Integer pageNumber,
                                                    @RequestParam("pageSize") Integer pageSize) {
        if(tokenService.getLoginUser1() == null){
                                                          @RequestParam("pageNum") Integer pageNum,
                                                          @RequestParam("pageSize") Integer pageSize) {
        if (tokenService.getLoginUser1() == null) {
            return R.tokenError("登录失效");
        }

        return R.ok(integralRecordService.integralDetail(new Page<>(pageNumber, pageSize), tokenService.getLoginUser1().getUserid(), time));
        return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUser1().getUserid(), time));
    }

    /**
@@ -1256,6 +1351,7 @@
        integralRecord.setUpdateTime(new Date());
        return R.ok(integralRecordService.save(integralRecord));
    }

    @GetMapping("/addIntegralDetail1")
//    @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
    @ApiImplicitParams({
@@ -1265,7 +1361,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("登录失效");
        }
        // 生成积分明细信息
@@ -1298,6 +1394,7 @@
        }
        return R.ok(userService.updateById(user));
    }

    @GetMapping("/exchangeIntegral1")
//    @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
    public R<Boolean> exchangeIntegral1(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {