From ade2140f7950c36b401d434e025bf0b677f2673c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 六月 2024 17:47:25 +0800
Subject: [PATCH] 班级字段调整，相应类调整
---
src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 94 ++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 50 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 c1bbdd3..64c590d 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -1,27 +1,27 @@
package com.ycl.jxkg.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.other.KeyValue;
-import com.ycl.jxkg.domain.Question;
-import com.ycl.jxkg.domain.TextContent;
+import com.ycl.jxkg.domain.entity.Question;
+import com.ycl.jxkg.domain.entity.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.repository.QuestionMapper;
+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.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.JsonUtil;
-import com.ycl.jxkg.utility.ModelMapperSingle;
-import com.ycl.jxkg.utility.ExamUtil;
-import com.ycl.jxkg.viewmodel.admin.question.QuestionEditItemVM;
-import com.ycl.jxkg.viewmodel.admin.question.QuestionEditRequestVM;
-import com.ycl.jxkg.viewmodel.admin.question.QuestionPageRequestVM;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.JsonUtil;
+import com.ycl.jxkg.utils.ExamUtil;
+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.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,23 +30,16 @@
import java.util.stream.Collectors;
@Service
-public class QuestionServiceImpl extends BaseServiceImpl<Question> implements QuestionService {
+@RequiredArgsConstructor
+public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements QuestionService {
- protected final static ModelMapper modelMapper = ModelMapperSingle.Instance();
private final QuestionMapper questionMapper;
private final TextContentService textContentService;
private final SubjectService subjectService;
- @Autowired
- public QuestionServiceImpl(QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService) {
- super(questionMapper);
- this.textContentService = textContentService;
- this.questionMapper = questionMapper;
- this.subjectService = subjectService;
- }
@Override
- public PageInfo<Question> page(QuestionPageRequestVM requestVM) {
+ public PageInfo<Question> page(QuestionPageRequestVO requestVM) {
return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
questionMapper.page(requestVM)
);
@@ -55,7 +48,7 @@
@Override
@Transactional
- public Question insertFullQuestion(QuestionEditRequestVM model, Integer userId) {
+ public Question insertFullQuestion(QuestionEditRequestVO model, Integer userId) {
Date now = new Date();
Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
@@ -63,7 +56,7 @@
TextContent infoTextContent = new TextContent();
infoTextContent.setCreateTime(now);
setQuestionInfoFromVM(infoTextContent, model);
- textContentService.insertByFilter(infoTextContent);
+ textContentService.save(infoTextContent);
Question question = new Question();
question.setSubjectId(model.getSubjectId());
@@ -76,83 +69,84 @@
question.setDifficult(model.getDifficult());
question.setInfoTextContentId(infoTextContent.getId());
question.setCreateUser(userId);
- question.setDeleted(false);
- questionMapper.insertSelective(question);
+ questionMapper.insert(question);
return question;
}
@Override
@Transactional
- public Question updateFullQuestion(QuestionEditRequestVM model) {
+ public Question updateFullQuestion(QuestionEditRequestVO model) {
Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
- Question question = questionMapper.selectByPrimaryKey(model.getId());
+ 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.updateByPrimaryKeySelective(question);
+ questionMapper.updateById(question);
//棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊
- TextContent infoTextContent = textContentService.selectById(question.getInfoTextContentId());
+ TextContent infoTextContent = textContentService.getById(question.getInfoTextContentId());
setQuestionInfoFromVM(infoTextContent, model);
- textContentService.updateByIdFilter(infoTextContent);
+ textContentService.updateById(infoTextContent);
return question;
}
@Override
- public QuestionEditRequestVM getQuestionEditRequestVM(Integer questionId) {
+ public QuestionEditRequestVO getQuestionEditRequestVM(Integer questionId) {
//棰樼洰鏄犲皠
- Question question = questionMapper.selectByPrimaryKey(questionId);
+ Question question = questionMapper.selectById(questionId);
return getQuestionEditRequestVM(question);
}
@Override
- public QuestionEditRequestVM getQuestionEditRequestVM(Question question) {
+ public QuestionEditRequestVO getQuestionEditRequestVM(Question question) {
//棰樼洰鏄犲皠
- TextContent questionInfoTextContent = textContentService.selectById(question.getInfoTextContentId());
+ TextContent questionInfoTextContent = textContentService.getById(question.getInfoTextContentId());
QuestionObject questionObject = JsonUtil.toJsonObject(questionInfoTextContent.getContent(), QuestionObject.class);
- QuestionEditRequestVM questionEditRequestVM = modelMapper.map(question, QuestionEditRequestVM.class);
- questionEditRequestVM.setTitle(questionObject.getTitleContent());
+ QuestionEditRequestVO questionEditRequestVO = new QuestionEditRequestVO();
+ BeanUtils.copyProperties(question, questionEditRequestVO);
+ questionEditRequestVO.setTitle(questionObject.getTitleContent());
//绛旀
QuestionTypeEnum questionTypeEnum = QuestionTypeEnum.fromCode(question.getQuestionType());
switch (questionTypeEnum) {
case SingleChoice:
case TrueFalse:
- questionEditRequestVM.setCorrect(question.getCorrect());
+ questionEditRequestVO.setCorrect(question.getCorrect());
break;
case MultipleChoice:
- questionEditRequestVM.setCorrectArray(ExamUtil.contentToArray(question.getCorrect()));
+ questionEditRequestVO.setCorrectArray(ExamUtil.contentToArray(question.getCorrect()));
break;
case GapFilling:
List<String> correctContent = questionObject.getQuestionItemObjects().stream().map(d -> d.getContent()).collect(Collectors.toList());
- questionEditRequestVM.setCorrectArray(correctContent);
+ questionEditRequestVO.setCorrectArray(correctContent);
break;
case ShortAnswer:
- questionEditRequestVM.setCorrect(questionObject.getCorrect());
+ questionEditRequestVO.setCorrect(questionObject.getCorrect());
break;
default:
break;
}
- questionEditRequestVM.setScore(ExamUtil.scoreToVM(question.getScore()));
- questionEditRequestVM.setAnalyze(questionObject.getAnalyze());
+ questionEditRequestVO.setScore(ExamUtil.scoreToVM(question.getScore()));
+ questionEditRequestVO.setAnalyze(questionObject.getAnalyze());
//棰樼洰椤规槧灏�
- List<QuestionEditItemVM> editItems = questionObject.getQuestionItemObjects().stream().map(o -> {
- QuestionEditItemVM questionEditItemVM = modelMapper.map(o, QuestionEditItemVM.class);
+ List<QuestionEditItemVO> editItems = questionObject.getQuestionItemObjects().stream().map(o -> {
+ QuestionEditItemVO questionEditItemVO = new QuestionEditItemVO();
+ BeanUtils.copyProperties(o, questionEditItemVO);
if (o.getScore() != null) {
- questionEditItemVM.setScore(ExamUtil.scoreToVM(o.getScore()));
+ questionEditItemVO.setScore(ExamUtil.scoreToVM(o.getScore()));
}
- return questionEditItemVM;
+ return questionEditItemVO;
}).collect(Collectors.toList());
- questionEditRequestVM.setItems(editItems);
- return questionEditRequestVM;
+ questionEditRequestVO.setItems(editItems);
+ return questionEditRequestVO;
}
- public void setQuestionInfoFromVM(TextContent infoTextContent, QuestionEditRequestVM model) {
+ public void setQuestionInfoFromVM(TextContent infoTextContent, QuestionEditRequestVO model) {
List<QuestionItemObject> itemObjects = model.getItems().stream().map(i ->
{
QuestionItemObject item = new QuestionItemObject();
--
Gitblit v1.8.0