From c46f49af9e766aed0ba583fce0efab98ebcdf76c Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 18 六月 2024 17:12:06 +0800 Subject: [PATCH] 管理员增加学生端权限 --- src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 219 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 164 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java index b74394d..928969f 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java @@ -1,16 +1,35 @@ package com.ycl.jxkg.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.ycl.jxkg.base.Result; +import com.ycl.jxkg.base.SystemCode; import com.ycl.jxkg.context.WebContext; +import com.ycl.jxkg.domain.entity.ExamPaper; +import com.ycl.jxkg.domain.entity.Question; +import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO; import com.ycl.jxkg.domain.exam.PaperQuestion; -import com.ycl.jxkg.domain.exam.PaperQuestionDTO; +import com.ycl.jxkg.domain.exam.PaperQuestionSettingDTO; import com.ycl.jxkg.domain.form.ExamPaperForm; -import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO; -import com.ycl.jxkg.enums.ExamPaperTypeEnum; import com.ycl.jxkg.domain.other.KeyValue; +import com.ycl.jxkg.domain.question.QuestionItemObject; +import com.ycl.jxkg.domain.question.QuestionObject; +import com.ycl.jxkg.domain.question.RandomQuestionDTO; +import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO; +import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO; +import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO; +import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO; +import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter; +import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo; +import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO; +import com.ycl.jxkg.enums.ExamPaperTypeEnum; +import com.ycl.jxkg.enums.QuestionTypeEnum; import com.ycl.jxkg.enums.VisibilityEnum; import com.ycl.jxkg.mapper.ExamPaperMapper; import com.ycl.jxkg.mapper.QuestionMapper; @@ -19,24 +38,16 @@ import com.ycl.jxkg.service.SubjectService; import com.ycl.jxkg.service.TextContentService; import com.ycl.jxkg.utils.DateTimeUtil; -import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO; -import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO; -import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO; -import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter; -import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo; -import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.ycl.jxkg.domain.entity.ExamPaper; +import com.ycl.jxkg.utils.JsonUtil; import com.ycl.jxkg.utils.PageInfoHelper; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.math.BigDecimal; +import java.util.*; import java.util.stream.Collectors; @Service @@ -53,21 +64,136 @@ @Override @Transactional(rollbackFor = Exception.class) - public void addPaper(ExamPaperForm form) { - ExamPaper examPaper = ExamPaperForm.getEntityByForm(form,null); - examPaper.setContent(JSON.toJSONString(form.getQuestionList())); - baseMapper.insert(examPaper); - //TODO:闅忓簭璇曞嵎鐢熸垚棰樼洰 -// if(ExamPaperTypeEnum.RandomOrder.getCode().equals(form.getPaperType())){ -// List<PaperQuestionDTO> questionList = form.getQuestionList(); -// List<PaperQuestion> list = questionMapper.selectQuestion(); -// } + public Result addPaper(ExamPaperForm form) { + ExamPaper examPaper = ExamPaperForm.getEntityByForm(form, null); + examPaper.setScore(new BigDecimal(form.getScore())); + //闅忔満璇曞嵎 + if (ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())) { + //鏍¢獙棰樼洰鏁伴噺 + List<PaperQuestionSettingDTO> questionSetting = form.getQuestionSetting(); + //棰樼洰閰嶇疆閲岄厤鐨勮瘯鍗风被鍨� + List<Integer> types = questionSetting.stream().map(PaperQuestionSettingDTO::getQuestionType).collect(Collectors.toList()); + Map<Integer, List<Integer>> map = questionMapper.selectBySubject(form.getSubjectId(), types) + .stream().collect(Collectors.groupingBy(RandomQuestionDTO::getQuestionType, Collectors.mapping(RandomQuestionDTO::getQuestionId, Collectors.toList()))); + + for (PaperQuestionSettingDTO settingDTO : questionSetting) { + Integer num = settingDTO.getNum(); + Integer questionType = settingDTO.getQuestionType(); + //闇�瑕侀厤缃殑棰樼洰鏁伴噺涓�0鍒欒烦杩� + if(num ==null || num ==0 )continue; + List<Integer> questions = map.get(questionType); + if(CollectionUtils.isEmpty(questions) || num > questions.size())return Result.fail(SystemCode.InnerError.getCode(), QuestionTypeEnum.fromCode(questionType).getName()+"棰樼洰鏁伴噺涓嶈冻"); + } + examPaper.setContent(JSON.toJSONString(form.getQuestionSetting())); + baseMapper.insert(examPaper); + return Result.ok(); + } else if (ExamPaperTypeEnum.Fixed.getCode().equals(form.getPaperType())) { + //鍥哄畾璇曞嵎 + examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList())); + baseMapper.insert(examPaper); + return Result.ok(); + } else { + //闅忓簭璇曞嵎 + Integer subjectId = form.getSubjectId(); + //棰樼洰閰嶇疆 + List<PaperQuestionSettingDTO> questionSetting = form.getQuestionSetting(); + //棰樼洰閰嶇疆閲岄厤鐨勮瘯鍗风被鍨� + List<Integer> types = questionSetting.stream().map(PaperQuestionSettingDTO::getQuestionType).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(types)) { + return Result.fail(SystemCode.InnerError.getCode(), "璇曞嵎棰樼洰绫诲瀷涓嶈兘涓虹┖"); + } + Map<Integer, List<Integer>> map = questionMapper.selectBySubject(subjectId, types) + .stream().collect(Collectors.groupingBy(RandomQuestionDTO::getQuestionType, Collectors.mapping(RandomQuestionDTO::getQuestionId, Collectors.toList()))); + List<PaperFixQuestionDTO> questionTitleList = new ArrayList<>(); + // 閬嶅巻map + for (Integer questionType : map.keySet()) { + //鏁版嵁搴撻噷鐨勮繖涓被鍨嬬殑棰樼洰 + List<Integer> questionIdList = map.get(questionType); + Result result = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.fromCode(questionType).getCode()); + if (result != null) return result; + } + examPaper.setContent(JSON.toJSONString(questionTitleList)); + baseMapper.insert(examPaper); + return Result.ok(); + } + } + //鐢熸垚棰樼洰 + private Result createQuestion(List<PaperQuestionSettingDTO> questionSetting, List<PaperFixQuestionDTO> questionTitleList, Integer questionType, List<Integer> questionIdList , Integer questionEnumCode) { + if (questionType.equals(questionEnumCode)) { + //寰幆鎵惧埌瀵瑰簲棰樼洰 + PaperQuestionSettingDTO settingDTO = new PaperQuestionSettingDTO(); + for (PaperQuestionSettingDTO dto : questionSetting) { + if (dto.getQuestionType().equals(questionType)) { + settingDTO = dto; + } + }// 闇�瑕佺敓鎴愮殑棰樼洰鏁伴噺 + Integer num = settingDTO.getNum(); + if(num ==null || num ==0 ){ + //棰樼洰閰嶇疆姝ょ被鍨嬫暟閲忎负0锛岃烦杩囷紝涓嶇敓鎴愰鐩�� + return null; + } + if (CollectionUtils.isEmpty(questionIdList) || num > questionIdList.size()) { + return Result.fail(SystemCode.InnerError.getCode(), QuestionTypeEnum.fromCode(questionType).getName()+"棰樼洰鏁伴噺涓嶈冻"); + } + + // 浣跨敤Random绫荤敓鎴愪笉閲嶅鐨勯殢鏈虹储寮� + Set<Integer> indexes = new HashSet<>(); + Random random = new Random(); + while (indexes.size() < num) { + int index = random.nextInt(questionIdList.size()); + indexes.add(index); + } + // 鏍规嵁绱㈠紩鑾峰彇棰樼洰 + List<Integer> questionIds = new ArrayList<>(); + for (int index : indexes) { + questionIds.add(questionIdList.get(index)); + } + QueryWrapper<Question> wrapper = new QueryWrapper<>(); + wrapper.in("id",questionIds); + List<Question> questions = questionMapper.selectList(wrapper); + List<PaperQuestion> questionList = new ArrayList<>(); + for (Question question : questions) { + PaperQuestion paperQuestion = new PaperQuestion(); + BeanUtils.copyProperties(question,paperQuestion); + paperQuestion.setScore(settingDTO.getScore()); + //杞崲 + QuestionObject questionObject = JSONObject.parseObject(question.getContent(), QuestionObject.class); + if(questionObject != null){ + paperQuestion.setItems(questionObject.getQuestionItemObjects()); + paperQuestion.setAnalyze(questionObject.getAnalyze()); + paperQuestion.setTitle(questionObject.getTitleContent()); + } + questionList.add(paperQuestion); + } + PaperFixQuestionDTO dto = new PaperFixQuestionDTO(); + dto.setTitle(settingDTO.getTitle()); + dto.setQuestionType(questionType); + dto.setQuestionList(questionList); + questionTitleList.add(dto); + } + return null; } @Override - public void updateExamPaper(ExamPaperForm form) { - ExamPaper entity = ExamPaperForm.getEntityByForm(form,null); - baseMapper.updateById(entity); + public Result updateExamPaper(ExamPaperForm form) { + ExamPaper examPaper = ExamPaperForm.getEntityByForm(form, null); + examPaper.setScore(new BigDecimal(form.getScore())); + //闅忔満璇曞嵎 + if (ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())) { + examPaper.setContent(JSON.toJSONString(form.getQuestionSetting())); + baseMapper.updateById(examPaper); + return Result.ok(); + } else if (ExamPaperTypeEnum.Fixed.getCode().equals(form.getPaperType())) { + //鍥哄畾璇曞嵎 + examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList())); + baseMapper.updateById(examPaper); + return Result.ok(); + } else { + //闅忓簭璇曞嵎 + examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList())); + baseMapper.updateById(examPaper); + return Result.ok(); + } } @Override @@ -79,7 +205,6 @@ BeanUtils.copyProperties(e, vo); vo.setVisibility(VisibilityEnum.valueOf(vo.getVisibility()).getCode() + ""); vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime())); - vo.setQuestionList(JSONArray.parseArray(e.getContent(),PaperQuestionDTO.class)); return vo; }); return pageVO; @@ -136,32 +261,17 @@ ExamPaper examPaper = examPaperMapper.selectById(id); ExamPaperEditRequestVO vo = new ExamPaperEditRequestVO(); BeanUtils.copyProperties(examPaper, vo); - //TODO: -// TextContent frameTextContent = textContentService.getById(examPaper.getFrameTextContentId()); -// List<ExamPaperTitleItemObject> examPaperTitleItemObjects = JsonUtil.toJsonListObject(frameTextContent.getContent(), ExamPaperTitleItemObject.class); -// List<Integer> questionIds = examPaperTitleItemObjects.stream() -// .flatMap(t -> t.getQuestionItems().stream() -// .map(q -> q.getId())) -// .collect(Collectors.toList()); -// List<Question> questions = questionMapper.selectByIds(questionIds); -// List<ExamPaperTitleItemVO> examPaperTitleItemVOS = examPaperTitleItemObjects.stream().map(t -> { -// ExamPaperTitleItemVO tTitleVM = new ExamPaperTitleItemVO(); -// BeanUtils.copyProperties(t, tTitleVM); -// List<QuestionEditRequestVO> questionItemsVM = t.getQuestionItems().stream().map(i -> { -// Question question = questions.stream().filter(q -> q.getId().equals(i.getId())).findFirst().get(); -// QuestionEditRequestVO questionEditRequestVO = questionService.getQuestionEditRequestVM(question); -// questionEditRequestVO.setItemOrder(i.getItemOrder()); -// return questionEditRequestVO; -// }).collect(Collectors.toList()); -// tTitleVM.setQuestionItems(questionItemsVM); -// return tTitleVM; -// }).collect(Collectors.toList()); -// vo.setTitleItems(examPaperTitleItemVOS); -// vo.setScore(ExamUtil.scoreToVM(examPaper.getScore())); -// if (ExamPaperTypeEnum.Random == ExamPaperTypeEnum.fromCode(examPaper.getPaperType())) { -// List<String> limitDateTime = Arrays.asList(DateTimeUtil.dateFormat(examPaper.getLimitStartTime()), DateTimeUtil.dateFormat(examPaper.getLimitEndTime())); -// vo.setLimitDateTime(limitDateTime); -// } + vo.setVisibility(VisibilityEnum.valueOf(vo.getVisibility()).getCode()); + //闅忔満璇曞嵎 + if (ExamPaperTypeEnum.Random.getCode().equals(examPaper.getPaperType())) { + vo.setQuestionSetting(JSONArray.parseArray(examPaper.getContent(), PaperQuestionSettingDTO.class)); + } else if (ExamPaperTypeEnum.Fixed.getCode().equals(examPaper.getPaperType())) { + //鍥哄畾璇曞嵎 + vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class)); + } else { + //闅忓簭璇曞嵎 + vo.setQuestionTitleList(JSONArray.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class)); + } return vo; } @@ -187,7 +297,6 @@ return null == keyValue ? 0 : keyValue.getValue(); }).collect(Collectors.toList()); } - private void examPaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, ExamPaper examPaper, List<ExamPaperTitleItemVO> titleItemsVM) { -- Gitblit v1.8.0