diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java index 01c3f6c7e..80aafd92d 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java @@ -1,6 +1,7 @@ package com.ruoyi.exam.controller; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.exam.domain.*; import com.ruoyi.exam.service.*; @@ -60,15 +61,14 @@ public class ApiExaminationController extends BaseController { @GetMapping("/v1/examination/list") public AjaxResult list(ExamExamination examExamination) { -// SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); -// + SysUser sysUser = sysUserService.selectUserByLoginName( ShiroUtils.getLoginName() ); Map map = new HashMap<>(); map.put( "ination", examExamination ); -// map.put( "userId", sysUser.getUserId() ); - map.put( "userId", 1 ); + map.put( "userId", sysUser.getUserId() ); List list = examExaminationService.selectListFromWeb( map ); AjaxResult success = success( "查询成功" ); success.put( "data", list ); + success.put("total",new PageInfo(list).getTotal()); return success; } @@ -296,7 +296,7 @@ public class ApiExaminationController extends BaseController { } item.setExamUserExaminationId( examUserExaminationId ); item.setCreateDate( new Date() ); - item.setCreateBy( user.getLoginName() ); + item.setCreateBy( user.getLoginName() ); item.setDelFlag( "0" ); item.setId( null ); examUserExaminationQuestionService.insertOne( item ); diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java index ad1f1cf4c..e7b1923f0 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java @@ -1,5 +1,6 @@ package com.ruoyi.exam.controller; +import com.github.pagehelper.PageInfo; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.exam.domain.*; import com.ruoyi.exam.service.*; @@ -42,6 +43,7 @@ public class ApiPracticeController extends BaseController { List list = examPracticeService.selectListFromWeb(examPractice); AjaxResult success = success("查询成功"); success.put("data", list); + success.put("total",new PageInfo(list).getTotal()); return success; } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java index b8d519a32..e9ad321b2 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserErrorQuestionController.java @@ -5,6 +5,7 @@ import com.ruoyi.exam.domain.*; import com.ruoyi.exam.service.*; import com.ruoyi.framework.jwt.JwtUtil; import com.ruoyi.framework.web.base.BaseController; +import com.ruoyi.framework.web.util.ShiroUtils; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysUserService; import io.swagger.annotations.Api; @@ -55,8 +56,12 @@ public class ApiUserErrorQuestionController extends BaseController { for (String questionId : questionIds) { ExamUserErrorQuestion examUserErrorQuestion = new ExamUserErrorQuestion(); examUserErrorQuestion.setExamQuestionId(Integer.parseInt(questionId)); - SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); + SysUser sysUser = sysUserService.selectUserByLoginName(ShiroUtils.getLoginName()); examUserErrorQuestion.setVipUserId(sysUser.getUserId().intValue()); + List db = examUserErrorQuestionService.selectList(examUserErrorQuestion); + if(db.size()>0){ + return success("错题已存在"); + } examUserErrorQuestion.setCreateBy(sysUser.getLoginName()); examUserErrorQuestion.setCreateDate(new Date()); examUserErrorQuestion.setDelFlag("0"); diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java index 7a4d6ad2d..add91e741 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java @@ -4,6 +4,7 @@ import com.ruoyi.exam.domain.ExamExamination; import java.util.List; import java.util.Map; +import com.ruoyi.exam.domain.ExamQuestionVO; import com.ruoyi.framework.web.base.AbstractBaseService; /** * 考试 服务层 @@ -41,4 +42,6 @@ public interface IExamExaminationService extends AbstractBaseService selectEnterNameListFromWeb(Map map); + + List queryExaminationQuestion(ExamExamination examExamination,Integer examUserExaminationId); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java index bdcaff5c0..4bc4d7691 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java @@ -1,44 +1,58 @@ package com.ruoyi.exam.service.impl; -import java.util.List; -import java.util.Map; +import java.util.*; +import com.ruoyi.exam.domain.*; +import com.ruoyi.exam.service.*; +import com.ruoyi.framework.web.exception.base.BaseException; +import com.ruoyi.framework.web.util.ShiroUtils; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.exam.mapper.ExamExaminationMapper; -import com.ruoyi.exam.domain.ExamExamination; -import com.ruoyi.exam.service.IExamExaminationService; import com.ruoyi.common.support.Convert; import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; + /** * 考试 服务层实现 - * + * * @author zhujj * @date 2018-12-24 */ @Service -public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl implements IExamExaminationService -{ - @Autowired - private ExamExaminationMapper examExaminationMapper; +public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl implements IExamExaminationService { + @Autowired + private ExamExaminationMapper examExaminationMapper; - - /** + @Autowired + private IExamPaperService examPaperService; + + @Autowired + private IExamUserExaminationService examUserExaminationService; + + @Autowired + private ISysUserService sysUserService; + + @Autowired + private IExamPaperTypeNumberService examPaperTypeNumberService; + + + /** * 查询考试列表 - * + * * @param examExamination 考试信息 * @return 考试集合 */ - @Override - public List selectExamExaminationList(ExamExamination examExamination) - { + @Override + public List selectExamExaminationList(ExamExamination examExamination) { return examExaminationMapper.selectExamExaminationList(examExamination); - } + } @Override public List selectListFromWeb(Map map) { startPage(); - return examExaminationMapper.selectListFromWeb(map); + return examExaminationMapper.selectListFromWeb(map); } @Override @@ -47,6 +61,113 @@ public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl queryExaminationQuestion(ExamExamination examExamination, Integer examUserExaminationId) { + String id = examExamination.getId().toString(); + SysUser sysUser = sysUserService.selectUserByLoginName(ShiroUtils.getLoginName()); + Integer userId = Integer.parseInt(sysUser.getUserId().toString()); + //考试类型 + String type = examExamination.getType(); + //试卷ID + Integer examPaperId = examExamination.getExamPaperId(); + //考试次数 + Integer examNumber = examExamination.getExamNumber(); + //考试时长 + Integer timeLength = examExamination.getTimeLength(); + + ExamUserExamination insert = new ExamUserExamination(); + //正式考试 + if (type.equals("2")) { + ExamUserExamination examUserExamination = new ExamUserExamination(); + examUserExamination.setVipUserId(userId); + examUserExamination.setExamPaperId(examPaperId); + examUserExamination.setExamExaminationId(Integer.parseInt(id)); + //考试记录集合 + List userExamination = examUserExaminationService.selectLastOne(examUserExamination); + // 最后一次考试 + ExamUserExamination last; + + //超过考试次数 + if (userExamination.size() >= examNumber) { + + last = userExamination.get(0); + //最后一次考试已交卷，直接返回 + if (last.getUpdateDate() != null && !last.getUpdateDate().equals("")) { + throw new BaseException("已超过" + examNumber + "次考试，"); +// return error( 500, "已超过" + examNumber + "次考试，" ); + } else { + // 最后一次考试未交卷，但超过考试时长,直接返回 + if (last.getCreateDate().getTime() + timeLength * 60 * 1000 < new Date().getTime()) { + throw new BaseException("已超过" + examNumber + "次考试，"); + } + } + + } + + if (userExamination.size() <= 0 //考试次数小于0 + || userExamination.get(0).getUpdateDate() != null //最后一次考试已交卷 + || userExamination.get(0).getCreateDate().getTime() + timeLength * 60 * 1000 < new Date().getTime()//最后一次考试，已超过考过时长 + ) { + insert.setExamExaminationId(Integer.parseInt(id)); + insert.setVipUserId(userId); + insert.setCreateDate(new Date()); + insert.setExamPaperId(examPaperId); + insert.setDelFlag("0"); + insert.setScore(0); + examUserExaminationService.insertOne(insert); + examUserExaminationId = insert.getId(); + } else { + examUserExaminationId = userExamination.get(0).getId(); + } + + } + ExamPaper examPaper = examPaperService.selectById(examPaperId); + List data = new ArrayList<>(); + List list = examPaperService.selectQuestionAndItemByPaperId(examPaperId); + //随机试卷 + if (examPaper.getType().equals("2")) { + Collections.shuffle(list); + ExamPaperTypeNumber examPaperTypeNumber = new ExamPaperTypeNumber(); + examPaperTypeNumber.setExamPaperId(examPaperId); + List examPaperTypeNumbers = examPaperTypeNumberService.selectList(examPaperTypeNumber); + //三种题型的数量 + int one = 0, two = 0, three = 0; + for (ExamPaperTypeNumber item : examPaperTypeNumbers) { + if (item.getExamQuestionType() == 1) { + one = item.getNumber(); + } + if (item.getExamQuestionType() == 2) { + two = item.getNumber(); + } + if (item.getExamQuestionType() == 3) { + three = item.getNumber(); + } + } + for (ExamQuestionVO item : list) { + if (item.getType().equals("1") && one > 0) { + data.add(item); + one--; + } + if (item.getType().equals("2") && two > 0) { + data.add(item); + two--; + } + if (item.getType().equals("3") && three > 0) { + data.add(item); + three--; + } + } + } else { + data = list; + } + //是否乱序 + if (examExamination.getQuestionDisorder().equals("2")) { + Collections.shuffle(data); + } + + return data; + } + /** * 查询考试分页列表 * @@ -54,8 +175,7 @@ public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl selectExamExaminationPage(ExamExamination examExamination) - { + public List selectExamExaminationPage(ExamExamination examExamination) { startPage(); return examExaminationMapper.selectExamExaminationList(examExamination); }