From db7ff10c4090564126bf78447fb038406812f321 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 04 六月 2024 11:54:58 +0800
Subject: [PATCH] feat：题目查询、新增，内容直接存题目表
---
src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 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 8a545ba..49fbcde 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
@@ -1,26 +1,26 @@
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.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 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.StringUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+@RequiredArgsConstructor
@RestController("AdminQuestionController")
@RequestMapping(value = "/api/admin/question")
public class QuestionController extends BaseApiController {
@@ -28,22 +28,14 @@
private final QuestionService questionService;
private final TextContentService textContentService;
- @Autowired
- public QuestionController(QuestionService questionService, TextContentService textContentService) {
- this.questionService = questionService;
- this.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.selectById(q.getInfoTextContentId());
- QuestionObject questionObject = JsonUtil.toJsonObject(textContent.getContent(), QuestionObject.class);
+ 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);
return vo;
@@ -76,9 +68,8 @@
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
public Result delete(@PathVariable Integer id) {
- Question question = questionService.selectById(id);
- question.setDeleted(true);
- questionService.updateByIdFilter(question);
+ Question question = questionService.getById(id);
+ questionService.updateById(question);
return Result.ok();
}
--
Gitblit v1.8.0