From 0879a157fd7c85ec34f1dac51a2b113bf1f5f2f6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 六月 2024 15:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
index 1f543ec..e51a998 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
@@ -2,21 +2,28 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.ExamPaper;
+import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.domain.form.ExamPaperForm;
+import com.ycl.jxkg.enums.VisibilityEnum;
+import com.ycl.jxkg.group.Add;
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
-import com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO;
-import com.ycl.jxkg.vo.admin.exam.ExamPaperEditRequestVO;
-import com.ycl.jxkg.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
-
+import java.util.Date;
+@Validated
@RequiredArgsConstructor
@RestController("AdminExamPaperController")
@RequestMapping(value = "/api/admin/exam/paper")
@@ -24,12 +31,15 @@
private final ExamPaperService examPaperService;
+ private final ExamPaperMapper baseMapper;
+
@RequestMapping(value = "/page", method = RequestMethod.POST)
public Result<PageInfo<ExamResponseVO>> pageList(@RequestBody ExamPaperPageRequestVO model) {
PageInfo<ExamPaper> pageInfo = examPaperService.page(model);
PageInfo<ExamResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
ExamResponseVO vo = new ExamResponseVO();
BeanUtils.copyProperties(e, vo);
+ vo.setVisibility(VisibilityEnum.valueOf(vo.getVisibility()).getCode()+"");
vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
return vo;
});
@@ -37,26 +47,27 @@
}
-
- @RequestMapping(value = "/taskExamPage", method = RequestMethod.POST)
- public Result<PageInfo<ExamResponseVO>> taskExamPageList(@RequestBody ExamPaperPageRequestVO model) {
- PageInfo<ExamPaper> pageInfo = examPaperService.taskExamPage(model);
- PageInfo<ExamResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamResponseVO vo = new ExamResponseVO();
- BeanUtils.copyProperties(e, vo);
- vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- return vo;
- });
- return Result.ok(page);
+ @RequestMapping(value = "/addPaper", method = RequestMethod.POST)
+ public Result taskExamPageList(@RequestBody @Validated(Add.class) ExamPaperForm form) {
+ if (!StringUtils.isBlank(form.getVisibility())) {
+ form.setVisibility(VisibilityEnum.fromCode(form.getVisibility()).getName());
+ }
+ form.setCreateUser(getCurrentUser().getId());
+ form.setCreateTime(new Date());
+ ExamPaper entity = ExamPaperForm.getEntityByForm(form,null);
+ examPaperService.save(entity);
+ return Result.ok();
}
-
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public Result<ExamPaperEditRequestVO> edit(@RequestBody @Valid ExamPaperEditRequestVO model) {
- ExamPaper examPaper = examPaperService.savePaperFromVM(model, getCurrentUser());
- ExamPaperEditRequestVO newVM = examPaperService.examPaperToVM(examPaper.getId());
- return Result.ok(newVM);
+ public Result edit(@RequestBody @Validated(Update.class) ExamPaperForm form) {
+ if (!StringUtils.isBlank(form.getVisibility())) {
+ form.setVisibility(VisibilityEnum.fromCode(form.getVisibility()).getName());
+ }
+ ExamPaper entity = ExamPaperForm.getEntityByForm(form,null);
+ examPaperService.updateById(entity);
+ return Result.ok();
}
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
@@ -67,9 +78,7 @@
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
public Result delete(@PathVariable Integer id) {
- ExamPaper examPaper = examPaperService.getById(id);
- examPaper.setDeleted(true);
- examPaperService.updateById(examPaper);
+ baseMapper.deleteById(id);
return Result.ok();
}
}
--
Gitblit v1.8.0