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 |   40 +++++++++++++++++-----------------------
 1 files changed, 17 insertions(+), 23 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 076b5ed..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,8 +1,9 @@
 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;
@@ -14,13 +15,13 @@
 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.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 lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,19 +30,13 @@
 import java.util.stream.Collectors;
 
 @Service
-public class QuestionServiceImpl extends BaseServiceImpl<Question> implements QuestionService {
+@RequiredArgsConstructor
+public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements QuestionService {
 
     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(QuestionPageRequestVO requestVM) {
@@ -61,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());
@@ -74,8 +69,7 @@
         question.setDifficult(model.getDifficult());
         question.setInfoTextContentId(infoTextContent.getId());
         question.setCreateUser(userId);
-        question.setDeleted(false);
-        questionMapper.insertSelective(question);
+        questionMapper.insert(question);
         return question;
     }
 
@@ -83,18 +77,18 @@
     @Transactional
     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;
     }
@@ -102,14 +96,14 @@
     @Override
     public QuestionEditRequestVO getQuestionEditRequestVM(Integer questionId) {
         //棰樼洰鏄犲皠
-        Question question = questionMapper.selectByPrimaryKey(questionId);
+        Question question = questionMapper.selectById(questionId);
         return getQuestionEditRequestVM(question);
     }
 
     @Override
     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);
         QuestionEditRequestVO questionEditRequestVO = new QuestionEditRequestVO();
         BeanUtils.copyProperties(question, questionEditRequestVO);

--
Gitblit v1.8.0