bug修改

44323

2024-05-30 2eee3f3af2ad8d2bc54954c97424a7da36deaaec

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

@@ -28,6 +28,7 @@

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

/**
@@ -80,7 +81,7 @@
    private ITSubjectRecordService subjectRecordService;

    @PostMapping("/storyList")
    @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
//    @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
    public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) {
        PageInfo<TStory> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
        QueryWrapper<TStory> wrapper = new QueryWrapper<>();
@@ -116,7 +117,7 @@
    }

    @PostMapping("/subjectList")
    @ApiOperation(value = "配置学习类型选择题目", tags = {"题目管理"})
//    @ApiOperation(value = "配置学习类型选择题目", tags = {"题目管理"})
    public R<PageInfo<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
        PageInfo<TSubject> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
        QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
@@ -179,6 +180,9 @@
        TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
                .eq("week", week)
                .eq("type", type));
        one.setQuarter(dto.getQuarter());
        one.setTitle(dto.getTitle());
        studyService.updateById(one);
        GameDTO game = dto.getGame();
        StoryListenDTO storyListen = dto.getStoryListen();
        if (day == 6) {
@@ -338,12 +342,23 @@
     */
    @PostMapping("/addWeek")
    public R<Object> addWeek(@RequestBody AddWeekDTO dto) {
        TStudy tStudy = new TStudy();
        tStudy.setType(dto.getType());
        tStudy.setWeek(dto.getWeek());
        tStudy.setTitle(dto.getTitle());
        tStudy.setQuarter(dto.getQuarter());
        studyService.save(tStudy);
        TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
                .eq("week", dto.getWeek())
                .eq("type", dto.getType()));
        if (one != null) {
            one.setType(dto.getType());
            one.setWeek(dto.getWeek());
            one.setTitle(dto.getTitle());
            one.setQuarter(dto.getQuarter());
            studyService.saveOrUpdate(one);
        } else {
            TStudy tStudy = new TStudy();
            tStudy.setType(dto.getType());
            tStudy.setWeek(dto.getWeek());
            tStudy.setTitle(dto.getTitle());
            tStudy.setQuarter(dto.getQuarter());
            studyService.saveOrUpdate(tStudy);
        }
        return R.ok();
    }

@@ -439,16 +454,19 @@
        for (TStudyListen tStudyListen : list) {
            StringBuilder temp = new StringBuilder();
            StudyListenVO studyListenVO = new StudyListenVO();
            for (String s : tStudyListen.getSubject().split(",")) {
                TSubject byId = subjectService.getById(s);
                temp.append(byId.getName()).append(",");
            if (StringUtils.hasLength(tStudyListen.getSubject())) {
                for (String s : tStudyListen.getSubject().split(",")) {
                    TSubject byId = subjectService.getById(s);
                    temp.append(byId.getName()).append(",");
                }
                String string = temp.toString();
                studyListenVO.setName(string.substring(0, string.length() - 1));
                studyListenVO.setIntegral(tStudyListen.getIntegral());
                studyListenVO.setSubject(tStudyListen.getSubject());
                studyListenVO.setIsVip(tStudyListen.getIsVip());
                listenVOS.add(studyListenVO);
            }
            String string = temp.toString();
            studyListenVO.setName(string.substring(0, string.length() - 1));
            studyListenVO.setIntegral(tStudyListen.getIntegral());
            studyListenVO.setSubject(tStudyListen.getSubject());
            studyListenVO.setIsVip(tStudyListen.getIsVip());
            listenVOS.add(studyListenVO);

        }
        // 看音选图
        List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
@@ -460,22 +478,25 @@
            StringBuilder names = new StringBuilder();
            StringBuilder sorts = new StringBuilder();
            StudyLookVO studyLookVO1 = new StudyLookVO();
            for (String s : tStudyLook.getSubject().split(",")) {
                TSubject byId = subjectService.getById(s);
                names.append(byId.getName()).append(",");
                String[] split = tStudyLook.getSort().split(",");
                String s1 = split[index];
                sorts.append(s1).append(",");
                index++;
            if (StringUtils.hasLength(tStudyLook.getSubject())) {
                for (String s : tStudyLook.getSubject().split(",")) {
                    TSubject byId = subjectService.getById(s);
                    names.append(byId.getName()).append(",");
                    String[] split = tStudyLook.getSort().split(",");
                    String s1 = split[index];
                    sorts.append(s1).append(",");
                    index++;
                }
                String string = names.toString();
                String string1 = sorts.toString();
                studyLookVO1.setName(string.substring(0, string.length() - 1));
                studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
                studyLookVO1.setIntegral(tStudyLook.getIntegral());
                studyLookVO1.setSubject(tStudyLook.getSubject());
                studyLookVO1.setIsVip(tStudyLook.getIsVip());
                lookVOS.add(studyLookVO1);
            }
            String string = names.toString();
            String string1 = sorts.toString();
            studyLookVO1.setName(string.substring(0, string.length() - 1));
            studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
            studyLookVO1.setIntegral(tStudyLook.getIntegral());
            studyLookVO1.setSubject(tStudyLook.getSubject());
            studyLookVO1.setIsVip(tStudyLook.getIsVip());
            lookVOS.add(studyLookVO1);

        }
        // 归纳排除
        List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
@@ -485,17 +506,20 @@
        for (TStudyInduction tStudyInduction : list2) {
            StringBuilder names = new StringBuilder();
            StudyInductionVO studyInductionVO = new StudyInductionVO();
            for (String s : tStudyInduction.getSubject().split(",")) {
                String replace = s.replace("-", "");
                TSubject byId = subjectService.getById(replace);
                names.append(byId.getName()).append(",");
            if (StringUtils.hasLength(tStudyInduction.getSubject())) {
                for (String s : tStudyInduction.getSubject().split(",")) {
                    String replace = s.replace("-", "");
                    TSubject byId = subjectService.getById(replace);
                    names.append(byId.getName()).append(",");
                }
                String string = names.toString();
                studyInductionVO.setName(string.substring(0, string.length() - 1));
                studyInductionVO.setIntegral(tStudyInduction.getIntegral());
                studyInductionVO.setSubject(tStudyInduction.getSubject());
                studyInductionVO.setIsVip(tStudyInduction.getIsVip());
                inductionVOS.add(studyInductionVO);
            }
            String string = names.toString();
            studyInductionVO.setName(string.substring(0, string.length() - 1));
            studyInductionVO.setIntegral(tStudyInduction.getIntegral());
            studyInductionVO.setSubject(tStudyInduction.getSubject());
            studyInductionVO.setIsVip(tStudyInduction.getIsVip());
            inductionVOS.add(studyInductionVO);

        }
        // 有问有答
        List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
@@ -504,24 +528,37 @@
        for (TStudyAnswer tStudyAnswer : list3) {
            StringBuilder names = new StringBuilder();
            StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
            if (tStudyAnswer.getIsAnswer() == 1) {
                TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                names.append(byId.getName()).append(",");
                TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                names.append(byId1.getName()).append(",");
            } else {
                TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                names.append(byId.getName()).append(",");
                TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                names.append(byId1.getName()).append(",");
            if (tStudyAnswer.getIsAnswer() != null) {
                if (tStudyAnswer.getIsAnswer() == 1) {
                    if (tStudyAnswer.getSubject() != null) {
                        TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                        names.append(byId.getName()).append(",");
                    }
                    if (tStudyAnswer.getAnswerSubject() != null) {
                        TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                        names.append(byId1.getName()).append(",");
                    }
                } else {
                    if (tStudyAnswer.getSubject() != null) {
                        TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                        names.append(byId.getName()).append(",");
                    }
                    if (tStudyAnswer.getAnswerSubject() != null) {
                        TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                        names.append(byId1.getName()).append(",");
                    }
                }
            }
            String string = names.toString();
            studyAnswerVO.setName(string.substring(0, string.length() - 1));
            studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
            studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
            studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
            studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
            answerVOS.add(studyAnswerVO);
            if (StringUtils.hasLength(names)) {
                String string = names.toString();
                studyAnswerVO.setName(string.substring(0, string.length() - 1));
                studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
                studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
                studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
                studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
                answerVOS.add(studyAnswerVO);
            }

        }
        // 音图相配
        List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
@@ -531,16 +568,19 @@
        for (TStudyPair tStudyPair : list4) {
            StringBuilder names = new StringBuilder();
            StudyPairVO studyPairVO = new StudyPairVO();
            for (String s : tStudyPair.getSubject().split(",")) {
                TSubject byId = subjectService.getById(s);
                names.append(byId.getName()).append(",");
            if (StringUtils.hasLength(tStudyPair.getSubject())) {
                for (String s : tStudyPair.getSubject().split(",")) {
                    TSubject byId = subjectService.getById(s);
                    names.append(byId.getName()).append(",");
                }
                String string = names.toString();
                studyPairVO.setName(string.substring(0, string.length() - 1));
                studyPairVO.setIntegral(tStudyPair.getIntegral());
                studyPairVO.setSubject(tStudyPair.getSubject());
                studyPairVO.setIsVip(tStudyPair.getIsVip());
                pairVOS.add(studyPairVO);
            }
            String string = names.toString();
            studyPairVO.setName(string.substring(0, string.length() - 1));
            studyPairVO.setIntegral(tStudyPair.getIntegral());
            studyPairVO.setSubject(tStudyPair.getSubject());
            studyPairVO.setIsVip(tStudyPair.getIsVip());
            pairVOS.add(studyPairVO);

        }
        List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
                .eq("week", week));
@@ -564,29 +604,47 @@
            StringBuilder names1 = new StringBuilder();
            StringBuilder sort = new StringBuilder();
            StringBuilder sort1 = new StringBuilder();
            for (String s : tStory.getStory().split(",")) {
                TStory byId = storyService.getById(s);
                names.append(byId.getName()).append(",");
            if (StringUtils.hasLength(tStory.getStory())) {
                for (String s : tStory.getStory().split(",")) {
                    TStory byId = storyService.getById(s);
                    names.append(byId.getName()).append(",");
                }
            }
            for (String s : tStory.getLookStory().split(",")) {
                TStory byId = storyService.getById(s);
                names1.append(byId.getName()).append(",");
            if (StringUtils.hasLength(tStory.getLookStory())) {
                for (String s : tStory.getLookStory().split(",")) {
                    TStory byId = storyService.getById(s);
                    names1.append(byId.getName()).append(",");
                }
            }
            for (String s : tStory.getSort().split(",")) {
                sort.append(s).append(",");
            if (StringUtils.hasLength(tStory.getSort())) {
                for (String s : tStory.getSort().split(",")) {
                    sort.append(s).append(",");
                }
            }
            for (String s : tStory.getLookSort().split(",")) {
                sort1.append(s).append(",");
            if (StringUtils.hasLength(tStory.getLookSort())) {
                for (String s : tStory.getLookSort().split(",")) {
                    sort1.append(s).append(",");
                }
            }
            storyVO.setName(names.substring(0, names.length() - 1));
            storyVO.setSort(sort.substring(0, sort.length() - 1));
            if (StringUtils.hasLength(names)) {
                storyVO.setName(names.substring(0, names.length() - 1));

            }
            if (StringUtils.hasLength(sort)) {
                storyVO.setSort(sort.substring(0, sort.length() - 1));

            }
            if (StringUtils.hasLength(names1)) {
                storyVO.setLookName(names1.substring(0, names1.length() - 1));

            }
            if (StringUtils.hasLength(sort1)) {
                storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
            }
            storyVO.setIntegral(tStory.getIntegral());
            storyVO.setLookName(names1.substring(0, names1.length() - 1));
            storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
            storyVO.setLookIntegral(tStory.getLookIntegral());
            storyVOS.add(storyVO);
        }

        res.setAnswer(answerVOS);
        res.setPair(pairVOS);
        res.setListen(listenVOS);
@@ -597,23 +655,18 @@
        return R.ok(res);
    }

    /**
     * 查询周目列表
     *
     * @param type    所属类型
     * @param quarter 季度
     */
    @GetMapping("/weekList")
    @ApiOperation(value = "周目列表", tags = {"周目列表"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "所属类型", name = "type", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "季度", 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);
        return R.ok(result);
    }




    /**
     * 可兑换商品推荐
     */
    @GetMapping("/goodRecommend")
    @ApiOperation(value = "可兑换商品推荐", tags = {"学习端-首页"})
    public R<List<TGoodsVO>> studySchedule() {
        return R.ok(goodsClient.goodRecommend().getData());
    }
    /**
     * 首次页面加载时调用,获取学习进度及学习时长等信息
     *
@@ -621,7 +674,7 @@
     * @param day  所属day
     */
    @GetMapping("/studySchedule")
    @ApiOperation(value = "获取用户学习进度", tags = {"获取用户学习进度"})
    @ApiOperation(value = "获取用户学习进度", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
@@ -630,16 +683,22 @@
        TUserStudy result = studyService.studySchedule(String.valueOf(tokenService.getLoginUserStudy().getUserid()), week, day);
        return R.ok(result);
    }

    /**
     * 可兑换商品推荐
     * 查询周目列表
     *
     * @param type    所属类型
     * @param quarter 季度
     */
    @GetMapping("/goodRecommend")
    @ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
    public R<List<TGoodsVO>> studySchedule() {
        return R.ok(goodsClient.goodRecommend().getData());
    @GetMapping("/weekList")
    @ApiOperation(value = "根据季度获取周目列表 ", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "所属类型 1.0只有类型听 传1", name = "type", dataType = "Integer", required = true),
            @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);
        return R.ok(result);
    }

    /**
     * 进入题组后，获取题组学习进度信息
     *
@@ -647,7 +706,7 @@
     * @param day  所属day
     */
    @GetMapping("/teamSchedule")
    @ApiOperation(value = "获取题组学习进度信息", tags = {"获取题组学习进度信息"})
    @ApiOperation(value = "获取题组学习进度信息", tags = {"学习端-题目"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
@@ -662,7 +721,7 @@
     * 退出学习，记录学习进度、当日学习时长...
     */
    @PostMapping("/exitLearning")
    @ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"退出学习(记录学习进度等信息)"})
    @ApiOperation(value = "退出学习(记录学习进度等信息)", tags = {"学习端-题目"})
    public R<Boolean> exitLearning(@RequestBody TSubjectRecord subjectRecord) {
        // 学习时长处理
        return R.ok(subjectRecordService.updateById(subjectRecord));
@@ -675,7 +734,7 @@
     * @param day  所属day
     */
    @GetMapping("/listenSelectPicture")
    @ApiOperation(value = "自主学习1-听音选图", tags = {"自主学习1-听音选图"})
    @ApiOperation(value = "自主学习1-听音选图", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
@@ -685,11 +744,21 @@
        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);
        }
//        if (!isVip) {
//            wrapper.eq(TStudyListen::getIsVip, 0);
//        }
        List<TStudyListen> studyListens = wrapper.list();
        for (TStudyListen studyListen : studyListens) {
            if (studyListen.getIsVip() == 1){
                // 需要会员查看
                if (!isVip){
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
            }
        }
        return R.ok(studyService.listenSelectPicture(week, day, studyListens));
    }

@@ -700,7 +769,7 @@
     * @param day  所属day
     */
    @GetMapping("/pictureSelectVoice")
    @ApiOperation(value = "自主学习2-看图选音", tags = {"自主学习2-看图选音"})
    @ApiOperation(value = "自主学习2-看图选音", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
@@ -711,11 +780,18 @@
        LambdaQueryChainWrapper<TStudyLook> wrapper = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
                .eq(TStudyLook::getDay, day).eq(TStudyLook::getDisabled, 0);
        // 非会员只能查看非会员题目，会员可以查看所有题目
        if (!isVip) {
            wrapper.eq(TStudyLook::getIsVip, 0);
        }

        List<TStudyLook> lookList = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
                .eq(TStudyLook::getDay, day).eq(TStudyLook::getDisabled, 0).list();
        for (TStudyLook studyListen : lookList) {
            if (studyListen.getIsVip() == 1){
                // 需要会员查看
                if (!isVip){
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
            }
        }
        return R.ok(studyService.pictureSelectVoice(week, day, lookList));
    }

@@ -726,7 +802,7 @@
     * @param day  所属day
     */
    @GetMapping("/induceExclude")
    @ApiOperation(value = "自主学习3-归纳排除", tags = {"自主学习3-归纳排除"})
    @ApiOperation(value = "自主学习3-归纳排除", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
@@ -737,10 +813,19 @@
        LambdaQueryChainWrapper<TStudyInduction> wrapper = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
                .eq(TStudyInduction::getDay, day).eq(TStudyInduction::getDisabled, 0);
        // 非会员只能查看非会员题目，会员可以查看所有题目
        if (!isVip) {
            wrapper.eq(TStudyInduction::getIsVip, 0);
        }
//        if (!isVip) {
//            wrapper.eq(TStudyInduction::getIsVip, 0);
//        }
        List<TStudyInduction> inductionList = wrapper.list();
        for (TStudyInduction studyListen : inductionList) {
            if (studyListen.getIsVip() == 1){
                // 需要会员查看
                if (!isVip){
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
            }
        }
        return R.ok(studyService.induceExclude(week, day, inductionList));
    }

@@ -751,7 +836,7 @@
     * @param day  所属day
     */
    @GetMapping("/questionsAndAnswers")
    @ApiOperation(value = "自主学习4-有问有答", tags = {"自主学习4-有问有答"})
    @ApiOperation(value = "自主学习4-有问有答", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
@@ -762,10 +847,19 @@
        LambdaQueryChainWrapper<TStudyAnswer> wrapper = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
                .eq(TStudyAnswer::getDay, day).eq(TStudyAnswer::getDisabled, 0);
        // 非会员只能查看非会员题目，会员可以查看所有题目
        if (!isVip) {
            wrapper.eq(TStudyAnswer::getIsVip, 0);
        }
//        if (!isVip) {
//            wrapper.eq(TStudyAnswer::getIsVip, 0);
//        }
        List<TStudyAnswer> answerList = wrapper.list();
        for (TStudyAnswer studyListen : answerList) {
            if (studyListen.getIsVip() == 1){
                // 需要会员查看
                if (!isVip){
                    // 不是会员
                    return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
                }
            }
        }
        return R.ok(studyService.questionsAndAnswers(week, day, answerList));
    }

@@ -776,7 +870,7 @@
     * @param day  所属day
     */
    @GetMapping("/pictureMateVoice")
    @ApiOperation(value = "自主学习5-音图相配", tags = {"自主学习5-音图相配"})
    @ApiOperation(value = "自主学习5-音图相配", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
@@ -791,6 +885,13 @@
            wrapper.eq(TStudyPair::getIsVip, 0);
        }
        TStudyPair pair = wrapper.one();
        if (pair.getIsVip() == 1){
            // 需要会员查看
            if (!isVip){
                // 不是会员
                return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
            }
        }
        return R.ok(studyService.pictureMateVoice(week, day, pair));
    }

@@ -800,7 +901,7 @@
     * @param completeStudy 完成学习信息
     */
    @PostMapping("/completeLearning")
    @ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
    @ApiOperation(value = "完成学习", tags = {"学习端-题目"})
    public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
        // 登录用户id
        Integer userId = tokenService.getLoginUserStudy().getUserid();
@@ -826,7 +927,7 @@
     * @param week       所属周目
     */
    @GetMapping("/gameHearing")
    @ApiOperation(value = "自主游戏1-超级听力", tags = {"自主游戏1-超级听力(difficulty: 0入门、1中级、2高级)"})
    @ApiOperation(value = "自主游戏1-超级听力", tags = {"学习端-游戏"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "难度(0入门、1中级、2困难)", name = "difficulty", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
@@ -866,7 +967,7 @@
     * @param week       所属周目
     */
    @GetMapping("/gameMemory")
    @ApiOperation(value = "自主游戏2-超级记忆", tags = {"自主游戏2-超级记忆(difficulty: 0入门、1中级、2高级)"})
    @ApiOperation(value = "自主游戏2-超级记忆", tags = {"学习端-游戏"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "难度(0入门、1中级、2困难)", name = "difficulty", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
@@ -903,7 +1004,7 @@
     * @param completeStudy 学习信息
     */
    @PostMapping("/gameAchievement")
    @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"完成游戏-记录游戏测试成绩"})
    @ApiOperation(value = "完成游戏-记录游戏测试成绩", tags = {"学习端-游戏"})
    public R<Boolean> gameAchievement(@RequestBody CompleteGameDTO completeStudy) {
        /*
         * 游戏测试需要根据正确率计算本次测试可获得积分
@@ -950,6 +1051,7 @@
                subjectId.addAll(Arrays.asList(subject.split(",")));
            }
            redisService.setCacheList(RedisConstants.HEARING_TREE, subjectId);
            redisService.expire(RedisConstants.HEARING_TREE, RedisConstants.THIRTY, TimeUnit.MINUTES);
        }
        return subjectId;
    }
@@ -960,7 +1062,7 @@
     * @param week 周目
     */
    @GetMapping("/lookPictureDbu")
    @ApiOperation(value = "自主故事1-看图配音", tags = {"自主故事1-看图配音"})
    @ApiOperation(value = "自主故事1-看图配音", tags = {"学习端-故事"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
    })
@@ -979,7 +1081,7 @@
     * @param week 周目
     */
    @GetMapping("/frameworkMemory")
    @ApiOperation(value = "自主故事2-框架记忆", tags = {"自主故事2-框架记忆"})
    @ApiOperation(value = "自主故事2-框架记忆", tags = {"学习端-故事"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "所属周目", name = "week", dataType = "Integer", required = true)
    })
@@ -996,7 +1098,7 @@
     * 完成故事类型
     */
    @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),
@@ -1026,9 +1128,10 @@
    }

    @GetMapping("/studyRecord")
    @ApiOperation(value = "个人中心-学习记录", tags = {"个人中心-学习记录"})
    @ApiOperation(value = "个人中心-学习记录", tags = {"学习端-个人中心"})
    public R<StudyRecordResultVO> studyRecord() {
        Integer userId = tokenService.getLoginUserStudy().getUserid();

        // 学习记录
        TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
                .eq(TUserStudy::getDisabled, 0).one();
@@ -1037,18 +1140,77 @@
                .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){
            return R.tokenError("登陆失效,请重新登录");
        }
        Integer userId = loginUser1.getUserid();

        // 学习记录
        TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
                .eq(TUserStudy::getDisabled, 0).one();
        // 查询剩余周目
        if (studyRecord!=null){
            int size = studyService.list(new QueryWrapper<TStudy>()
                    .eq("type", 1)).size();
            studyRecord.setSurplus(size-studyRecord.getWeek());
        }else{
            TUserStudy tUserStudy = new TUserStudy();
            tUserStudy.setSurplus(studyService.list(new QueryWrapper<TStudy>()
                    .eq("type", 1)).size());
            studyRecord = tUserStudy;
        }
        // 游戏测试成绩
        List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
                .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() {
        Integer userId = tokenService.getLoginUserStudy().getUserid();
        return R.ok(userService.getById(userId).getIntegral());
    }

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

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

    /**
@@ -1058,7 +1220,7 @@
     * @param method   变动源
     */
    @GetMapping("/addIntegralDetail")
    @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
//    @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "变动源(完成学习、完成游戏...)", name = "method", dataType = "String", required = true)
@@ -1066,6 +1228,30 @@
    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("/addIntegralDetail1")
//    @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "积分数量", name = "integral", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "变动源(完成学习、完成游戏...)", name = "method", dataType = "String", required = true)
    })
    public R addIntegralDetail1(@RequestParam("integral") String integral, @RequestParam("method") String method) {
        // 当前登录用户
        LoginUserParent userStudy = tokenService.getLoginUser1();
        if (userStudy == null){
            return R.tokenError("登录失效");
        }
        // 生成积分明细信息
        TIntegralRecord integralRecord = new TIntegralRecord();
        integralRecord.setIntegral(integral);
@@ -1086,7 +1272,7 @@
     * @param method   变动源
     */
    @GetMapping("/exchangeIntegral")
    @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
//    @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
    public R<Boolean> exchangeIntegral(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
        TUser user = userService.getById(tokenService.getLoginUserStudy().getUserid());
        if (Constants.BURDEN.equals(method)) {
@@ -1096,6 +1282,17 @@
        }
        return R.ok(userService.updateById(user));
    }
    @GetMapping("/exchangeIntegral1")
//    @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
    public R<Boolean> exchangeIntegral1(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
        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));
    }

}