From c0792dcbc27d0580d9ed0e7aa3cf34c96c651840 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 04 七月 2024 17:50:58 +0800
Subject: [PATCH] mq配置修改
---
src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 112 +++++++++++++++++++++++++------------------------------
1 files changed, 51 insertions(+), 61 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..4a737c4 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -1,26 +1,27 @@
package com.ycl.jxkg.service.impl;
-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.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.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.domain.entity.Question;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
+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.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.mapper.QuestionMapper;
+import com.ycl.jxkg.service.QuestionService;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.ExamUtil;
+import com.ycl.jxkg.utils.HtmlUtil;
+import com.ycl.jxkg.utils.JsonUtil;
+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,23 +30,15 @@
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) {
- 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)
);
}
@@ -55,62 +48,54 @@
@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.insertByFilter(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);
- questionMapper.insertSelective(question);
+ question.setTitle(HtmlUtil.clear(model.getTitle()));
+ question.setAudioFile(model.getAudioFile());
+ question.setOriginalFile(model.getOriginalFile());
+ questionMapper.insert(question);
return question;
}
@Override
@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);
-
//棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊
- TextContent infoTextContent = textContentService.selectById(question.getInfoTextContentId());
- setQuestionInfoFromVM(infoTextContent, model);
- textContentService.updateByIdFilter(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;
}
@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());
- 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());
@@ -120,6 +105,7 @@
switch (questionTypeEnum) {
case SingleChoice:
case TrueFalse:
+ case Audio:
questionEditRequestVO.setCorrect(question.getCorrect());
break;
case MultipleChoice:
@@ -130,12 +116,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());
@@ -143,23 +130,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());
@@ -168,7 +151,7 @@
questionObject.setAnalyze(model.getAnalyze());
questionObject.setTitleContent(model.getTitle());
questionObject.setCorrect(model.getCorrect());
- infoTextContent.setContent(JsonUtil.toJsonStr(questionObject));
+ return JsonUtil.toJsonStr(questionObject);
}
@Override
@@ -188,5 +171,12 @@
}).collect(Collectors.toList());
}
+ @Override
+ public Boolean updateStatus(QuestionResponseVO question) {
+ return new LambdaUpdateChainWrapper<>(questionMapper)
+ .set(Question::getStatus, question.getStatus())
+ .eq(Question::getId, question.getId())
+ .update();
+ }
}
--
Gitblit v1.8.0