Skip to content

S
school-paper-admin
Commit 604ae45e by Wangmin
Options

PC端 新增题库、小程序端 发卷

parent ac480bc7
Showing with 577 additions and 233 deletions
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankController.java
package com.ruoyi.school.paper.controller; package com.ruoyi.school.paper.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo; import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo;
import com.ruoyi.school.paper.domain.bo.QuestionBankAndAnswerBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
import com.ruoyi.school.paper.service.IDbQuestionBankService; import com.ruoyi.school.paper.service.IDbQuestionBankService;
import com.ruoyi.common.core.page.TableDataInfo; import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
/** /**
* 题库主 * 题库主
...@@ -35,6 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo; ...@@ -35,6 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@SaIgnore
@RequestMapping("/school-paper/questionBank") @RequestMapping("/school-paper/questionBank")
public class DbQuestionBankController extends BaseController { public class DbQuestionBankController extends BaseController {
...@@ -65,8 +65,7 @@ public class DbQuestionBankController extends BaseController { ...@@ -65,8 +65,7 @@ public class DbQuestionBankController extends BaseController {
* @param id 主键 * @param id 主键
*/ */
@GetMapping("/{id}") @GetMapping("/{id}")
public R<DbQuestionBankVo> getInfo(@NotNull(message = "主键不能为空") public R<DbQuestionBankVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
@PathVariable Long id) {
return R.ok(iDbQuestionBankService.queryById(id)); return R.ok(iDbQuestionBankService.queryById(id));
} }
...@@ -81,6 +80,19 @@ public class DbQuestionBankController extends BaseController { ...@@ -81,6 +80,19 @@ public class DbQuestionBankController extends BaseController {
} }
/** /**
* [PC端] 新增题库记录
*
* @param bo 新增题目信息及选择项信息列表
* @return 操作结果
*/
@Log(title = "题库", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/question")
public R<Void> addQuestionAndAnswerRecords(@Validated(AddGroup.class) @RequestBody QuestionBankAndAnswerBo bo) {
return toAjax(iDbQuestionBankService.insertByBo(bo));
}
/**
* 修改题库主 * 修改题库主
*/ */
@Log(title = "题库主", businessType = BusinessType.UPDATE) @Log(title = "题库主", businessType = BusinessType.UPDATE)
...@@ -97,8 +109,7 @@ public class DbQuestionBankController extends BaseController { ...@@ -97,8 +109,7 @@ public class DbQuestionBankController extends BaseController {
*/ */
@Log(title = "题库主", businessType = BusinessType.DELETE) @Log(title = "题库主", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
@PathVariable Long[] ids) {
return toAjax(iDbQuestionBankService.deleteWithValidByIds(Arrays.asList(ids), true)); return toAjax(iDbQuestionBankService.deleteWithValidByIds(Arrays.asList(ids), true));
} }
} }
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbDictController.java → school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionTypeController.java
package com.ruoyi.school.paper.controller; package com.ruoyi.school.paper.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.school.paper.domain.vo.DbDictVo; import com.ruoyi.school.paper.domain.bo.DbQuestionTypeBo;
import com.ruoyi.school.paper.domain.bo.DbDictBo; import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.school.paper.service.IDbDictService; import com.ruoyi.school.paper.service.IDbQuestionTypeService;
import com.ruoyi.common.core.page.TableDataInfo; import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
/** /**
* 字典 * 题型
* *
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
...@@ -35,70 +33,70 @@ import com.ruoyi.common.core.page.TableDataInfo; ...@@ -35,70 +33,70 @@ import com.ruoyi.common.core.page.TableDataInfo;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/school-paper/dict") @RequestMapping("/school-paper/question-type")
@SaIgnore @SaIgnore
public class DbDictController extends BaseController { public class DbQuestionTypeController extends BaseController {
private final IDbDictService iDbDictService; private final IDbQuestionTypeService iDbQuestionTypeService;
/** /**
* 查询字典列表 * 查询题型列表
*/ */
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<DbDictVo> list(DbDictBo bo, PageQuery pageQuery) { public TableDataInfo<DbQuestionTypeVo> list(DbQuestionTypeBo bo, PageQuery pageQuery) {
return iDbDictService.queryPageList(bo, pageQuery); return iDbQuestionTypeService.queryPageList(bo, pageQuery);
} }
/** /**
* 导出字典列表 * 导出题型列表
*/ */
@Log(title = "字典", businessType = BusinessType.EXPORT) @Log(title = "题型", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(DbDictBo bo, HttpServletResponse response) { public void export(DbQuestionTypeBo bo, HttpServletResponse response) {
List<DbDictVo> list = iDbDictService.queryList(bo); List<DbQuestionTypeVo> list = iDbQuestionTypeService.queryList(bo);
ExcelUtil.exportExcel(list, "字典", DbDictVo.class, response); ExcelUtil.exportExcel(list, "题型", DbQuestionTypeVo.class, response);
} }
/** /**
* 获取字典详细信息 * 获取题型详细信息
* *
* @param id 主键 * @param id 主键
*/ */
@GetMapping("/{id}") @GetMapping("/{id}")
public R<DbDictVo> getInfo(@NotNull(message = "主键不能为空") public R<DbQuestionTypeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) { @PathVariable Long id) {
return R.ok(iDbDictService.queryById(id)); return R.ok(iDbQuestionTypeService.queryById(id));
} }
/** /**
* 新增字典 * 题型字典
*/ */
@Log(title = "字典", businessType = BusinessType.INSERT) @Log(title = "题型", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbDictBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody DbQuestionTypeBo bo) {
return toAjax(iDbDictService.insertByBo(bo)); return toAjax(iDbQuestionTypeService.insertByBo(bo));
} }
/** /**
* 修改字典 * 修改字典
*/ */
@Log(title = "字典", businessType = BusinessType.UPDATE) @Log(title = "题型", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbDictBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbQuestionTypeBo bo) {
return toAjax(iDbDictService.updateByBo(bo)); return toAjax(iDbQuestionTypeService.updateByBo(bo));
} }
/** /**
* 删除字典 * 删除题型
* *
* @param ids 主键串 * @param ids 主键串
*/ */
@Log(title = "字典", businessType = BusinessType.DELETE) @Log(title = "题型", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(iDbDictService.deleteWithValidByIds(Arrays.asList(ids), true)); return toAjax(iDbQuestionTypeService.deleteWithValidByIds(Arrays.asList(ids), true));
} }
} }
school-paper/src/main/java/com/ruoyi/school/paper/controller/TestPaperController.java 0 → 100644
package com.ruoyi.school.paper.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.school.paper.domain.vo.TestPaperVo;
import com.ruoyi.school.paper.service.ITestPaperService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Objects;
/**
* 考试
* <p>created in 2023/7/21 16:20
*
* @author WangMin
* @version 1.0
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/test")
public class TestPaperController extends BaseController {
private final ITestPaperService testPaperService;
/**
* 开始考试
*
* @return 试卷
*/
@Log(title = "开始开始", businessType = BusinessType.OTHER)
@GetMapping("/startTest/{paperId}")
public R<TestPaperVo> startTest(@PathVariable("paperId") Long paperId) {
Long userId = getUserId();
Objects.requireNonNull(userId, "未检查到合法账户信息");
return R.ok(testPaperService.generateTestPaper(userId,paperId));
}
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbCollectList.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 收藏对象 db_collect_list * 收藏对象 db_collect_list
...@@ -25,7 +23,7 @@ public class DbCollectList extends BaseEntity { ...@@ -25,7 +23,7 @@ public class DbCollectList extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 用户id * 用户id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbErrorList.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 错题集对象 db_error_list * 错题集对象 db_error_list
...@@ -25,7 +23,7 @@ public class DbErrorList extends BaseEntity { ...@@ -25,7 +23,7 @@ public class DbErrorList extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 用户id * 用户id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbProfile.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 资料对象 db_profile * 资料对象 db_profile
...@@ -25,7 +23,7 @@ public class DbProfile extends BaseEntity { ...@@ -25,7 +23,7 @@ public class DbProfile extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 资料名称 * 资料名称
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBank.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 题库主对象 db_question_bank * 题库主对象 db_question_bank
...@@ -20,12 +18,12 @@ import com.ruoyi.common.core.domain.BaseEntity; ...@@ -20,12 +18,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
@TableName("db_question_bank") @TableName("db_question_bank")
public class DbQuestionBank extends BaseEntity { public class DbQuestionBank extends BaseEntity {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 类别id * 类别id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBankAnswer.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 题目答案对象 db_question_bank_answer * 题目答案对象 db_question_bank_answer
...@@ -25,7 +23,7 @@ public class DbQuestionBankAnswer extends BaseEntity { ...@@ -25,7 +23,7 @@ public class DbQuestionBankAnswer extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 题目id * 题目id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBankAnswerTestPaper.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 试卷题目答案对象 db_question_bank_answer_test_paper * 试卷题目答案对象 db_question_bank_answer_test_paper
...@@ -25,7 +23,7 @@ public class DbQuestionBankAnswerTestPaper extends BaseEntity { ...@@ -25,7 +23,7 @@ public class DbQuestionBankAnswerTestPaper extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 题目id * 题目id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBankTestPaper.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 试卷题库主对象 db_question_bank_test_paper * 试卷题库主对象 db_question_bank_test_paper
...@@ -25,7 +23,7 @@ public class DbQuestionBankTestPaper extends BaseEntity { ...@@ -25,7 +23,7 @@ public class DbQuestionBankTestPaper extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 试卷id * 试卷id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbDict.java → school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionType.java
...@@ -3,39 +3,32 @@ package com.ruoyi.school.paper.domain; ...@@ -3,39 +3,32 @@ package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 字典对象 db_dict * 题目类型对象 db_question_type
* *
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("db_dict") @TableName("db_question_type")
public class DbDict extends BaseEntity { public class DbQuestionType extends BaseEntity {
private static final long serialVersionUID=1L; private static final long serialVersionUID=1L;
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 父级id * 父级id
*/ */
private Long parentId; private Long parentId;
/** /**
* 类型：1 类别，2 阶段，3 班级
*/
private String type;
/**
* 名称 * 名称
*/ */
private String typeValue; private String typeValue;
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaper.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 试卷对象 db_test_paper * 试卷对象 db_test_paper
...@@ -25,7 +23,7 @@ public class DbTestPaper extends BaseEntity { ...@@ -25,7 +23,7 @@ public class DbTestPaper extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 试卷名称 * 试卷名称
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaperRecord.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 答题记录对象 db_test_paper_record * 答题记录对象 db_test_paper_record
...@@ -20,12 +18,12 @@ import com.ruoyi.common.core.domain.BaseEntity; ...@@ -20,12 +18,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
@TableName("db_test_paper_record") @TableName("db_test_paper_record")
public class DbTestPaperRecord extends BaseEntity { public class DbTestPaperRecord extends BaseEntity {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 用户id * 用户id
...@@ -36,7 +34,12 @@ public class DbTestPaperRecord extends BaseEntity { ...@@ -36,7 +34,12 @@ public class DbTestPaperRecord extends BaseEntity {
*/ */
private Long testPaperId; private Long testPaperId;
/** /**
* 状态：0 批卷中，1 批卷完成 * 状态
* <ul>
* <ol>0:正在答题</ol>
* <ol>1:待批阅</ol>
* <ol>2:已批阅</ol>
* </ul>
*/ */
private Integer status; private Integer status;
/** /**
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaperRecordDetail.java
package com.ruoyi.school.paper.domain; package com.ruoyi.school.paper.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 答题记录详情对象 db_test_paper_record_detail * 答题记录详情对象 db_test_paper_record_detail
...@@ -28,7 +26,7 @@ public class DbTestPaperRecordDetail extends BaseEntity { ...@@ -28,7 +26,7 @@ public class DbTestPaperRecordDetail extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@TableId(value = "id") @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** /**
* 记录id * 记录id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbDictBo.java → school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbQuestionTypeBo.java
package com.ruoyi.school.paper.domain.bo; package com.ruoyi.school.paper.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* 字典业务对象 db_dict * 题型业务对象 db_question_type
* *
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
...@@ -19,7 +18,7 @@ import com.ruoyi.common.core.domain.BaseEntity; ...@@ -19,7 +18,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class DbDictBo extends BaseEntity { public class DbQuestionTypeBo extends BaseEntity {
/** /**
* 主键id * 主键id
...@@ -34,12 +33,6 @@ public class DbDictBo extends BaseEntity { ...@@ -34,12 +33,6 @@ public class DbDictBo extends BaseEntity {
private Long parentId; private Long parentId;
/** /**
* 类型：1 类别，2 阶段，3 班级
*/
@NotBlank(message = "类型：1 类别，2 阶段，3 班级不能为空", groups = { AddGroup.class, EditGroup.class })
private String type;
/**
* 名称 * 名称
*/ */
@NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class }) @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
...@@ -54,7 +47,6 @@ public class DbDictBo extends BaseEntity { ...@@ -54,7 +47,6 @@ public class DbDictBo extends BaseEntity {
/** /**
* 状态：0正常，1删除 * 状态：0正常，1删除
*/ */
@NotNull(message = "状态：0正常，1删除不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer typeStatus; private Integer typeStatus;
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/QuestionBankAndAnswerBo.java 0 → 100644
package com.ruoyi.school.paper.domain.bo;
import com.ruoyi.school.paper.domain.DbQuestionBank;
import com.ruoyi.school.paper.domain.DbQuestionBankAnswer;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 题库及答案选项业务对象
* <p>created in 2023/7/21 13:21
*
* @author WangMin
* @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class QuestionBankAndAnswerBo extends DbQuestionBank {
/**
* 选择题对应选项
*/
private List<DbQuestionBankAnswer> options;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbDictVo.java → school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbQuestionTypeVo.java
...@@ -2,11 +2,7 @@ package com.ruoyi.school.paper.domain.vo; ...@@ -2,11 +2,7 @@ package com.ruoyi.school.paper.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import java.util.Date;
/** /**
...@@ -17,7 +13,7 @@ import java.util.Date; ...@@ -17,7 +13,7 @@ import java.util.Date;
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
public class DbDictVo { public class DbQuestionTypeVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -33,11 +29,6 @@ public class DbDictVo { ...@@ -33,11 +29,6 @@ public class DbDictVo {
@ExcelProperty(value = "父级id") @ExcelProperty(value = "父级id")
private Long parentId; private Long parentId;
/**
* 类型：1 类别，2 阶段，3 班级
*/
@ExcelProperty(value = "类型：1 类别，2 阶段，3 班级")
private String type;
/** /**
* 名称 * 名称
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/OptionsVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import lombok.Data;
/**
* <p>created in 2023/7/21 18:22
*
* @author WangMin
* @version 1.0
*/
@Data
public class OptionsVo {
/**
* 标签名
*/
private String tag;
/**
* 内容
*/
private String content;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/TestPaperVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import lombok.Data;
import java.util.List;
/**
* 学生考试 试题实体
* <p>created in 2023/7/21 16:29
*
* @author WangMin
* @version 1.0
*/
@Data
public class TestPaperVo {
/**
* 试卷名称
*/
private String testName;
/**
* 考试纪录ID
*/
private Long recordId;
/**
* 试题
*/
private List<TestQuestionsVo> questions;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/TestQuestionItemVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import java.util.List;
/**
* <p>created in 2023/7/21 16:41
*
* @author WangMin
* @version 1.0
*/
@Data
public class TestQuestionItemVo {
/**
* 题目ID
*/
private Long id;
/**
* 题目
*/
private String topic;
/**
* 选择题选项
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<OptionsVo> options;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/TestQuestionsVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import lombok.Data;
import java.util.List;
/**
* 试卷题目分类实体类
* <p>created in 2023/7/21 16:35
*
* @author WangMin
* @version 1.0
*/
@Data
public class TestQuestionsVo {
/**
* 题目类别
*/
private String questionsCategory;
/**
* 题目列表
*/
private List<TestQuestionItemVo> item;
}
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbErrorListMapper.java
...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper; ...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.school.paper.domain.DbErrorList; import com.ruoyi.school.paper.domain.DbErrorList;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest; import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.DbErrorListVo; import com.ruoyi.school.paper.domain.vo.DbErrorListVo;
...@@ -14,6 +15,7 @@ import org.apache.ibatis.annotations.Param; ...@@ -14,6 +15,7 @@ import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 错题集Mapper接口 * 错题集Mapper接口
...@@ -21,6 +23,7 @@ import java.util.List; ...@@ -21,6 +23,7 @@ import java.util.List;
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
@Mapper
public interface DbErrorListMapper extends BaseMapperPlus<DbErrorListMapper, DbErrorList, DbErrorListVo> { public interface DbErrorListMapper extends BaseMapperPlus<DbErrorListMapper, DbErrorList, DbErrorListVo> {
Page<ErrorTopicListVo> findErrorTopicPage(IPage<ErrorTopicListVo> iPage, @Param("request") ErrorTopicRequest request); Page<ErrorTopicListVo> findErrorTopicPage(IPage<ErrorTopicListVo> iPage, @Param("request") ErrorTopicRequest request);
......
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbQuestionBankAnswerMapper.java
...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper; ...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper;
import com.ruoyi.school.paper.domain.DbQuestionBankAnswer; import com.ruoyi.school.paper.domain.DbQuestionBankAnswer;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankAnswerVo; import com.ruoyi.school.paper.domain.vo.DbQuestionBankAnswerVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 题目答案Mapper接口 * 题目答案Mapper接口
...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; ...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
@Mapper
public interface DbQuestionBankAnswerMapper extends BaseMapperPlus<DbQuestionBankAnswerMapper, DbQuestionBankAnswer, DbQuestionBankAnswerVo> { public interface DbQuestionBankAnswerMapper extends BaseMapperPlus<DbQuestionBankAnswerMapper, DbQuestionBankAnswer, DbQuestionBankAnswerVo> {
} }
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbQuestionBankMapper.java
...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper; ...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper;
import com.ruoyi.school.paper.domain.DbQuestionBank; import com.ruoyi.school.paper.domain.DbQuestionBank;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo; import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 题库主Mapper接口 * 题库主Mapper接口
...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; ...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
@Mapper
public interface DbQuestionBankMapper extends BaseMapperPlus<DbQuestionBankMapper, DbQuestionBank, DbQuestionBankVo> { public interface DbQuestionBankMapper extends BaseMapperPlus<DbQuestionBankMapper, DbQuestionBank, DbQuestionBankVo> {
} }
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbQuestionBankTestPaperMapper.java
package com.ruoyi.school.paper.mapper; package com.ruoyi.school.paper.mapper;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.school.paper.domain.DbQuestionBankTestPaper; import com.ruoyi.school.paper.domain.DbQuestionBankTestPaper;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankTestPaperVo; import com.ruoyi.school.paper.domain.vo.DbQuestionBankTestPaperVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.school.paper.domain.vo.TestQuestionsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 试卷题库主Mapper接口 * 试卷题库主Mapper接口
...@@ -10,6 +15,15 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; ...@@ -10,6 +15,15 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
@Mapper
public interface DbQuestionBankTestPaperMapper extends BaseMapperPlus<DbQuestionBankTestPaperMapper, DbQuestionBankTestPaper, DbQuestionBankTestPaperVo> { public interface DbQuestionBankTestPaperMapper extends BaseMapperPlus<DbQuestionBankTestPaperMapper, DbQuestionBankTestPaper, DbQuestionBankTestPaperVo> {
/**
* 查询试卷所有考题
*
* @return 试卷
*/
List<TestQuestionsVo> selectTestPaperQuestion(@Param("paperId") Long paperId);
} }
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbDictMapper.java → school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbQuestionTypeMapper.java
package com.ruoyi.school.paper.mapper; package com.ruoyi.school.paper.mapper;
import com.ruoyi.school.paper.domain.DbDict; import com.ruoyi.school.paper.domain.DbQuestionType;
import com.ruoyi.school.paper.domain.vo.DbDictVo; import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 字典Mapper接口 * 字典Mapper接口
...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; ...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
public interface DbDictMapper extends BaseMapperPlus<DbDictMapper, DbDict, DbDictVo> { @Mapper
public interface DbQuestionTypeMapper extends BaseMapperPlus<DbQuestionTypeMapper, DbQuestionType, DbQuestionTypeVo> {
} }
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbTestPaperMapper.java
...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper; ...@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper;
import com.ruoyi.school.paper.domain.DbTestPaper; import com.ruoyi.school.paper.domain.DbTestPaper;
import com.ruoyi.school.paper.domain.vo.DbTestPaperVo; import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 试卷Mapper接口 * 试卷Mapper接口
...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; ...@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
@Mapper
public interface DbTestPaperMapper extends BaseMapperPlus<DbTestPaperMapper, DbTestPaper, DbTestPaperVo> { public interface DbTestPaperMapper extends BaseMapperPlus<DbTestPaperMapper, DbTestPaper, DbTestPaperVo> {
} }
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbQuestionBankService.java
package com.ruoyi.school.paper.service; package com.ruoyi.school.paper.service;
import com.ruoyi.school.paper.domain.DbQuestionBank; import com.ruoyi.school.paper.domain.DbQuestionBank;
import com.ruoyi.school.paper.domain.bo.QuestionBankAndAnswerBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo; import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo; import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
...@@ -37,6 +38,12 @@ public interface IDbQuestionBankService { ...@@ -37,6 +38,12 @@ public interface IDbQuestionBankService {
*/ */
Boolean insertByBo(DbQuestionBankBo bo); Boolean insertByBo(DbQuestionBankBo bo);
/** 新增题库
* @param bo 题目参数及答案列表
* @return 操作结果
*/
boolean insertByBo(QuestionBankAndAnswerBo bo);
/** /**
* 修改题库主 * 修改题库主
*/ */
......
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbQuestionBankTestPaperService.java
package com.ruoyi.school.paper.service; package com.ruoyi.school.paper.service;
import com.ruoyi.school.paper.domain.DbQuestionBankTestPaper;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankTestPaperVo;
import com.ruoyi.school.paper.domain.bo.DbQuestionBankTestPaperBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.school.paper.domain.bo.DbQuestionBankTestPaperBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankTestPaperVo;
import com.ruoyi.school.paper.domain.vo.TestQuestionsVo;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -46,4 +46,12 @@ public interface IDbQuestionBankTestPaperService { ...@@ -46,4 +46,12 @@ public interface IDbQuestionBankTestPaperService {
* 校验并批量删除试卷题库主信息 * 校验并批量删除试卷题库主信息
*/ */
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid); Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 查询试卷所有考题
*
* @return 试卷
*/
List<TestQuestionsVo> getTestPaperQuestion(Long paperId);
} }
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbDictService.java → school-paper/src/main/java/com/ruoyi/school/paper/service/IDbQuestionTypeService.java
package com.ruoyi.school.paper.service; package com.ruoyi.school.paper.service;
import com.ruoyi.school.paper.domain.DbDict; import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.school.paper.domain.vo.DbDictVo; import com.ruoyi.school.paper.domain.bo.DbQuestionTypeBo;
import com.ruoyi.school.paper.domain.bo.DbDictBo;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
...@@ -15,32 +14,32 @@ import java.util.List; ...@@ -15,32 +14,32 @@ import java.util.List;
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
public interface IDbDictService { public interface IDbQuestionTypeService {
/** /**
* 查询字典 * 查询字典
*/ */
DbDictVo queryById(Long id); DbQuestionTypeVo queryById(Long id);
/** /**
* 查询字典列表 * 查询字典列表
*/ */
TableDataInfo<DbDictVo> queryPageList(DbDictBo bo, PageQuery pageQuery); TableDataInfo<DbQuestionTypeVo> queryPageList(DbQuestionTypeBo bo, PageQuery pageQuery);
/** /**
* 查询字典列表 * 查询字典列表
*/ */
List<DbDictVo> queryList(DbDictBo bo); List<DbQuestionTypeVo> queryList(DbQuestionTypeBo bo);
/** /**
* 新增字典 * 新增字典
*/ */
Boolean insertByBo(DbDictBo bo); Boolean insertByBo(DbQuestionTypeBo bo);
/** /**
* 修改字典 * 修改字典
*/ */
Boolean updateByBo(DbDictBo bo); Boolean updateByBo(DbQuestionTypeBo bo);
/** /**
* 校验并批量删除字典信息 * 校验并批量删除字典信息
......
school-paper/src/main/java/com/ruoyi/school/paper/service/ITestPaperService.java 0 → 100644
package com.ruoyi.school.paper.service;
import com.ruoyi.school.paper.domain.vo.TestPaperVo;
/**
* 考试接口
* <p>created in 2023/7/21 16:57
*
* @author WangMin
* @version 1.0
*/
public interface ITestPaperService {
/**
* 生成试卷
*
* @param userId 用户ID
* @param paperId 试卷ID
* @return 试题
*/
TestPaperVo generateTestPaper(Long userId, Long paperId);
}
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbQuestionBankServiceImpl.java
package com.ruoyi.school.paper.service.impl; package com.ruoyi.school.paper.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils; import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.school.paper.domain.DbQuestionBank;
import com.ruoyi.school.paper.domain.DbQuestionBankAnswer;
import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo; import com.ruoyi.school.paper.domain.bo.DbQuestionBankBo;
import com.ruoyi.school.paper.domain.bo.QuestionBankAndAnswerBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo; import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
import com.ruoyi.school.paper.domain.DbQuestionBank; import com.ruoyi.school.paper.mapper.DbQuestionBankAnswerMapper;
import com.ruoyi.school.paper.mapper.DbQuestionBankMapper; import com.ruoyi.school.paper.mapper.DbQuestionBankMapper;
import com.ruoyi.school.paper.service.IDbQuestionBankService; import com.ruoyi.school.paper.service.IDbQuestionBankService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection;
/** /**
* 题库主Service业务层处理 * 题库主Service业务层处理
...@@ -31,11 +36,13 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService { ...@@ -31,11 +36,13 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
private final DbQuestionBankMapper baseMapper; private final DbQuestionBankMapper baseMapper;
private final DbQuestionBankAnswerMapper questionBankAnswerMapper;
/** /**
* 查询题库主 * 查询题库主
*/ */
@Override @Override
public DbQuestionBankVo queryById(Long id){ public DbQuestionBankVo queryById(Long id) {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
...@@ -90,6 +97,31 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService { ...@@ -90,6 +97,31 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
} }
/** /**
* 新增题库
* <p>若为选择题则将相关选项加入 db_question_bank_answer表中
*
* @param bo 题目参数及答案列表
* @return 操作结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean insertByBo(QuestionBankAndAnswerBo bo) {
DbQuestionBank insertRecord = BeanUtil.toBean(bo, DbQuestionBank.class);
validEntityBeforeSave(insertRecord);
boolean questionInsertFlag = baseMapper.insert(insertRecord) > 0;
// 若为选择题则同步插入至选项答案中
boolean answerInsertFlag = false;
if (questionInsertFlag && insertRecord.getSpecies() == 2 && CollUtil.isNotEmpty(bo.getOptions())) {
List<DbQuestionBankAnswer> options = bo.getOptions();
for (DbQuestionBankAnswer option : options) {
option.setQuestionBankId(insertRecord.getId());
}
answerInsertFlag = questionBankAnswerMapper.insertBatch(options);
}
return questionInsertFlag && answerInsertFlag;
}
/**
* 修改题库主 * 修改题库主
*/ */
@Override @Override
...@@ -102,7 +134,7 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService { ...@@ -102,7 +134,7 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(DbQuestionBank entity){ private void validEntityBeforeSave(DbQuestionBank entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
...@@ -111,7 +143,7 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService { ...@@ -111,7 +143,7 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
......
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbQuestionBankTestPaperServiceImpl.java
...@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery; ...@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.school.paper.domain.vo.TestQuestionsVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbQuestionBankTestPaperBo; import com.ruoyi.school.paper.domain.bo.DbQuestionBankTestPaperBo;
...@@ -35,7 +36,7 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa ...@@ -35,7 +36,7 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa
* 查询试卷题库主 * 查询试卷题库主
*/ */
@Override @Override
public DbQuestionBankTestPaperVo queryById(Long id){ public DbQuestionBankTestPaperVo queryById(Long id) {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
...@@ -103,7 +104,7 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa ...@@ -103,7 +104,7 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(DbQuestionBankTestPaper entity){ private void validEntityBeforeSave(DbQuestionBankTestPaper entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
...@@ -112,9 +113,14 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa ...@@ -112,9 +113,14 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
} }
@Override
public List<TestQuestionsVo> getTestPaperQuestion(Long paperId) {
return baseMapper.selectTestPaperQuestion(paperId);
}
} }
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbDictServiceImpl.java → school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbQuestionTypeServiceImpl.java
...@@ -9,71 +9,70 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -9,71 +9,70 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbDictBo; import com.ruoyi.school.paper.domain.bo.DbQuestionTypeBo;
import com.ruoyi.school.paper.domain.vo.DbDictVo; import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.school.paper.domain.DbDict; import com.ruoyi.school.paper.domain.DbQuestionType;
import com.ruoyi.school.paper.mapper.DbDictMapper; import com.ruoyi.school.paper.mapper.DbQuestionTypeMapper;
import com.ruoyi.school.paper.service.IDbDictService; import com.ruoyi.school.paper.service.IDbQuestionTypeService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection; import java.util.Collection;
/** /**
* 字典Service业务层处理 * 题型Service业务层处理
* *
* @author zyf * @author zyf
* @date 2023-07-20 * @date 2023-07-20
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class DbDictServiceImpl implements IDbDictService { public class DbQuestionTypeServiceImpl implements IDbQuestionTypeService {
private final DbDictMapper baseMapper; private final DbQuestionTypeMapper baseMapper;
/** /**
* 查询字典 * 查询题型
*/ */
@Override @Override
public DbDictVo queryById(Long id){ public DbQuestionTypeVo queryById(Long id){
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
/** /**
* 查询字典列表 * 查询题型列表
*/ */
@Override @Override
public TableDataInfo<DbDictVo> queryPageList(DbDictBo bo, PageQuery pageQuery) { public TableDataInfo<DbQuestionTypeVo> queryPageList(DbQuestionTypeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DbDict> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<DbQuestionType> lqw = buildQueryWrapper(bo);
Page<DbDictVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<DbQuestionTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
/** /**
* 查询字典列表 * 查询题型列表
*/ */
@Override @Override
public List<DbDictVo> queryList(DbDictBo bo) { public List<DbQuestionTypeVo> queryList(DbQuestionTypeBo bo) {
LambdaQueryWrapper<DbDict> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<DbQuestionType> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw); return baseMapper.selectVoList(lqw);
} }
private LambdaQueryWrapper<DbDict> buildQueryWrapper(DbDictBo bo) { private LambdaQueryWrapper<DbQuestionType> buildQueryWrapper(DbQuestionTypeBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DbDict> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<DbQuestionType> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getParentId() != null, DbDict::getParentId, bo.getParentId()); lqw.eq(bo.getParentId() != null, DbQuestionType::getParentId, bo.getParentId());
lqw.eq(StringUtils.isNotBlank(bo.getType()), DbDict::getType, bo.getType()); lqw.eq(StringUtils.isNotBlank(bo.getTypeValue()), DbQuestionType::getTypeValue, bo.getTypeValue());
lqw.eq(StringUtils.isNotBlank(bo.getTypeValue()), DbDict::getTypeValue, bo.getTypeValue()); lqw.eq(bo.getTypeStatus() != null, DbQuestionType::getTypeStatus, bo.getTypeStatus());
lqw.eq(bo.getTypeStatus() != null, DbDict::getTypeStatus, bo.getTypeStatus());
return lqw; return lqw;
} }
/** /**
* 新增字典 * 新增题型
*/ */
@Override @Override
public Boolean insertByBo(DbDictBo bo) { public Boolean insertByBo(DbQuestionTypeBo bo) {
DbDict add = BeanUtil.toBean(bo, DbDict.class); DbQuestionType add = BeanUtil.toBean(bo, DbQuestionType.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
...@@ -83,11 +82,11 @@ public class DbDictServiceImpl implements IDbDictService { ...@@ -83,11 +82,11 @@ public class DbDictServiceImpl implements IDbDictService {
} }
/** /**
* 修改字典 * 修改题型
*/ */
@Override @Override
public Boolean updateByBo(DbDictBo bo) { public Boolean updateByBo(DbQuestionTypeBo bo) {
DbDict update = BeanUtil.toBean(bo, DbDict.class); DbQuestionType update = BeanUtil.toBean(bo, DbQuestionType.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
...@@ -95,12 +94,12 @@ public class DbDictServiceImpl implements IDbDictService { ...@@ -95,12 +94,12 @@ public class DbDictServiceImpl implements IDbDictService {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(DbDict entity){ private void validEntityBeforeSave(DbQuestionType entity){
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
/** /**
* 批量删除字典 * 批量删除题型
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
......
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/TestPaperServiceImpl.java 0 → 100644
package com.ruoyi.school.paper.service.impl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
import com.ruoyi.school.paper.domain.vo.TestPaperVo;
import com.ruoyi.school.paper.domain.vo.TestQuestionsVo;
import com.ruoyi.school.paper.service.IDbQuestionBankTestPaperService;
import com.ruoyi.school.paper.service.IDbTestPaperRecordService;
import com.ruoyi.school.paper.service.IDbTestPaperService;
import com.ruoyi.school.paper.service.ITestPaperService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
/**
* <p>created in 2023/7/21 17:03
*
* @author WangMin
* @version 1.0
*/
@Service
@RequiredArgsConstructor
public class TestPaperServiceImpl implements ITestPaperService {
private final IDbTestPaperService testPaperService;
private final IDbTestPaperRecordService paperRecordService;
private final IDbQuestionBankTestPaperService bankTestPaperService;
@Override
@Transactional(rollbackFor = Exception.class)
public TestPaperVo generateTestPaper(Long userId, Long paperId) {
TestPaperVo result = new TestPaperVo();
// 获取到对应试卷信息
DbTestPaperVo dbTestPaperVo = testPaperService.queryById(paperId);
Objects.requireNonNull(dbTestPaperVo, "未检查到目标试卷");
result.setTestName(dbTestPaperVo.getTestName());
// 插入学生-试卷考试记录信息
DbTestPaperRecordBo dbTestPaperRecord = new DbTestPaperRecordBo();
dbTestPaperRecord.setTestPaperId(paperId);
dbTestPaperRecord.setUserId(userId);
dbTestPaperRecord.setStatus(0);
boolean recordInsertFlag = paperRecordService.insertByBo(dbTestPaperRecord);
if (!recordInsertFlag) {
throw new ServiceException("考试记录生成失败");
}
result.setRecordId(dbTestPaperRecord.getId());
// 查询试卷试题
List<TestQuestionsVo> testPaperQuestion = bankTestPaperService.getTestPaperQuestion(paperId);
result.setQuestions(testPaperQuestion);
return result;
}
}
school-paper/src/main/resources/mapper/school-paper/DbQuestionBankTestPaperMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.school.paper.mapper.DbQuestionBankTestPaperMapper"> <mapper namespace="com.ruoyi.school.paper.mapper.DbQuestionBankTestPaperMapper">
<resultMap type="com.ruoyi.school.paper.domain.DbQuestionBankTestPaper" id="DbQuestionBankTestPaperResult"> <resultMap type="com.ruoyi.school.paper.domain.DbQuestionBankTestPaper" id="DbQuestionBankTestPaperResult">
...@@ -25,5 +25,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -25,5 +25,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
</resultMap> </resultMap>
<resultMap id="TestPaper" type="com.ruoyi.school.paper.domain.vo.TestQuestionsVo">
<result property="questionsCategory" column="category"/>
<collection property="item" ofType="com.ruoyi.school.paper.domain.vo.TestQuestionItemVo">
<id property="id" column="id"/>
<result property="topic" column="topic"/>
<collection property="options" ofType="com.ruoyi.school.paper.domain.vo.OptionsVo">
<result property="tag" column="option_tag"/>
<result property="content" column="option_content"/>
</collection>
</collection>
</resultMap>
<select id="selectTestPaperQuestion" resultMap="TestPaper">
select test_repository.id,
case test_repository.species
when 1 then '填空题'
when 2 then '选择题'
when 3 then '解答题'
else '未知'
end as category,
test_repository.topic,
optons.option_tag,
optons.option_content
from db_question_bank_test_paper as test_repository
left join db_question_bank_answer_test_paper as optons on optons.question_bank_id = test_repository.id
where test_repository.test_paper_id = #{paperId}
</select>
</mapper> </mapper>
school-paper/src/main/resources/mapper/school-paper/DbDictMapper.xml → school-paper/src/main/resources/mapper/school-paper/DbQuestionTypeMapper.xml
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.school.paper.mapper.DbDictMapper"> <mapper namespace="com.ruoyi.school.paper.mapper.DbQuestionTypeMapper">
<resultMap type="com.ruoyi.school.paper.domain.DbDict" id="DbDictResult"> <resultMap type="com.ruoyi.school.paper.domain.DbQuestionType" id="DbQuestionTypeResult">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="parentId" column="parent_id"/> <result property="parentId" column="parent_id"/>
<result property="type" column="type"/>
<result property="typeValue" column="type_value"/> <result property="typeValue" column="type_value"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<result property="typeStatus" column="type_status"/> <result property="typeStatus" column="type_status"/>
......
school-paper/src/main/resources/mapper/school-paper/DbTestPaperMapper.xml
...@@ -20,4 +20,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -20,4 +20,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment