From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 17 十月 2024 21:01:37 +0800 Subject: [PATCH] 达梦不支持value改为values --- src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 234 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 190 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java index 9d5130d..d2d447e 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java @@ -1,33 +1,50 @@ package com.ycl.jxkg.service.impl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; 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.domain.entity.Question; +import com.ycl.jxkg.domain.entity.Subject; import com.ycl.jxkg.domain.other.KeyValue; -import com.ycl.jxkg.domain.Question; -import com.ycl.jxkg.domain.TextContent; -import com.ycl.jxkg.domain.enums.QuestionStatusEnum; -import com.ycl.jxkg.domain.enums.QuestionTypeEnum; import com.ycl.jxkg.domain.question.QuestionItemObject; import com.ycl.jxkg.domain.question.QuestionObject; +import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperImportVO; +import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO; +import com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO; +import com.ycl.jxkg.domain.vo.admin.question.QuestionEditItemVO; +import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO; +import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO; +import com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO; +import com.ycl.jxkg.enums.QuestionTypeEnum; +import com.ycl.jxkg.enums.general.StatusEnum; +import com.ycl.jxkg.excel.CurrencyDataListener; +import com.ycl.jxkg.excel.FixedMergeCellStrategy; +import com.ycl.jxkg.excel.SelectExcel; import com.ycl.jxkg.mapper.QuestionMapper; import com.ycl.jxkg.service.QuestionService; import com.ycl.jxkg.service.SubjectService; -import com.ycl.jxkg.service.TextContentService; import com.ycl.jxkg.utils.DateTimeUtil; -import com.ycl.jxkg.utils.JsonUtil; import com.ycl.jxkg.utils.ExamUtil; -import com.ycl.jxkg.vo.admin.question.QuestionEditItemVO; -import com.ycl.jxkg.vo.admin.question.QuestionEditRequestVO; -import com.ycl.jxkg.vo.admin.question.QuestionPageRequestVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import com.ycl.jxkg.utils.HtmlUtil; +import com.ycl.jxkg.utils.JsonUtil; import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.function.Consumer; import java.util.stream.Collectors; @Service @@ -35,13 +52,11 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements QuestionService { private final QuestionMapper questionMapper; - private final TextContentService textContentService; private final SubjectService subjectService; - @Override - public PageInfo<Question> page(QuestionPageRequestVO requestVM) { - return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() -> + public PageInfo<QuestionResponseVO> page(QuestionPageRequestVO requestVM) { + return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "create_time desc").doSelectPageInfo(() -> questionMapper.page(requestVM) ); } @@ -51,26 +66,22 @@ @Transactional public Question insertFullQuestion(QuestionEditRequestVO model, Integer userId) { Date now = new Date(); - Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId()); //棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆 - TextContent infoTextContent = new TextContent(); - infoTextContent.setCreateTime(now); - setQuestionInfoFromVM(infoTextContent, model); - textContentService.save(infoTextContent); + String questionObject = setQuestionInfoFromVM(model); Question question = new Question(); question.setSubjectId(model.getSubjectId()); - question.setGradeLevel(gradeLevel); question.setCreateTime(now); question.setQuestionType(model.getQuestionType()); - question.setStatus(QuestionStatusEnum.OK.getCode()); + question.setStatus(StatusEnum.ENABLE); question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray()); - question.setScore(ExamUtil.scoreFromVM(model.getScore())); question.setDifficult(model.getDifficult()); - question.setInfoTextContentId(infoTextContent.getId()); + question.setContent(questionObject); question.setCreateUser(userId); - question.setDeleted(false); + question.setTitle(HtmlUtil.clear(model.getTitle())); + question.setAudioFile(model.getAudioFile()); + question.setOriginalFile(model.getOriginalFile()); questionMapper.insert(question); return question; } @@ -78,20 +89,17 @@ @Override @Transactional public Question updateFullQuestion(QuestionEditRequestVO model) { - Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId()); Question question = questionMapper.selectById(model.getId()); question.setSubjectId(model.getSubjectId()); - question.setGradeLevel(gradeLevel); - question.setScore(ExamUtil.scoreFromVM(model.getScore())); question.setDifficult(model.getDifficult()); question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray()); - questionMapper.updateById(question); - //棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊 - TextContent infoTextContent = textContentService.getById(question.getInfoTextContentId()); - setQuestionInfoFromVM(infoTextContent, model); - textContentService.updateById(infoTextContent); - + String questionObject = setQuestionInfoFromVM(model); + question.setContent(questionObject); + question.setTitle(HtmlUtil.clear(model.getTitle())); + question.setAudioFile(model.getAudioFile()); + question.setOriginalFile(model.getOriginalFile()); + questionMapper.updateById(question); return question; } @@ -105,8 +113,7 @@ @Override public QuestionEditRequestVO getQuestionEditRequestVM(Question question) { //棰樼洰鏄犲皠 - TextContent questionInfoTextContent = textContentService.getById(question.getInfoTextContentId()); - QuestionObject questionObject = JsonUtil.toJsonObject(questionInfoTextContent.getContent(), QuestionObject.class); + QuestionObject questionObject = JsonUtil.toJsonObject(question.getContent(), QuestionObject.class); QuestionEditRequestVO questionEditRequestVO = new QuestionEditRequestVO(); BeanUtils.copyProperties(question, questionEditRequestVO); questionEditRequestVO.setTitle(questionObject.getTitleContent()); @@ -116,6 +123,7 @@ switch (questionTypeEnum) { case SingleChoice: case TrueFalse: + case Audio: questionEditRequestVO.setCorrect(question.getCorrect()); break; case MultipleChoice: @@ -126,12 +134,13 @@ questionEditRequestVO.setCorrectArray(correctContent); break; case ShortAnswer: + case Calculate: + case Analysis: questionEditRequestVO.setCorrect(questionObject.getCorrect()); break; default: break; } - questionEditRequestVO.setScore(ExamUtil.scoreToVM(question.getScore())); questionEditRequestVO.setAnalyze(questionObject.getAnalyze()); @@ -139,23 +148,19 @@ List<QuestionEditItemVO> editItems = questionObject.getQuestionItemObjects().stream().map(o -> { QuestionEditItemVO questionEditItemVO = new QuestionEditItemVO(); BeanUtils.copyProperties(o, questionEditItemVO); - if (o.getScore() != null) { - questionEditItemVO.setScore(ExamUtil.scoreToVM(o.getScore())); - } return questionEditItemVO; }).collect(Collectors.toList()); questionEditRequestVO.setItems(editItems); return questionEditRequestVO; } - public void setQuestionInfoFromVM(TextContent infoTextContent, QuestionEditRequestVO model) { + public String setQuestionInfoFromVM(QuestionEditRequestVO model) { List<QuestionItemObject> itemObjects = model.getItems().stream().map(i -> { QuestionItemObject item = new QuestionItemObject(); item.setPrefix(i.getPrefix()); item.setContent(i.getContent()); item.setItemUuid(i.getItemUuid()); - item.setScore(ExamUtil.scoreFromVM(i.getScore())); return item; } ).collect(Collectors.toList()); @@ -164,7 +169,7 @@ questionObject.setAnalyze(model.getAnalyze()); questionObject.setTitleContent(model.getTitle()); questionObject.setCorrect(model.getCorrect()); - infoTextContent.setContent(JsonUtil.toJsonStr(questionObject)); + return JsonUtil.toJsonStr(questionObject); } @Override @@ -184,5 +189,146 @@ }).collect(Collectors.toList()); } + @Override + public Boolean updateStatus(QuestionResponseVO question) { + return new LambdaUpdateChainWrapper<>(questionMapper) + .set(Question::getStatus, question.getStatus()) + .eq(Question::getId, question.getId()) + .update(); + } + + @Override + public List<ExamPaperImportVO> export(QuestionExportVO query) { + return questionMapper.export(query); + } + + @Override + @Transactional + @SneakyThrows + public Result<Boolean> importQuestion(MultipartFile file) { + List<Subject> subjects = subjectService.list(); + // 棰樼洰闆嗗悎鐢ㄤ簬鎵归噺淇濆瓨 + ArrayList<Question> questions = new ArrayList<>(); + Consumer<List<QuestionImportVO>> consumer = (data) -> { + // 寰幆姣忎竴琛� + for (int i = 0; i < data.size(); i++) { + // 璇诲彇鐨勯鐩� + QuestionImportVO excelQuestion = data.get(i); + String questionType = excelQuestion.getQuestionType(); + // 鍒ゆ柇鏄惁瀹屾暣棰樼洰 + if (excelQuestion.intact()) { + // 寰幆棰樼洰 + while (Boolean.TRUE) { + // 鏇存柊璇诲彇鐨勯鐩� + excelQuestion = data.get(i); + Question question = new Question(); + // 璇ラ鐨勯�夐」 + List<QuestionItemObject> options = new ArrayList<>(8); + // 閫夐」鍐呭 + QuestionItemObject option = new QuestionItemObject(); + option.setPrefix(excelQuestion.getOptionName()); + option.setContent(excelQuestion.getOptionValue()); + options.add(option); + // 寰幆閫夐」 + while (Boolean.TRUE) { + // 鍒ゆ柇鏄惁鏄渶鍚庝竴鏉� + if (i + 1 == data.size()) { + break; + } + QuestionImportVO nextQuestion = data.get(1 + i); + if (nextQuestion.intact()) { + break; + } + QuestionItemObject nextOption = new QuestionItemObject(); + nextOption.setPrefix(nextQuestion.getOptionName()); + nextOption.setContent(nextQuestion.getOptionValue()); + options.add(nextOption); + i++; + } + // 淇濆瓨棰樼洰鍐呭 + QuestionObject questionObject = new QuestionObject(); + questionObject.setQuestionItemObjects(options); + questionObject.setAnalyze(excelQuestion.getAnalyze()); + questionObject.setTitleContent(excelQuestion.getTitle()); + questionObject.setCorrect(excelQuestion.getCorrect()); + question.setTitle(excelQuestion.getTitle()); + question.setContent(JSON.toJSONString(questionObject)); + question.setQuestionType(QuestionTypeEnum.get(excelQuestion.getQuestionType())); + // 绛旀(澶氶�夐渶瑕佺敤銆佸垎鍓蹭繚瀛樺瓧绗︿覆鍒版暟鎹簱) + String[] corrects = excelQuestion.getCorrect().split("銆�"); + if (corrects.length > 1) { + question.setCorrect(String.join(",", corrects)); + } else { + question.setCorrect(excelQuestion.getCorrect()); + } + // 闅惧害 + question.setDifficult(excelQuestion.getDifficult()); + // 鍒涘缓浜� + question.setCreateUser(2); + question.setStatus(StatusEnum.ENABLE); + question.setCreateTime(new Date()); + question.setDeleted(0); + question.setQuestionType(QuestionTypeEnum.get(questionType)); + // 鏍规嵁绉戠洰鍚嶇О鑾峰彇id + QuestionImportVO finalExcelQuestion = excelQuestion; + question.setSubjectId(subjects.stream().filter(subject -> subject.getName().equals(finalExcelQuestion.getSubject())).findFirst().get().getId()); + questions.add(question); + if (i + 1 == data.size() || data.get(i + 1).intact()) { + break; + } + i++; + } + } + } + }; + EasyExcel.read(file.getInputStream(), QuestionImportVO.class, new CurrencyDataListener(consumer)).sheet("妯℃澘").doRead(); + // 淇濆瓨棰樼洰 + return Result.ok(saveBatch(questions)); + } + + @Override + @SneakyThrows + public void importTemplate(HttpServletResponse response) { + String fileName = URLEncoder.encode("璇曞嵎瀵煎叆妯℃澘", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + + // 鏋勫缓妯℃澘鏍蜂緥鏁版嵁 + List<QuestionImportVO> data = new ArrayList<>(8); + QuestionImportVO questionImportVO = new QuestionImportVO(); + questionImportVO.setQuestionType("鍗曢�夐"); + questionImportVO.setSubject("璇枃"); + questionImportVO.setDifficult(2); + questionImportVO.setCorrect("A"); + questionImportVO.setScore(2); + questionImportVO.setAnalyze("A鏄鐨�"); + questionImportVO.setTitle("杩欐槸涓�閬撴祴璇曢鐩紝浣跨敤璇ユā鏉胯鍒犻櫎鎴栨浛鎹㈣繖閬撻"); + questionImportVO.setOptionName("A"); + questionImportVO.setOptionValue("閫夋垜"); + data.add(questionImportVO); + + QuestionImportVO questionImport1 = new QuestionImportVO(); + questionImport1.setOptionName("B"); + questionImport1.setOptionValue("閫塀"); + data.add(questionImport1); + + QuestionImportVO questionImport2 = new QuestionImportVO(); + questionImport2.setOptionName("C"); + questionImport2.setOptionValue("閫塁"); + data.add(questionImport2); + + QuestionImportVO questionImport3 = new QuestionImportVO(); + questionImport3.setOptionName("D"); + questionImport3.setOptionValue("閫塂"); + data.add(questionImport3); + + // 鏌ュ嚭鎵�鏈夌殑璇剧洰锛坋xcel涓嬫媺鏁版嵁锛� + List<Subject> subjects = subjectService.list(); + List<String> subjectNameList = subjects.stream().map(Subject::getName).collect(Collectors.toList()); + EasyExcel.write(response.getOutputStream(), QuestionImportVO.class) + .sheet("妯℃澘") + .registerWriteHandler(new SelectExcel(subjectNameList)) + .registerWriteHandler(new FixedMergeCellStrategy(2, 4, Arrays.asList(0, 1, 2, 5, 6, 7, 8))) + .doWrite(data); + } } -- Gitblit v1.8.0