From b51e8bc94eee7074da1ea3457d5d574f4887572d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 31 Jul 2021 17:58:55 +0800
Subject: [PATCH] 新增字段，新增查询考试人员信息接口
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 147 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 111 insertions(+), 36 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 0d06085..42bc085 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -4,10 +4,10 @@
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
- * Redistributions of source code must retain the above copyright notice,
+ * Redistributions of source code must retain the above copyright exam,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
+ * exam, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
@@ -18,8 +18,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
@@ -29,12 +27,17 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamSubjectChoices;
import org.springblade.modules.exam.service.ExamPaperService;
+import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
import org.springblade.modules.exam.vo.ExamPaperVO;
import org.springblade.modules.exam.wrapper.ExamPaperWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -49,55 +52,47 @@
private final ExamPaperService examPaperService;
+
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入notice")
- public R<ExamPaperVO> detail(ExamPaper notice) {
- ExamPaper detail = examPaperService.getOne(Condition.getQueryWrapper(notice));
+ @ApiOperation(value = "详情", notes = "传入exam")
+ public R<ExamPaperVO> detail(ExamPaper exam) {
+ ExamPaper detail = examPaperService.getOne(Condition.getQueryWrapper(exam));
return R.data(ExamPaperWrapper.build().entityVO(detail));
}
/**
* 分页
*/
- @GetMapping("/list")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "category", value = "公告类型", paramType = "query", dataType = "integer"),
- @ApiImplicitParam(name = "title", value = "公告标题", paramType = "query", dataType = "string")
- })
+ @GetMapping("/page")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入notice")
- public R<IPage<ExamPaperVO>> list(@ApiIgnore @RequestParam Map<String, Object> notice, Query query) {
- IPage<ExamPaper> pages = examPaperService.page(Condition.getPage(query), Condition.getQueryWrapper(notice, ExamPaper.class));
+ @ApiOperation(value = "分页", notes = "传入exam")
+ public R<IPage<ExamPaperVO>> list(@ApiIgnore @RequestParam Map<String, Object> exam, Query query) {
+ IPage<ExamPaper> pages = examPaperService.page(Condition.getPage(query), Condition.getQueryWrapper(exam, ExamPaper.class));
return R.data(ExamPaperWrapper.build().pageVO(pages));
}
/**
- * 多表联合查询自定义分页
+ * 分页
*/
- @GetMapping("/page")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "category", value = "公告类型", paramType = "query", dataType = "integer"),
- @ApiImplicitParam(name = "title", value = "公告标题", paramType = "query", dataType = "string")
- })
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入notice")
- public R<IPage<ExamPaperVO>> page(@ApiIgnore ExamPaperVO notice, Query query) {
- IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), notice);
+ @GetMapping("/pages")
+ public R<IPage<ExamPaperVO>> page(ExamPaperVO exam, Query query) {
+ IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), exam);
return R.data(pages);
}
+
/**
* 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入notice")
- public R save(@RequestBody ExamPaper notice) {
- return R.status(examPaperService.save(notice));
+ @ApiOperation(value = "新增", notes = "传入exam")
+ public R save(@RequestBody ExamPaper exam) {
+ return R.status(examPaperService.save(exam));
}
/**
@@ -105,9 +100,9 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入notice")
- public R update(@RequestBody ExamPaper notice) {
- return R.status(examPaperService.updateById(notice));
+ @ApiOperation(value = "修改", notes = "传入exam")
+ public R update(@RequestBody ExamPaper exam) {
+ return R.status(examPaperService.updateById(exam));
}
/**
@@ -115,9 +110,9 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入notice")
- public R submit(@RequestBody ExamPaper notice) {
- return R.status(examPaperService.saveOrUpdate(notice));
+ @ApiOperation(value = "新增或修改", notes = "传入exam")
+ public R submit(@RequestBody ExamPaper exam) {
+ return R.status(examPaperService.saveOrUpdate(exam));
}
/**
@@ -125,10 +120,90 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入notice")
+ @ApiOperation(value = "逻辑删除", notes = "传入exam")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- boolean temp = examPaperService.deleteLogic(Func.toLongList(ids));
+ boolean temp = examPaperService.removeByIds(Func.toLongList(ids));
return R.status(temp);
}
+ /**
+ * 考试题目绑定
+ */
+ @GetMapping("/setPagerSubject")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "考试题目绑定", notes = "传入exam")
+ public R setPagerSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
+
+ return R.status(true);
+ }
+
+ /**
+ * 查询考试题目
+ */
+ @GetMapping("/queryPagerSubject")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "考试题目绑定", notes = "传入exam")
+ public R<ExamPaperSubjectVO> queryPagerSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
+ ExamPaperSubjectVO subject = examPaperService.queryPagerSubject(exam);
+ return R.data(subject);
+ }
+
+ /**
+ * 随机生成考试题目
+ */
+ @GetMapping("/queryRandomSubject")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "考试题目绑定", notes = "传入exam")
+ public R<List> queryRandomSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
+ List<ExamPaperSubjectVO> subject = examPaperService.queryRandomSubject(exam);
+ return R.data(subject);
+ }
+
+
+ /**
+ * 返回当前时间
+ */
+ @GetMapping("/getdate")
+ @ApiOperationSupport(order = 9)
+ public R getdate() {
+ Date date = new Date();
+ String strDateFormat = "yyyy-MM-dd HH:mm:ss";
+ SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
+ System.out.println(sdf.format(date));
+ return R.data(sdf.format(date));
+ }
+
+ /**
+ * 自定义树
+ * @param examPaper
+ * @return
+ */
+ @GetMapping("/page-tree")
+ public R pageTree(ExamPaper examPaper) {
+ List<ExamPaper> pages = examPaperService.selectExamPaperPageTree(examPaper);
+ return R.data(pages);
+ }
+
+ /**
+ * 解除绑定
+ */
+ @GetMapping("/UnbindSubject")
+ public R UnbindSubject(String paperid,String subjectid){
+
+ return R.status(examPaperService.UnbindSubject(paperid,subjectid));
+ }
+
+
+ /**
+ * 查询考生考试信息
+ * @param userId 用户id
+ * @return
+ */
+ @GetMapping("/getExamDetail")
+ public R getExamDetail(String userId){
+ return R.data(examPaperService.getExamDetail(userId));
+ }
+
+
+
}
--
Gitblit v1.9.3