feat：题目表移除分数字段

龚焕茏

2024-06-05 c93bdeb8ed528d015865f763dfc240cbad7aa00b

 src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java

@@ -1,26 +1,24 @@
package com.ycl.jxkg.controller.admin;

import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.domain.Question;
import com.ycl.jxkg.domain.TextContent;
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 com.ycl.jxkg.vo.admin.question.QuestionEditRequestVO;
import com.ycl.jxkg.vo.admin.question.QuestionPageRequestVO;
import com.ycl.jxkg.vo.admin.question.QuestionResponseVO;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Objects;

@RequiredArgsConstructor
@RestController("AdminQuestionController")
@@ -28,18 +26,14 @@
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) {
        PageInfo<Question> pageInfo = questionService.page(model);
        PageInfo<QuestionResponseVO> pageInfo = questionService.page(model);
        PageInfo<QuestionResponseVO> page = PageInfoHelper.copyMap(pageInfo, q -> {
            QuestionResponseVO vo = new QuestionResponseVO();
            BeanUtils.copyProperties(q, vo);
            vo.setCreateTime(DateTimeUtil.dateFormat(q.getCreateTime()));
            vo.setScore(ExamUtil.scoreToVM(q.getScore()));
            TextContent textContent = textContentService.getById(q.getInfoTextContentId());
            QuestionObject questionObject = JsonUtil.toJsonObject(textContent.getContent(), QuestionObject.class);
            QuestionObject questionObject = JsonUtil.toJsonObject(q.getContent(), QuestionObject.class);
            String clearHtml = HtmlUtil.clear(questionObject.getTitleContent());
            vo.setShortTitle(clearHtml);
            return vo;
@@ -72,9 +66,7 @@

    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        Question question = questionService.getById(id);
        question.setDeleted(true);
        questionService.updateById(question);
        questionService.removeById(id);
        return Result.ok();
    }

@@ -84,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);
            }
        }