无关风月
2024-07-22 da26806f0fbc78b501d58976092cc681f786c35b
添加学习配置 优化
2个文件已修改
37 ■■■■■ 已修改文件
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java
@@ -55,7 +55,12 @@
    @PostMapping(value = "/addStudySet")
    @ResponseBody
    public AjaxResult addStudySet(@RequestBody AddStudySetDTO dto) {
        studyClient.addStudySet(dto);
        R<Object> objectR = studyClient.addStudySet(dto);
        String string = objectR.getMsg().toString();
        int code = objectR.getCode();
        if (code == 500){
            return AjaxResult.error(string);
        }
        return AjaxResult.success("保存成功");
    }
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -278,6 +278,21 @@
                    .eq("studyId", one.getId())
                    .eq("week", week));
            if (studyId != null) {
                // 判断当前周目配置的题目数量
                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 (newSubjectId.size() < game.getCount()) {
                    return R.fail("超级听力:当前周目下day1 - day5题目不足!");
                }
                if (newSubjectId.size() < game.getAnswerCount()) {
                    return R.fail("超级记忆:当前周目下day1 - day5题目不足!");
                }
                studyId.setWeek(dto.getWeek());
                studyId.setStudyId(one.getId());
                studyId.setCount(game.getCount());
@@ -290,6 +305,21 @@
                studyId.setAnswerRate(game.getAnswerRate());
                gameService.updateById(studyId);
            } else {
                // 判断当前周目配置的题目数量
                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 (newSubjectId.size() < game.getCount()) {
                    return R.fail("超级听力:当前周目下day1 - day5题目不足!");
                }
                if (newSubjectId.size() < game.getAnswerCount()) {
                    return R.fail("超级记忆:当前周目下day1 - day5题目不足!");
                }
                TGame tGame = new TGame();
                tGame.setWeek(dto.getWeek());
                tGame.setAnswerRate(game.getAnswerRate());