代码提交

44323

2024-05-22 2885941cf88da7397f2e641e383a26337f3c2b03

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

@@ -268,6 +268,7 @@
                TStudyLook tStudyLook = new TStudyLook();
                tStudyLook.setStudyId(one.getId());
                tStudyLook.setDay(day);
                tStudyLook.setSort(studyLookDTO.getSort());
                tStudyLook.setSubject(studyLookDTO.getSubject());
                tStudyLook.setIntegral(studyLookDTO.getIntegral());
                tStudyLook.setWeek(week);
@@ -287,6 +288,7 @@
                tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
                tStudyInduction.setWeek(week);
                tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
                studyInductionService.save(tStudyInduction);
            }
            studyAnswerService.remove(new QueryWrapper<TStudyAnswer>()
                    .eq("studyId", one.getId())
@@ -354,8 +356,8 @@
                .eq("type", 1));
        studyListVO.setWeeks(count.size());

        // todo 补充开始学习人数
        studyListVO.setCount(0);
        List<TUserStudy> list7 = userStudyService.list(new QueryWrapper<TUserStudy>());
        studyListVO.setCount(list7.size());
        studyListVO.setName("听");
        // 查询听类型有多少周目
        res.add(studyListVO);
@@ -393,6 +395,7 @@
        return R.ok(res);
    }


    /**
     * 通过类型、周目、day查询学习配置
     *
@@ -401,11 +404,19 @@
    @PostMapping("/getStudySet")
    public R<StudyVO> getStudySet(@RequestBody StudyDTO dto) {
        StudyVO res = new StudyVO();
        // todo 开始学习人数后续补充
        res.setCount(0);
        List<TUserStudy> list7 = userStudyService.list(new QueryWrapper<TUserStudy>());
        res.setCount(list7.size());
        // 查询已有周目数量
        int type = studyService.list(new QueryWrapper<TStudy>()
                .eq("type", dto.getType())).size();
        res.setWeeks(type);
        List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
                .eq("type", dto.getType())
                .eq("week", dto.getWeek()));
        if (!list8.isEmpty()){
            res.setQuarter(list8.get(0).getQuarter());
            res.setTitle(list8.get(0).getTitle());
        }
        List<StudyListenVO> listenVOS = new ArrayList<>();
        List<GameVO> gameVOS = new ArrayList<>();
        List<StoryVO> storyVOS = new ArrayList<>();
@@ -431,6 +442,8 @@
            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);
        }
        // 看音选图
@@ -456,6 +469,8 @@
            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);
        }
        // 归纳排除
@@ -468,17 +483,14 @@
            StudyInductionVO studyInductionVO = new StudyInductionVO();
            for (String s : tStudyInduction.getSubject().split(",")) {
                String replace = s.replace("-", "");
                if (s.contains("-")) {
                    TSubject byId = subjectService.getById(replace);
                    names.append("-").append(byId.getName()).append(",");
                } else {
                    TSubject byId = subjectService.getById(s);
                    names.append(byId.getName()).append(",");
                }
                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);
        }
        // 有问有答
@@ -490,18 +502,21 @@
            StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
            if (tStudyAnswer.getIsAnswer() == 1) {
                TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                names.append("-").append(byId.getName()).append(",");
                names.append(byId.getName()).append(",");
                TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                names.append("-").append(byId1.getName()).append(",");
                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("-").append(byId1.getName()).append(",");
                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);
        }
        // 音图相配
@@ -519,6 +534,8 @@
            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>()
@@ -537,6 +554,8 @@
                .eq("week", week));
        for (TStoryListen tStory : list6) {
            StoryVO storyVO = new StoryVO();
            storyVO.setStory(tStory.getStory());
            storyVO.setLookStory(tStory.getLookStory());
            StringBuilder names = new StringBuilder();
            StringBuilder names1 = new StringBuilder();
            StringBuilder sort = new StringBuilder();
@@ -558,38 +577,12 @@
            storyVO.setName(names.substring(0, names.length() - 1));
            storyVO.setSort(sort.substring(0, sort.length() - 1));
            storyVO.setIntegral(tStory.getIntegral());
            storyVO.setLookName(names1.substring(0, names.length() - 1));
            storyVO.setLookSort(sort1.substring(0, sort.length() - 1));
            storyVO.setLookName(names1.substring(0, names1.length() - 1));
            storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
            storyVO.setLookIntegral(tStory.getLookIntegral());
            storyVOS.add(storyVO);
        }
        int temp = 0;
        if (!list.isEmpty()) {
            temp = list.get(0).getStudyId();
        }
        if (!list1.isEmpty()) {
            temp = list1.get(0).getStudyId();
        }
        if (!list2.isEmpty()) {
            temp = list2.get(0).getStudyId();
        }
        if (!list3.isEmpty()) {
            temp = list3.get(0).getStudyId();
        }
        if (!list4.isEmpty()) {
            temp = list4.get(0).getStudyId();
        }
        if (!list5.isEmpty()) {
            temp = list5.get(0).getStudyId();
        }
        if (!list6.isEmpty()) {
            temp = list6.get(0).getStudyId();
        }
        if (temp == 0) {
            res.setTitle("");
        } else {
            res.setTitle(studyService.getById(temp).getTitle());
        }

        res.setAnswer(answerVOS);
        res.setPair(pairVOS);
        res.setListen(listenVOS);
@@ -665,7 +658,7 @@
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
    })
    public AjaxResult<StudyListenResultVO> listenSelectPicture(@RequestParam Integer week, @RequestParam Integer day) {
    public R<StudyListenResultVO> listenSelectPicture(@RequestParam Integer week, @RequestParam Integer day) {
        // 判断当前登录用户是否为 会员
        Boolean isVip = userService.isVip();
        LambdaQueryChainWrapper<TStudyListen> wrapper = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
@@ -675,7 +668,7 @@
            wrapper.eq(TStudyListen::getIsVip, 0);
        }
        List<TStudyListen> studyListens = wrapper.list();
        return AjaxResult.success(studyService.listenSelectPicture(week, day, studyListens));
        return R.ok(studyService.listenSelectPicture(week, day, studyListens));
    }

    /**