From 0b520876403ea7a41a490af657394fe7377adea8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 六月 2024 11:08:17 +0800
Subject: [PATCH] 相应类调整
---
src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 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..d94e8d0 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
@@ -3,36 +3,31 @@
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.entity.TextContent;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.domain.question.QuestionObject;
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.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.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 {
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) {
@@ -42,7 +37,7 @@
BeanUtils.copyProperties(q, vo);
vo.setCreateTime(DateTimeUtil.dateFormat(q.getCreateTime()));
vo.setScore(ExamUtil.scoreToVM(q.getScore()));
- TextContent textContent = textContentService.selectById(q.getInfoTextContentId());
+ TextContent textContent = textContentService.getById(q.getInfoTextContentId());
QuestionObject questionObject = JsonUtil.toJsonObject(textContent.getContent(), QuestionObject.class);
String clearHtml = HtmlUtil.clear(questionObject.getTitleContent());
vo.setShortTitle(clearHtml);
@@ -76,9 +71,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