From c93bdeb8ed528d015865f763dfc240cbad7aa00b Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期三, 05 六月 2024 11:45:08 +0800 Subject: [PATCH] feat:题目表移除分数字段 --- /dev/null | 26 ------------- src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java | 3 - src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java | 2 - src/main/java/com/ycl/jxkg/domain/enums/general/StatusEnum.java | 27 +++++++++++++ src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java | 18 +------- src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java | 6 +- src/main/java/com/ycl/jxkg/domain/entity/Question.java | 17 +------- src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 13 +----- 8 files changed, 39 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java b/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java index 49fbcde..371d1f0 100644 --- a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java +++ b/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java @@ -4,21 +4,21 @@ import com.ycl.jxkg.base.BaseApiController; import com.ycl.jxkg.base.Result; import com.ycl.jxkg.base.SystemCode; -import com.ycl.jxkg.domain.entity.Question; import com.ycl.jxkg.domain.enums.QuestionTypeEnum; import com.ycl.jxkg.domain.question.QuestionObject; 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.service.QuestionService; -import com.ycl.jxkg.service.TextContentService; import com.ycl.jxkg.utils.*; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.Objects; @RequiredArgsConstructor @RestController("AdminQuestionController") @@ -26,7 +26,6 @@ public class QuestionController extends BaseApiController { private final QuestionService questionService; - private final TextContentService textContentService; @RequestMapping(value = "/page", method = RequestMethod.POST) public Result<PageInfo<QuestionResponseVO>> pageList(@RequestBody QuestionPageRequestVO model) { @@ -34,7 +33,6 @@ PageInfo<QuestionResponseVO> page = PageInfoHelper.copyMap(pageInfo, q -> { QuestionResponseVO vo = new QuestionResponseVO(); BeanUtils.copyProperties(q, vo); - vo.setScore(ExamUtil.scoreToVM(Integer.valueOf(q.getScore()))); QuestionObject questionObject = JsonUtil.toJsonObject(q.getContent(), QuestionObject.class); String clearHtml = HtmlUtil.clear(questionObject.getTitleContent()); vo.setShortTitle(clearHtml); @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST) public Result delete(@PathVariable Integer id) { - Question question = questionService.getById(id); - questionService.updateById(question); + questionService.removeById(id); return Result.ok(); } @@ -79,15 +76,6 @@ if (requireCorrect) { if (StringUtils.isBlank(model.getCorrect())) { String errorMsg = ErrorUtil.parameterErrorFormat("correct", "涓嶈兘涓虹┖"); - return new Result<>(SystemCode.ParameterValidError.getCode(), errorMsg); - } - } - - if (qType == QuestionTypeEnum.GapFilling.getCode()) { - Integer fillSumScore = model.getItems().stream().mapToInt(d -> ExamUtil.scoreFromVM(d.getScore())).sum(); - Integer questionScore = ExamUtil.scoreFromVM(model.getScore()); - if (!fillSumScore.equals(questionScore)) { - String errorMsg = ErrorUtil.parameterErrorFormat("score", "绌哄垎鏁板拰涓庨鐩�诲垎涓嶇浉绛�"); return new Result<>(SystemCode.ParameterValidError.getCode(), errorMsg); } } diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Question.java b/src/main/java/com/ycl/jxkg/domain/entity/Question.java index d32d719..f02b8a6 100644 --- a/src/main/java/com/ycl/jxkg/domain/entity/Question.java +++ b/src/main/java/com/ycl/jxkg/domain/entity/Question.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.ycl.jxkg.domain.base.AbsEntity; import com.ycl.jxkg.domain.enums.QuestionTypeEnum; +import com.ycl.jxkg.domain.enums.general.StatusEnum; import com.ycl.jxkg.utils.ExamUtil; import lombok.Data; @@ -28,18 +29,6 @@ */ @TableField("subject_id") private Integer subjectId; - - /** - * 棰樼洰鎬诲垎(鍗冨垎鍒�) - */ - @TableField("score") - private Integer score; - - /** - * 绾у埆 - */ - @TableField("grade_level") - private Integer gradeLevel; /** * 棰樼洰闅惧害 @@ -66,10 +55,10 @@ private Integer createUser; /** - * 1.姝e父 + * 1.鍚敤銆�2.绂佺敤 */ @TableField("status") - private Integer status; + private StatusEnum status; /** * 鍒涘缓鏃堕棿 diff --git a/src/main/java/com/ycl/jxkg/domain/enums/QuestionStatusEnum.java b/src/main/java/com/ycl/jxkg/domain/enums/QuestionStatusEnum.java deleted file mode 100644 index 1ee7f25..0000000 --- a/src/main/java/com/ycl/jxkg/domain/enums/QuestionStatusEnum.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ycl.jxkg.domain.enums; - -public enum QuestionStatusEnum { - - OK(1, "姝e父"), - Publish(2, "鍙戝竷"); - - private final Integer code; - private final String name; - - QuestionStatusEnum(Integer code, String name) { - this.code = code; - this.name = name; - } - - - public Integer getCode() { - return code; - } - - public String getName() { - return name; - } - - -} diff --git a/src/main/java/com/ycl/jxkg/domain/enums/general/StatusEnum.java b/src/main/java/com/ycl/jxkg/domain/enums/general/StatusEnum.java new file mode 100644 index 0000000..3f9162d --- /dev/null +++ b/src/main/java/com/ycl/jxkg/domain/enums/general/StatusEnum.java @@ -0,0 +1,27 @@ +package com.ycl.jxkg.domain.enums.general; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; + +/** + * @author gonghl + * @since 2024/6/5 涓婂崍 10:54 + */ +@Getter +public enum StatusEnum { + + ENABLE("1", "鍚敤"), + DISABLE("2", "绂佺敤"), + ; + + @EnumValue + final String value; + @JsonValue + final String desc; + + StatusEnum(String value, String desc) { + this.value = value; + this.desc = desc; + } +} diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java index 6e927df..01de229 100644 --- a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java +++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java @@ -34,9 +34,6 @@ private String correct; - @NotBlank - private String score; - @Range(min = 1, max = 5, message = "璇烽�夋嫨棰樼洰闅惧害") private Integer difficult; diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java index 85fad0e..74c2e82 100644 --- a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java +++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java @@ -24,8 +24,6 @@ private String createUserName; - private String score; - private Integer status; private String correct; diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java index 9bfe852..41d8df1 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java @@ -188,7 +188,7 @@ ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer = new ExamPaperQuestionCustomerAnswer(); examPaperQuestionCustomerAnswer.setQuestionId(question.getId()); examPaperQuestionCustomerAnswer.setExamPaperId(examPaper.getId()); - examPaperQuestionCustomerAnswer.setQuestionScore(question.getScore()); + examPaperQuestionCustomerAnswer.setQuestionScore(null); examPaperQuestionCustomerAnswer.setSubjectId(examPaper.getSubjectId()); examPaperQuestionCustomerAnswer.setItemOrder(itemOrder); examPaperQuestionCustomerAnswer.setCreateTime(now); @@ -217,13 +217,13 @@ case TrueFalse: examPaperQuestionCustomerAnswer.setAnswer(customerQuestionAnswer.getContent()); examPaperQuestionCustomerAnswer.setDoRight(question.getCorrect().equals(customerQuestionAnswer.getContent())); - examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? question.getScore() : 0); + examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? null : 0); break; case MultipleChoice: String customerAnswer = ExamUtil.contentToString(customerQuestionAnswer.getContentArray()); examPaperQuestionCustomerAnswer.setAnswer(customerAnswer); examPaperQuestionCustomerAnswer.setDoRight(customerAnswer.equals(question.getCorrect())); - examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? question.getScore() : 0); + examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? null : 0); break; case GapFilling: String correctAnswer = JsonUtil.toJsonStr(customerQuestionAnswer.getContentArray()); 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 7b83e10..3f3d40f 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java @@ -1,10 +1,9 @@ package com.ycl.jxkg.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.jxkg.domain.enums.general.StatusEnum; import com.ycl.jxkg.domain.other.KeyValue; 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; @@ -28,6 +27,7 @@ import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Service @@ -51,19 +51,16 @@ @Transactional public Question insertFullQuestion(QuestionEditRequestVO model, Integer userId) { Date now = new Date(); - Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId()); //棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆 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.setContent(questionObject); question.setCreateUser(userId); @@ -74,11 +71,8 @@ @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()); //棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊 @@ -123,7 +117,6 @@ default: break; } - questionEditRequestVO.setScore(ExamUtil.scoreToVM(question.getScore())); questionEditRequestVO.setAnalyze(questionObject.getAnalyze()); -- Gitblit v1.8.0