From 49429bad1036c81c056faeadfa009c53ba777fad Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 07 五月 2024 18:02:11 +0800
Subject: [PATCH] feat：反馈保存、展示、处理、删除
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 88 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
index bfea93b..7e8b0cc 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -1,5 +1,6 @@
package com.mindskip.xzs.service.impl;
+import com.mindskip.xzs.domain.QuestionSubject;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.Question;
import com.mindskip.xzs.domain.TextContent;
@@ -8,23 +9,30 @@
import com.mindskip.xzs.domain.question.QuestionItemObject;
import com.mindskip.xzs.domain.question.QuestionObject;
import com.mindskip.xzs.repository.QuestionMapper;
+import com.mindskip.xzs.repository.SubjectMapper;
import com.mindskip.xzs.service.QuestionService;
+import com.mindskip.xzs.service.QuestionSubjectService;
import com.mindskip.xzs.service.SubjectService;
import com.mindskip.xzs.service.TextContentService;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.JsonUtil;
import com.mindskip.xzs.utility.ModelMapperSingle;
import com.mindskip.xzs.utility.ExamUtil;
+import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.question.ExamQuestionVO;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditItemVM;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM;
import com.mindskip.xzs.viewmodel.admin.question.QuestionPageRequestVM;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.mindskip.xzs.vo.QuestionExportVO;
+import com.mindskip.xzs.vo.QuestionImportVO;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -36,13 +44,17 @@
private final QuestionMapper questionMapper;
private final TextContentService textContentService;
private final SubjectService subjectService;
+ private final QuestionSubjectService questionSubjectService;
+ private final SubjectMapper subjectMapper;
@Autowired
- public QuestionServiceImpl(QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService) {
+ public QuestionServiceImpl(QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService, QuestionSubjectService questionSubjectService, SubjectMapper subjectMapper) {
super(questionMapper);
this.textContentService = textContentService;
this.questionMapper = questionMapper;
this.subjectService = subjectService;
+ this.questionSubjectService = questionSubjectService;
+ this.subjectMapper = subjectMapper;
}
@Override
@@ -57,7 +69,7 @@
@Transactional
public Question insertFullQuestion(QuestionEditRequestVM model, Integer userId) {
Date now = new Date();
- Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
+// Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
//棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆
TextContent infoTextContent = new TextContent();
@@ -66,8 +78,8 @@
textContentService.insertByFilter(infoTextContent);
Question question = new Question();
- question.setSubjectId(model.getSubjectId());
- question.setGradeLevel(gradeLevel);
+// question.setSubjectId(model.getSubjectId());
+ question.setGradeLevel(model.getGradeLevel());
question.setCreateTime(now);
question.setQuestionType(model.getQuestionType());
question.setStatus(QuestionStatusEnum.OK.getCode());
@@ -78,16 +90,26 @@
question.setCreateUser(userId);
question.setDeleted(false);
questionMapper.insertSelective(question);
+
+ //鎵归噺娣诲姞
+ List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e->{
+ QuestionSubject questionSubject = new QuestionSubject();
+ questionSubject.setQuestionId(question.getId());
+ questionSubject.setSubjectId(e);
+ questionSubject.setDeleted(0);
+ return questionSubject;
+ }).collect(Collectors.toList());
+ questionSubjectService.saves(list);
return question;
}
@Override
@Transactional
public Question updateFullQuestion(QuestionEditRequestVM model) {
- Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
+// Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
Question question = questionMapper.selectByPrimaryKey(model.getId());
question.setSubjectId(model.getSubjectId());
- question.setGradeLevel(gradeLevel);
+ question.setGradeLevel(model.getGradeLevel());
question.setScore(ExamUtil.scoreFromVM(model.getScore()));
question.setDifficult(model.getDifficult());
question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray());
@@ -98,22 +120,41 @@
setQuestionInfoFromVM(infoTextContent, model);
textContentService.updateByIdFilter(infoTextContent);
+ questionSubjectService.removeQuestionId(question.getId());
+ //鎵归噺娣诲姞
+ List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e->{
+ QuestionSubject questionSubject = new QuestionSubject();
+ questionSubject.setQuestionId(question.getId());
+ questionSubject.setSubjectId(e);
+ questionSubject.setDeleted(0);
+ return questionSubject;
+ }).collect(Collectors.toList());
+ questionSubjectService.saves(list);
+
return question;
}
@Override
- public QuestionEditRequestVM getQuestionEditRequestVM(Integer questionId) {
+ public ExamQuestionVO getQuestionEditRequestVM(Integer questionId) {
//棰樼洰鏄犲皠
Question question = questionMapper.selectByPrimaryKey(questionId);
- return getQuestionEditRequestVM(question);
+ List<QuestionSubject> list = questionSubjectService.getQuestion(questionId).stream().map(e->{
+ SubjectPageRequestVM subject = new SubjectPageRequestVM();
+ subject.setId(e.getSubjectId());
+ e.setSubName(subjectMapper.page(subject).get(0).getName());
+ return e;
+ }).collect(Collectors.toList());
+ ExamQuestionVO questionEditRequestVM = getQuestionEditRequestVM(question);
+ questionEditRequestVM.setQuestionSubjects(list);
+ return questionEditRequestVM;
}
@Override
- public QuestionEditRequestVM getQuestionEditRequestVM(Question question) {
+ public ExamQuestionVO getQuestionEditRequestVM(Question question) {
//棰樼洰鏄犲皠
TextContent questionInfoTextContent = textContentService.selectById(question.getInfoTextContentId());
QuestionObject questionObject = JsonUtil.toJsonObject(questionInfoTextContent.getContent(), QuestionObject.class);
- QuestionEditRequestVM questionEditRequestVM = modelMapper.map(question, QuestionEditRequestVM.class);
+ ExamQuestionVO questionEditRequestVM = modelMapper.map(question, ExamQuestionVO.class);
questionEditRequestVM.setTitle(questionObject.getTitleContent());
//绛旀
@@ -188,5 +229,32 @@
}).collect(Collectors.toList());
}
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public Integer remove(Integer id) {
+ Question question = questionMapper.selectByPrimaryKey(id);
+ question.setDeleted(true);
+ questionMapper.updateByPrimaryKeySelective(question);
+ List<Integer> list = questionSubjectService.getQuestion(id)
+ .stream().map(e->{
+ return e.getId();
+ }).collect(Collectors.toList());
+ return questionSubjectService.removes(list.toArray(new Integer[list.size()]));
+ }
+ @Override
+ public List<Question> getAll() {
+ return questionMapper.getAll();
+ }
+
+ @Override
+ public List<Question> selectByIds(List<Integer> ids) {
+ return questionMapper.selectByIds(ids);
+ }
+
+
+ @Override
+ public List<QuestionImportVO> export(QuestionExportVO query) {
+ return questionMapper.export(query);
+ }
}
--
Gitblit v1.8.0