8.29

liujie

5 天以前 eb9256cd2cba7a5cdf9ccbdc7919eb4652557105

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
@@ -353,6 +354,7 @@
                studyId.setAnswerCount(game.getAnswerCount());
                studyId.setRate(game.getRate());
                studyId.setAnswerRate(game.getAnswerRate());
                studyId.setSubjectIds(game.getSubjectIds());
                gameService.updateById(studyId);
            } else {
                // 判断当前周目配置的题目数量
@@ -381,6 +383,7 @@
                tGame.setAnswerTime(game.getAnswerTime());
                tGame.setAnswerIntegral(game.getAnswerIntegral());
                tGame.setAnswerCount(game.getAnswerCount());
                tGame.setSubjectIds(game.getSubjectIds());
                gameService.save(tGame);
            }

@@ -924,6 +927,11 @@
            gameVO.setAnswerCount(tGame.getAnswerCount());
            gameVO.setRate(tGame.getRate());
            gameVO.setAnswerRate(tGame.getAnswerRate());
            String subjectIds = tGame.getSubjectIds();
            if(subjectIds!=null && subjectIds.length()>0){
                gameVO.setSubjects(subjectService.list(new QueryWrapper<TSubject>()
                        .in("id", subjectIds.split(","))));
            }
            gameVOS.add(gameVO);
        }
        List<TStoryListen> list6 = storyListenService.list(new QueryWrapper<TStoryListen>()
@@ -1711,7 +1719,19 @@
        game.setTime(game.getTime().split(",")[difficulty]);
        // 检验是否完成难度
        studyService.checkDifficulty(difficulty, week, game, userStudy.getUserid());
        List<String> subjectId = getSubjectId(week);


//        List<String> subjectId = getSubjectId(week);
        List<String> subjectId = new ArrayList<>();
        String subjectIds = game.getSubjectIds();
        if(subjectIds!=null){
            String[] split = subjectIds.split(",");
            for (String s : split) {
                subjectId.add(s);
            }
        }


        List<String> newSubjectId = subjectId.stream().map(data -> {
            if (data.startsWith(Constants.REDUCE)) {
                data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
@@ -1766,7 +1786,16 @@
        if (null == game) {
            throw new GlobalException("当前季度该周目暂无配置游戏数据！");
        }
        List<String> subjectId = getSubjectId(week);
//        List<String> subjectId = getSubjectId(week);
        List<String> subjectId = new ArrayList<>();
        String subjectIds = game.getSubjectIds();
        if(subjectIds!=null){
            String[] split = subjectIds.split(",");
            for (String s : split) {
                subjectId.add(s);
            }
        }

        List<String> subjectData = getSubjectData(game, subjectId);
        List<TSubject> subjectList = getSubjectList(subjectData);
        // 返回数据
@@ -2452,5 +2481,12 @@
        return R.ok(userService.updateById(user));
    }

    @GetMapping("/lookVideo")
//    @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
    public R<Boolean> lookVideo() {
        boolean update = userService.update(new LambdaUpdateWrapper<TUser>().set(TUser::getLookVideo, 0));
        return R.ok(update);
    }

}