From 1038a53e4b173bb853547e5250565567b8e85716 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期一, 21 十月 2024 09:30:10 +0800
Subject: [PATCH] 删除江西空管关键字
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 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 046cc96..947e312 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
@@ -1,32 +1,33 @@
package com.ycl.jxkg.controller.admin;
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaperQuestion;
import com.ycl.jxkg.domain.form.ExamPaperForm;
-import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperQuestionVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO;
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.ExamPaperQuestionService;
import com.ycl.jxkg.service.ExamPaperService;
-import com.ycl.jxkg.utils.DateTimeUtil;
-import com.ycl.jxkg.utils.PageInfoHelper;
-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 org.springframework.web.multipart.MultipartFile;
-import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
import java.util.Date;
+import java.util.List;
+
@Validated
@RequiredArgsConstructor
@RestController("AdminExamPaperController")
@@ -41,17 +42,9 @@
@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;
- });
+ PageInfo<ExamResponseVO> page = examPaperService.page(model);
return Result.ok(page);
}
-
@RequestMapping(value = "/addPaper", method = RequestMethod.POST)
public Result taskExamPageList(@RequestBody @Validated(Add.class) ExamPaperForm form) {
@@ -60,21 +53,16 @@
}
form.setCreateUser(getCurrentUser().getId());
form.setCreateTime(new Date());
- ExamPaper entity = ExamPaperForm.getEntityByForm(form,null);
- examPaperService.save(entity);
- return Result.ok();
- }
+ return examPaperService.addPaper(form);
+ }
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public Result edit(@RequestBody @Validated(Update.class) ExamPaperForm form) {
if (!StringUtils.isBlank(form.getVisibility())) {
form.setVisibility(VisibilityEnum.fromCode(form.getVisibility()).getName());
}
- //TODO:淇敼鑱旇〃閲岀殑鍒嗘暟
- ExamPaper entity = ExamPaperForm.getEntityByForm(form,null);
- examPaperService.updateById(entity);
- return Result.ok();
+ return examPaperService.updateExamPaper(form);
}
@RequestMapping(value = "/editQuestion", method = RequestMethod.POST)
@@ -82,11 +70,13 @@
return Result.ok();
}
+
@RequestMapping(value = "/selectQuestion/{id}", method = RequestMethod.POST)
public Result<ExamPaperQuestion> selectQuestion(@PathVariable Integer id) {
ExamPaperQuestion vo = examPaperQuestionService.selectById(id);
return Result.ok(vo);
}
+
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
public Result<ExamPaperEditRequestVO> select(@PathVariable Integer id) {
ExamPaperEditRequestVO vm = examPaperService.examPaperToVM(id);
@@ -98,4 +88,26 @@
baseMapper.deleteById(id);
return Result.ok();
}
+
+ @GetMapping("/my")
+ public Result myExamPaper(Integer paperType) {
+ List<ExamPaper> list = examPaperService.myExamPaper(paperType);
+ return Result.ok(list);
+ }
+
+ @GetMapping("/download/importTemplate")
+ public void importTemplate(HttpServletResponse response) {
+ examPaperService.importTemplate(response);
+ }
+
+ @PostMapping("/export")
+ public void export(@RequestBody QuestionExportVO query, HttpServletResponse response) {
+ examPaperService.export(query, response);
+ }
+
+ @PostMapping("/import")
+ public Result importPaper(@RequestParam("file") MultipartFile file, @RequestParam("examPaper") String form) {
+ return examPaperService.importPaper(file, JSON.parseObject(form, ExamPaperForm.class));
+ }
+
}
--
Gitblit v1.8.0