From 3ec909b27b3eba956aa9d00cc7a94c179bd04bbf Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 03 七月 2024 18:29:31 +0800
Subject: [PATCH] feat：新增随机时间题目配置
---
src/main/java/com/mindskip/xzs/controller/student/DashboardController.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java b/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java
index ad764be..3e847cc 100644
--- a/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java
+++ b/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java
@@ -6,15 +6,23 @@
import com.mindskip.xzs.domain.enums.ExamPaperTypeEnum;
import com.mindskip.xzs.domain.task.TaskItemAnswerObject;
import com.mindskip.xzs.domain.task.TaskItemObject;
+import com.mindskip.xzs.domain.vo.ExamTemplatesUserCountVO;
+import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
+import com.mindskip.xzs.repository.ExamPaperAnswerMapper;
+import com.mindskip.xzs.repository.ExamTemplatesMapper;
+import com.mindskip.xzs.repository.ExamTemplatesUserCountMapper;
+import com.mindskip.xzs.repository.ExamTemplatesUserMapper;
import com.mindskip.xzs.service.*;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.JsonUtil;
import com.mindskip.xzs.viewmodel.student.dashboard.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -31,9 +39,17 @@
private final TaskExamCustomerAnswerService taskExamCustomerAnswerService;
private final TextContentService textContentService;
private final ExamPaperUserService examPaperUserService;
+ private final ExamPaperAnswerMapper answerMapper;
+ private final ExamTemplatesMapper templatesMapper;
+ private final ExamTemplatesUserCountMapper templatesUserCountMapper;
+ private final ExamTemplatesUserMapper examTemplatesUserMapper;
@Autowired
- public DashboardController(UserService userService, ExamPaperService examPaperService, QuestionService questionService, TaskExamService taskExamService, TaskExamCustomerAnswerService taskExamCustomerAnswerService, TextContentService textContentService, ExamPaperUserService examPaperUserService) {
+ public DashboardController(UserService userService, ExamPaperService examPaperService,
+ QuestionService questionService, TaskExamService taskExamService,
+ TaskExamCustomerAnswerService taskExamCustomerAnswerService,
+ TextContentService textContentService, ExamPaperUserService examPaperUserService,
+ ExamPaperAnswerMapper answerMapper, ExamTemplatesMapper templatesMapper, ExamTemplatesUserCountMapper templatesUserCountMapper, ExamTemplatesUserMapper examTemplatesUserMapper) {
this.userService = userService;
this.examPaperService = examPaperService;
this.questionService = questionService;
@@ -41,6 +57,26 @@
this.taskExamCustomerAnswerService = taskExamCustomerAnswerService;
this.textContentService = textContentService;
this.examPaperUserService = examPaperUserService;
+ this.answerMapper = answerMapper;
+ this.templatesMapper = templatesMapper;
+ this.templatesUserCountMapper = templatesUserCountMapper;
+ this.examTemplatesUserMapper = examTemplatesUserMapper;
+ }
+
+ @RequestMapping(value = "/qualification/{paperId}", method = RequestMethod.GET)
+ public RestResponse qualification(@PathVariable("paperId") String paperId) {
+ User user = getCurrentUser();
+ ExamTemplatesUserCount count = new ExamTemplatesUserCount();
+ List<ExamTemplatesUserCount> examTemplatesUserCountList = new ArrayList<>();
+ List<PaperInfo> paperInfos = new ArrayList<>();
+ count.setUserId(user.getId());
+ count.setExamPaperId(Integer.parseInt(paperId));
+ examTemplatesUserCountList.add(count);
+ List<ExamPaperAnswer> list1 = answerMapper.getByExamPaperIdAndUserId(examTemplatesUserCountList);
+ if(list1.size()>0){
+ return RestResponse.fail(500,"褰撳墠璇曞嵎宸插畬鎴愯�冭瘯锛�");
+ }
+ return RestResponse.ok();
}
@RequestMapping(value = "/index", method = RequestMethod.POST)
@@ -53,7 +89,44 @@
Integer[] type = {ExamPaperTypeEnum.Fixed.getCode(),ExamPaperTypeEnum.Random.getCode()};
fixedPaperFilter.setExamPaperType(type);
fixedPaperFilter.setUserId(user.getId());
- indexVM.setFixedPaper(examPaperService.indexPaper(fixedPaperFilter));
+ //璇曞嵎
+ List<PaperInfo> list = examPaperService.indexPaper(fixedPaperFilter);
+ ExamTemplatesUserCount count = new ExamTemplatesUserCount();
+ List<ExamTemplatesUserCount> examTemplatesUserCountList = new ArrayList<>();
+ List<PaperInfo> paperInfos = new ArrayList<>();
+ for (PaperInfo info : list) {
+ count.setUserId(user.getId());
+ count.setExamPaperId(info.getId());
+ examTemplatesUserCountList.add(count);
+ List<ExamPaperAnswer> list1 = answerMapper.getByExamPaperIdAndUserId(examTemplatesUserCountList);
+ examTemplatesUserCountList.clear();
+ if(list1.size()>0){
+ continue;
+ }
+ info.setStatus("0");
+ paperInfos.add(info);
+ }
+
+ ExamTemplatesVO vo = new ExamTemplatesVO();
+ vo.setStatus("0");
+ vo.setUserId(user.getId());
+ vo.setNow(LocalDateTime.now());
+ List<ExamTemplates> gets = templatesMapper.gets(vo);
+ ExamTemplatesUserCountVO templatesUserCountVO = new ExamTemplatesUserCountVO();
+ templatesUserCountVO.setUserId(user.getId());
+
+ for (ExamTemplates get : gets) {
+ templatesUserCountVO.setId(get.getId());
+ Integer number = templatesUserCountMapper.getCountByUserIdAndTemplatesId(templatesUserCountVO);
+ if(number==0){
+ PaperInfo info = new PaperInfo();
+ info.setId(get.getId());
+ info.setName(get.getName());
+ info.setStatus("1");
+ paperInfos.add(info);
+ }
+ }
+ indexVM.setFixedPaper(paperInfos);
PaperFilter timeLimitPaperFilter = new PaperFilter();
timeLimitPaperFilter.setDateTime(new Date());
@@ -62,8 +135,22 @@
timeLimitPaperFilter.setExamPaperType(time);
timeLimitPaperFilter.setUserId(user.getId());
+ ExamTemplatesUserCount count1 = new ExamTemplatesUserCount();
+ List<ExamTemplatesUserCount> examTemplatesUserCountList1 = new ArrayList<>();
+ List<PaperInfo> paperInfos1 = new ArrayList<>();
List<PaperInfo> limitPaper = examPaperService.indexPaper(timeLimitPaperFilter);
- List<PaperInfoVM> paperInfoVMS = limitPaper.stream().map(d -> {
+ for (PaperInfo info : limitPaper) {
+ count1.setUserId(user.getId());
+ count1.setExamPaperId(info.getId());
+ examTemplatesUserCountList1.add(count1);
+ List<ExamPaperAnswer> list1 = answerMapper.getByExamPaperIdAndUserId(examTemplatesUserCountList1);
+ examTemplatesUserCountList1.clear();
+ if(list1.size()>0){
+ continue;
+ }
+ paperInfos1.add(info);
+ }
+ List<PaperInfoVM> paperInfoVMS = paperInfos1.stream().map(d -> {
PaperInfoVM vm = modelMapper.map(d, PaperInfoVM.class);
vm.setStartTime(DateTimeUtil.dateFormat(d.getLimitStartTime()));
vm.setEndTime(DateTimeUtil.dateFormat(d.getLimitEndTime()));
--
Gitblit v1.8.0