Skip to content

S
school-paper-admin
Commit 1f0026b8 by 郑云飞
Options

Merge branch 'master' of http://git.nyinhong.com/school-paper/school-paper-admin 

# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
parents 339b155c 17c16e13
Showing with 1319 additions and 358 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
......@@ -79,6 +79,7 @@ public class CaptchaController {
* 生成验证码
*/
@GetMapping("/captchaImage")
@SaIgnore
public R<Map<String, Object>> getCode() {
Map<String, Object> ajax = new HashMap<>();
boolean captchaEnabled = configService.selectCaptchaEnabled();
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
......@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.SmsLoginBody;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysUserService;
......@@ -40,7 +41,7 @@ public class SysLoginController {
private final ISysUserService userService;
/**
* 登录方法
* PC 后台 登录方法
*
* @param loginBody 登录信息
* @return 结果
......@@ -49,6 +50,32 @@ public class SysLoginController {
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
SysUser sysUser = userService.selectUserByUserName(loginBody.getUsername());
if(null!=sysUser && sysUser.getSex().equals("0")){
throw new SecurityException("请填写正确老师账号");
}
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
ajax.put(Constants.TOKEN, token);
return R.ok(ajax);
}
/**
* 小程序 登录方法
*
* @param loginBody 登录信息
* @return 结果
*/
@SaIgnore
@PostMapping("/appLogin")
public R<Map<String, Object>> appLogin(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
SysUser sysUser = userService.selectUserByUserName(loginBody.getUsername());
if(null!=sysUser && sysUser.getSex().equals("1")){
throw new SecurityException("请填写学生正确学号");
}
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
......@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
......@@ -39,6 +40,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 用户信息
......@@ -62,7 +64,16 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:list")
@GetMapping("/list")
public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
return userService.selectPageUserList(user, pageQuery);
TableDataInfo<SysUser> sysUserTableDataInfo = userService.selectPageUserListNew(user, pageQuery);
List<SysUser> rows = sysUserTableDataInfo.getRows();
rows.forEach(si->{
if(StringUtils.isNotEmpty(si.getDeptList())){
List<String> colList = CollUtil.newArrayList(si.getDeptList().split(","));
List<String> lis = deptService.selectDeptListByList(colList.stream().mapToLong(t -> Long.parseLong(t.trim())).boxed().collect(Collectors.toList())).stream().map(SysDept::getDeptName).collect(Collectors.toList());
si.setDeptListStr(CollUtil.join(lis, ","));
}
});
return sysUserTableDataInfo;
}
/**
......
ruoyi-admin/src/main/resources/application.yml
......@@ -27,7 +27,7 @@ captcha:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 9090
port: 8111
servlet:
# 应用的访问路径
context-path: /
......@@ -216,6 +216,8 @@ springdoc:
packages-to-scan: com.ruoyi.web
- group: 3.代码生成模块
packages-to-scan: com.ruoyi.generator
- group: 4.小程序模块
packages-to-scan: com.ruoyi.school
# 防止XSS攻击
xss:
......
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
......@@ -148,6 +148,16 @@ public class SysUser extends BaseEntity {
*/
@TableField(exist = false)
private Long roleId;
/**
* 班级名称
*/
private String deptList;
/**
* 班级名称
*/
@TableField(exist = false)
private String deptListStr;
public SysUser(Long userId) {
this.userId = userId;
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
......@@ -27,6 +27,13 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDeptMapper, SysDept, Sy
@DataColumn(key = "deptName", value = "dept_id")
})
List<SysDept> selectDeptList(@Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper);
/**
* 查询部门管理数据
*
* @param deptList 查询条件
* @return 部门信息集合
*/
List<SysDept> selectDeptListNew(@Param("deptList") List<Long> deptList);
/**
* 根据角色ID查询部门树信息
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
......@@ -24,6 +24,13 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
})
Page<SysUser> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
@DataPermission({
@DataColumn(key = "deptName", value = "d.dept_id"),
@DataColumn(key = "userName", value = "u.user_id")
})
Page<SysUser> selectPageUserListNew(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
/**
* 根据条件分页查询用户列表
*
......
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
......@@ -19,6 +19,15 @@ public interface ISysDeptService {
*/
List<SysDept> selectDeptList(SysDept dept);
/**
* 根据ID批量查询数据
*
* @param deptList 部门信息
* @return 部门信息集合
*/
List<SysDept> selectDeptListByList(List<Long> deptList);
/**
* 查询部门树结构信息
*
......
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
......@@ -15,7 +15,7 @@ public interface ISysUserService {
TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery);
TableDataInfo<SysUser> selectPageUserListNew(SysUser user, PageQuery pageQuery);
/**
* 根据条件分页查询用户列表
*
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
......@@ -58,6 +58,11 @@ public class SysDeptServiceImpl implements ISysDeptService {
return baseMapper.selectDeptList(lqw);
}
@Override
public List<SysDept> selectDeptListByList(List<Long> deptList) {
return baseMapper.selectDeptListNew(deptList);
}
/**
* 查询部门树结构信息
*
......@@ -197,10 +202,12 @@ public class SysDeptServiceImpl implements ISysDeptService {
public int insertDept(SysDept dept) {
SysDept info = baseMapper.selectById(dept.getParentId());
// 如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
if (null!=info && !UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
throw new ServiceException("部门停用，不允许新增");
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
if(null!=info){
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
}
return baseMapper.insert(dept);
}
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
......@@ -58,6 +58,12 @@ public class SysUserServiceImpl implements ISysUserService {
return TableDataInfo.build(page);
}
@Override
public TableDataInfo<SysUser> selectPageUserListNew(SysUser user, PageQuery pageQuery) {
Page<SysUser> page = baseMapper.selectPageUserListNew(pageQuery.build(), this.buildQueryWrapper(user));
return TableDataInfo.build(page);
}
/**
* 根据条件分页查询用户列表
*
......
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
......@@ -26,6 +26,31 @@
select * from sys_dept ${ew.getCustomSqlSegment}
</select>
<select id="selectDeptListNew" resultMap="SysDeptResult">
SELECT
st.dept_id,
st.parent_id,
st.ancestors,
st.order_num,
st.leader,
st.phone,
st.email,
st.status,
st.del_flag,
st.create_by,
st.update_by,
st.update_time,
CONCAT(IFNULL(sd.dept_name,'-'),'#',IFNULL(st.dept_name,'-')) AS dept_name
FROM
sys_dept st
LEFT JOIN sys_dept sd ON st.parent_id = sd.dept_id
where st.del_flag='0'
AND st.dept_id in
<foreach collection="deptList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
<select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id
from sys_dept d
......
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="userName" column="user_name"/>
......@@ -24,11 +24,37 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult12">
<id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="userName" column="user_name"/>
<result property="nickName" column="nick_name"/>
<result property="userType" column="user_type"/>
<result property="email" column="email"/>
<result property="phonenumber" column="phonenumber"/>
<result property="sex" column="sex"/>
<result property="avatar" column="avatar"/>
<result property="password" column="password"/>
<result property="status" column="status"/>
<result property="delFlag" column="del_flag"/>
<result property="loginIp" column="login_ip"/>
<result property="loginDate" column="login_date"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="deptList" column="dept_list"/>
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
<resultMap id="deptResult" type="SysDept">
<resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
<id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id"/>
<result property="deptName" column="dept_name"/>
......@@ -38,7 +64,7 @@
<result property="status" column="dept_status"/>
</resultMap>
<resultMap id="RoleResult" type="SysRole">
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
<id property="roleId" column="role_id"/>
<result property="roleName" column="role_name"/>
<result property="roleKey" column="role_key"/>
......@@ -92,6 +118,14 @@
${ew.getCustomSqlSegment}
</select>
<select id="selectPageUserListNew" resultMap="SysUserResult12">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.dept_list from
sys_user u
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbCollectListController.java
......@@ -4,9 +4,13 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
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;
......@@ -35,23 +39,22 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/collectList")
@SaIgnore
public class DbCollectListController extends BaseController {
private final IDbCollectListService iDbCollectListService;
/**
* 查询收藏列表
* 查询我的收藏列表
*/
@SaCheckPermission("school-paper:collectList:list")
@GetMapping("/list")
public TableDataInfo<DbCollectListVo> list(DbCollectListBo bo, PageQuery pageQuery) {
return iDbCollectListService.queryPageList(bo, pageQuery);
public TableDataInfo<MyCollectListVo> list(@RequestParam("categoryId") Integer categoryId, PageQuery pageQuery) {
return iDbCollectListService.queryPageList(categoryId, getUserId(), pageQuery);
}
/**
* 导出收藏列表
*/
@SaCheckPermission("school-paper:collectList:export")
@Log(title = "收藏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbCollectListBo bo, HttpServletResponse response) {
......@@ -64,17 +67,18 @@ public class DbCollectListController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:collectList:query")
@GetMapping("/{id}")
public R<DbCollectListVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@PathVariable Long id) {
return R.ok(iDbCollectListService.queryById(id));
}
/**
* 新增收藏
* 【小程序】新增收藏
*
* @param bo 参数
* @return
*/
@SaCheckPermission("school-paper:collectList:add")
@Log(title = "收藏", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +89,6 @@ public class DbCollectListController extends BaseController {
/**
* 修改收藏
*/
@SaCheckPermission("school-paper:collectList:edit")
@Log(title = "收藏", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +101,6 @@ public class DbCollectListController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:collectList:remove")
@Log(title = "收藏", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbErrorListController.java
......@@ -4,9 +4,16 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
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;
......@@ -35,23 +42,31 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/errorList")
@SaIgnore
public class DbErrorListController extends BaseController {
private final IDbErrorListService iDbErrorListService;
/**
* 查询错题集列表
* 【后台】查询错题集列表
*/
@SaCheckPermission("school-paper:errorList:list")
@GetMapping("/list")
public TableDataInfo<DbErrorListVo> list(DbErrorListBo bo, PageQuery pageQuery) {
return iDbErrorListService.queryPageList(bo, pageQuery);
public TableDataInfo<ErrorTopicListVo> findErrorTopicPage(ErrorTopicRequest request, PageQuery pageQuery) {
return iDbErrorListService.findErrorTopicPage(pageQuery, request);
}
/**
* 【小程序】我的错题集列表
*/
@GetMapping("/MyErrorTopicList")
public TableDataInfo<MyErrorTopicListVo> findMyErrorTopicListVoPage(ErrorTopicRequest request, PageQuery pageQuery) {
request.setUserId(1L);
return iDbErrorListService.findMyErrorTopicListVoPage(pageQuery, request);
}
/**
* 导出错题集列表
*/
@SaCheckPermission("school-paper:errorList:export")
@Log(title = "错题集", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbErrorListBo bo, HttpServletResponse response) {
......@@ -64,17 +79,15 @@ public class DbErrorListController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:errorList:query")
@GetMapping("/{id}")
public R<DbErrorListVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
public R<ErrorTopicListDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iDbErrorListService.queryById(id));
}
/**
* 新增错题集
*/
@SaCheckPermission("school-paper:errorList:add")
@Log(title = "错题集", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +98,6 @@ public class DbErrorListController extends BaseController {
/**
* 修改错题集
*/
@SaCheckPermission("school-paper:errorList:edit")
@Log(title = "错题集", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +110,6 @@ public class DbErrorListController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:errorList:remove")
@Log(title = "错题集", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbProfileController.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
......@@ -35,6 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/profile")
@SaIgnore
public class DbProfileController extends BaseController {
private final IDbProfileService iDbProfileService;
......@@ -42,7 +44,6 @@ public class DbProfileController extends BaseController {
/**
* 查询资料列表
*/
@SaCheckPermission("school-paper:profile:list")
@GetMapping("/list")
public TableDataInfo<DbProfileVo> list(DbProfileBo bo, PageQuery pageQuery) {
return iDbProfileService.queryPageList(bo, pageQuery);
......@@ -51,7 +52,6 @@ public class DbProfileController extends BaseController {
/**
* 导出资料列表
*/
@SaCheckPermission("school-paper:profile:export")
@Log(title = "资料", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbProfileBo bo, HttpServletResponse response) {
......@@ -64,7 +64,6 @@ public class DbProfileController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:profile:query")
@GetMapping("/{id}")
public R<DbProfileVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
......@@ -74,7 +73,6 @@ public class DbProfileController extends BaseController {
/**
* 新增资料
*/
@SaCheckPermission("school-paper:profile:add")
@Log(title = "资料", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +83,6 @@ public class DbProfileController extends BaseController {
/**
* 修改资料
*/
@SaCheckPermission("school-paper:profile:edit")
@Log(title = "资料", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +95,6 @@ public class DbProfileController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:profile:remove")
@Log(title = "资料", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankAnswerController.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
......@@ -35,6 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/questionBankAnswer")
@SaIgnore
public class DbQuestionBankAnswerController extends BaseController {
private final IDbQuestionBankAnswerService iDbQuestionBankAnswerService;
......@@ -42,7 +44,6 @@ public class DbQuestionBankAnswerController extends BaseController {
/**
* 查询题目答案列表
*/
@SaCheckPermission("school-paper:questionBankAnswer:list")
@GetMapping("/list")
public TableDataInfo<DbQuestionBankAnswerVo> list(DbQuestionBankAnswerBo bo, PageQuery pageQuery) {
return iDbQuestionBankAnswerService.queryPageList(bo, pageQuery);
......@@ -51,7 +52,6 @@ public class DbQuestionBankAnswerController extends BaseController {
/**
* 导出题目答案列表
*/
@SaCheckPermission("school-paper:questionBankAnswer:export")
@Log(title = "题目答案", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbQuestionBankAnswerBo bo, HttpServletResponse response) {
......@@ -64,7 +64,6 @@ public class DbQuestionBankAnswerController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:questionBankAnswer:query")
@GetMapping("/{id}")
public R<DbQuestionBankAnswerVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
......@@ -74,7 +73,6 @@ public class DbQuestionBankAnswerController extends BaseController {
/**
* 新增题目答案
*/
@SaCheckPermission("school-paper:questionBankAnswer:add")
@Log(title = "题目答案", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +83,6 @@ public class DbQuestionBankAnswerController extends BaseController {
/**
* 修改题目答案
*/
@SaCheckPermission("school-paper:questionBankAnswer:edit")
@Log(title = "题目答案", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +95,6 @@ public class DbQuestionBankAnswerController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:questionBankAnswer:remove")
@Log(title = "题目答案", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankAnswerTestPaperController.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
......@@ -35,6 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/questionBankAnswerTestPaper")
@SaIgnore
public class DbQuestionBankAnswerTestPaperController extends BaseController {
private final IDbQuestionBankAnswerTestPaperService iDbQuestionBankAnswerTestPaperService;
......@@ -42,7 +44,6 @@ public class DbQuestionBankAnswerTestPaperController extends BaseController {
/**
* 查询试卷题目答案列表
*/
@SaCheckPermission("school-paper:questionBankAnswerTestPaper:list")
@GetMapping("/list")
public TableDataInfo<DbQuestionBankAnswerTestPaperVo> list(DbQuestionBankAnswerTestPaperBo bo, PageQuery pageQuery) {
return iDbQuestionBankAnswerTestPaperService.queryPageList(bo, pageQuery);
......@@ -51,7 +52,6 @@ public class DbQuestionBankAnswerTestPaperController extends BaseController {
/**
* 导出试卷题目答案列表
*/
@SaCheckPermission("school-paper:questionBankAnswerTestPaper:export")
@Log(title = "试卷题目答案", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbQuestionBankAnswerTestPaperBo bo, HttpServletResponse response) {
......@@ -64,7 +64,6 @@ public class DbQuestionBankAnswerTestPaperController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:questionBankAnswerTestPaper:query")
@GetMapping("/{id}")
public R<DbQuestionBankAnswerTestPaperVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
......@@ -74,7 +73,6 @@ public class DbQuestionBankAnswerTestPaperController extends BaseController {
/**
* 新增试卷题目答案
*/
@SaCheckPermission("school-paper:questionBankAnswerTestPaper:add")
@Log(title = "试卷题目答案", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +83,6 @@ public class DbQuestionBankAnswerTestPaperController extends BaseController {
/**
* 修改试卷题目答案
*/
@SaCheckPermission("school-paper:questionBankAnswerTestPaper:edit")
@Log(title = "试卷题目答案", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +95,6 @@ public class DbQuestionBankAnswerTestPaperController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:questionBankAnswerTestPaper:remove")
@Log(title = "试卷题目答案", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankController.java
package com.ruoyi.school.paper.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
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 cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
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.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
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.QuestionBankAndAnswerBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
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;
/**
* 题库主
......@@ -34,6 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@SaIgnore
@RequestMapping("/school-paper/questionBank")
public class DbQuestionBankController extends BaseController {
......@@ -42,16 +43,15 @@ public class DbQuestionBankController extends BaseController {
/**
* 查询题库主列表
*/
@SaCheckPermission("school-paper:questionBank:list")
@GetMapping("/list")
public TableDataInfo<DbQuestionBankVo> list(DbQuestionBankBo bo, PageQuery pageQuery) {
return iDbQuestionBankService.queryPageList(bo, pageQuery);
}
/**
* 导出题库主列表
*/
@SaCheckPermission("school-paper:questionBank:export")
@Log(title = "题库主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbQuestionBankBo bo, HttpServletResponse response) {
......@@ -64,17 +64,14 @@ public class DbQuestionBankController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:questionBank:query")
@GetMapping("/{id}")
public R<DbQuestionBankVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
public R<DbQuestionBankVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
return R.ok(iDbQuestionBankService.queryById(id));
}
/**
* 新增题库主
*/
@SaCheckPermission("school-paper:questionBank:add")
@Log(title = "题库主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -83,9 +80,21 @@ 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));
}
/**
* 修改题库主
*/
@SaCheckPermission("school-paper:questionBank:edit")
@Log(title = "题库主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,11 +107,9 @@ public class DbQuestionBankController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:questionBank:remove")
@Log(title = "题库主", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
return toAjax(iDbQuestionBankService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankTestPaperController.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
......@@ -35,6 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/questionBankTestPaper")
@SaIgnore
public class DbQuestionBankTestPaperController extends BaseController {
private final IDbQuestionBankTestPaperService iDbQuestionBankTestPaperService;
......@@ -42,7 +44,6 @@ public class DbQuestionBankTestPaperController extends BaseController {
/**
* 查询试卷题库主列表
*/
@SaCheckPermission("school-paper:questionBankTestPaper:list")
@GetMapping("/list")
public TableDataInfo<DbQuestionBankTestPaperVo> list(DbQuestionBankTestPaperBo bo, PageQuery pageQuery) {
return iDbQuestionBankTestPaperService.queryPageList(bo, pageQuery);
......@@ -51,7 +52,6 @@ public class DbQuestionBankTestPaperController extends BaseController {
/**
* 导出试卷题库主列表
*/
@SaCheckPermission("school-paper:questionBankTestPaper:export")
@Log(title = "试卷题库主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbQuestionBankTestPaperBo bo, HttpServletResponse response) {
......@@ -64,7 +64,6 @@ public class DbQuestionBankTestPaperController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:questionBankTestPaper:query")
@GetMapping("/{id}")
public R<DbQuestionBankTestPaperVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
......@@ -74,7 +73,6 @@ public class DbQuestionBankTestPaperController extends BaseController {
/**
* 新增试卷题库主
*/
@SaCheckPermission("school-paper:questionBankTestPaper:add")
@Log(title = "试卷题库主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +83,6 @@ public class DbQuestionBankTestPaperController extends BaseController {
/**
* 修改试卷题库主
*/
@SaCheckPermission("school-paper:questionBankTestPaper:edit")
@Log(title = "试卷题库主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +95,6 @@ public class DbQuestionBankTestPaperController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:questionBankTestPaper:remove")
@Log(title = "试卷题库主", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
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;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
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 cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
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.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.school.paper.domain.vo.DbDictVo;
import com.ruoyi.school.paper.domain.bo.DbDictBo;
import com.ruoyi.school.paper.service.IDbDictService;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.school.paper.domain.bo.DbQuestionTypeBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.school.paper.service.IDbQuestionTypeService;
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
* @date 2023-07-20
......@@ -34,75 +33,70 @@ import com.ruoyi.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/dict")
public class DbDictController extends BaseController {
@RequestMapping("/school-paper/question-type")
@SaIgnore
public class DbQuestionTypeController extends BaseController {
private final IDbDictService iDbDictService;
private final IDbQuestionTypeService iDbQuestionTypeService;
/**
* 查询字典列表
* 查询题型列表
*/
@SaCheckPermission("school-paper:dict:list")
@GetMapping("/list")
public TableDataInfo<DbDictVo> list(DbDictBo bo, PageQuery pageQuery) {
return iDbDictService.queryPageList(bo, pageQuery);
public TableDataInfo<DbQuestionTypeVo> list(DbQuestionTypeBo bo, PageQuery pageQuery) {
return iDbQuestionTypeService.queryPageList(bo, pageQuery);
}
/**
* 导出字典列表
* 导出题型列表
*/
@SaCheckPermission("school-paper:dict:export")
@Log(title = "字典", businessType = BusinessType.EXPORT)
@Log(title = "题型", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbDictBo bo, HttpServletResponse response) {
List<DbDictVo> list = iDbDictService.queryList(bo);
ExcelUtil.exportExcel(list, "字典", DbDictVo.class, response);
public void export(DbQuestionTypeBo bo, HttpServletResponse response) {
List<DbQuestionTypeVo> list = iDbQuestionTypeService.queryList(bo);
ExcelUtil.exportExcel(list, "题型", DbQuestionTypeVo.class, response);
}
/**
* 获取字典详细信息
* 获取题型详细信息
*
* @param id 主键
*/
@SaCheckPermission("school-paper:dict:query")
@GetMapping("/{id}")
public R<DbDictVo> getInfo(@NotNull(message = "主键不能为空")
public R<DbQuestionTypeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iDbDictService.queryById(id));
return R.ok(iDbQuestionTypeService.queryById(id));
}
/**
* 新增字典
* 题型字典
*/
@SaCheckPermission("school-paper:dict:add")
@Log(title = "字典", businessType = BusinessType.INSERT)
@Log(title = "题型", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbDictBo bo) {
return toAjax(iDbDictService.insertByBo(bo));
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbQuestionTypeBo bo) {
return toAjax(iDbQuestionTypeService.insertByBo(bo));
}
/**
* 修改字典
*/
@SaCheckPermission("school-paper:dict:edit")
@Log(title = "字典", businessType = BusinessType.UPDATE)
@Log(title = "题型", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbDictBo bo) {
return toAjax(iDbDictService.updateByBo(bo));
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbQuestionTypeBo bo) {
return toAjax(iDbQuestionTypeService.updateByBo(bo));
}
/**
* 删除字典
* 删除题型
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:dict:remove")
@Log(title = "字典", businessType = BusinessType.DELETE)
@Log(title = "题型", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@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/DbTestPaperController.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
......@@ -35,6 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/testPaper")
@SaIgnore
public class DbTestPaperController extends BaseController {
private final IDbTestPaperService iDbTestPaperService;
......@@ -42,7 +44,6 @@ public class DbTestPaperController extends BaseController {
/**
* 查询试卷列表
*/
@SaCheckPermission("school-paper:testPaper:list")
@GetMapping("/list")
public TableDataInfo<DbTestPaperVo> list(DbTestPaperBo bo, PageQuery pageQuery) {
return iDbTestPaperService.queryPageList(bo, pageQuery);
......@@ -51,7 +52,6 @@ public class DbTestPaperController extends BaseController {
/**
* 导出试卷列表
*/
@SaCheckPermission("school-paper:testPaper:export")
@Log(title = "试卷", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbTestPaperBo bo, HttpServletResponse response) {
......@@ -64,7 +64,6 @@ public class DbTestPaperController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:testPaper:query")
@GetMapping("/{id}")
public R<DbTestPaperVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
......@@ -74,7 +73,6 @@ public class DbTestPaperController extends BaseController {
/**
* 新增试卷
*/
@SaCheckPermission("school-paper:testPaper:add")
@Log(title = "试卷", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +83,6 @@ public class DbTestPaperController extends BaseController {
/**
* 修改试卷
*/
@SaCheckPermission("school-paper:testPaper:edit")
@Log(title = "试卷", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +95,6 @@ public class DbTestPaperController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:testPaper:remove")
@Log(title = "试卷", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperRecordController.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
......@@ -35,6 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/testPaperRecord")
@SaIgnore
public class DbTestPaperRecordController extends BaseController {
private final IDbTestPaperRecordService iDbTestPaperRecordService;
......@@ -42,7 +44,6 @@ public class DbTestPaperRecordController extends BaseController {
/**
* 查询答题记录列表
*/
@SaCheckPermission("school-paper:testPaperRecord:list")
@GetMapping("/list")
public TableDataInfo<DbTestPaperRecordVo> list(DbTestPaperRecordBo bo, PageQuery pageQuery) {
return iDbTestPaperRecordService.queryPageList(bo, pageQuery);
......@@ -51,7 +52,6 @@ public class DbTestPaperRecordController extends BaseController {
/**
* 导出答题记录列表
*/
@SaCheckPermission("school-paper:testPaperRecord:export")
@Log(title = "答题记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbTestPaperRecordBo bo, HttpServletResponse response) {
......@@ -64,7 +64,6 @@ public class DbTestPaperRecordController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:testPaperRecord:query")
@GetMapping("/{id}")
public R<DbTestPaperRecordVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
......@@ -74,7 +73,6 @@ public class DbTestPaperRecordController extends BaseController {
/**
* 新增答题记录
*/
@SaCheckPermission("school-paper:testPaperRecord:add")
@Log(title = "答题记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +83,6 @@ public class DbTestPaperRecordController extends BaseController {
/**
* 修改答题记录
*/
@SaCheckPermission("school-paper:testPaperRecord:edit")
@Log(title = "答题记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +95,6 @@ public class DbTestPaperRecordController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:testPaperRecord:remove")
@Log(title = "答题记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperRecordDetailController.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
......@@ -35,6 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/testPaperRecordDetail")
@SaIgnore
public class DbTestPaperRecordDetailController extends BaseController {
private final IDbTestPaperRecordDetailService iDbTestPaperRecordDetailService;
......@@ -42,7 +44,6 @@ public class DbTestPaperRecordDetailController extends BaseController {
/**
* 查询答题记录详情列表
*/
@SaCheckPermission("school-paper:testPaperRecordDetail:list")
@GetMapping("/list")
public TableDataInfo<DbTestPaperRecordDetailVo> list(DbTestPaperRecordDetailBo bo, PageQuery pageQuery) {
return iDbTestPaperRecordDetailService.queryPageList(bo, pageQuery);
......@@ -51,7 +52,6 @@ public class DbTestPaperRecordDetailController extends BaseController {
/**
* 导出答题记录详情列表
*/
@SaCheckPermission("school-paper:testPaperRecordDetail:export")
@Log(title = "答题记录详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(DbTestPaperRecordDetailBo bo, HttpServletResponse response) {
......@@ -64,7 +64,6 @@ public class DbTestPaperRecordDetailController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("school-paper:testPaperRecordDetail:query")
@GetMapping("/{id}")
public R<DbTestPaperRecordDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
......@@ -74,7 +73,6 @@ public class DbTestPaperRecordDetailController extends BaseController {
/**
* 新增答题记录详情
*/
@SaCheckPermission("school-paper:testPaperRecordDetail:add")
@Log(title = "答题记录详情", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
......@@ -85,7 +83,6 @@ public class DbTestPaperRecordDetailController extends BaseController {
/**
* 修改答题记录详情
*/
@SaCheckPermission("school-paper:testPaperRecordDetail:edit")
@Log(title = "答题记录详情", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
......@@ -98,7 +95,6 @@ public class DbTestPaperRecordDetailController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("school-paper:testPaperRecordDetail:remove")
@Log(title = "答题记录详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
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.bo.TestPaperAnswerBo;
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.*;
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));
}
@Log(title = "交卷", businessType = BusinessType.INSERT)
@PostMapping("/endTest/")
public R<Void> paperTestEnd(@RequestBody TestPaperAnswerBo bo) {
return toAjax(testPaperService.paperTestEnd(bo));
}
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbCollectList.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 收藏对象 db_collect_list
......@@ -25,7 +23,7 @@ public class DbCollectList extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 用户id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbErrorList.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 错题集对象 db_error_list
......@@ -25,7 +23,7 @@ public class DbErrorList extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 用户id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbProfile.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 资料对象 db_profile
......@@ -25,7 +23,7 @@ public class DbProfile extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 资料名称
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBank.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 题库主对象 db_question_bank
......@@ -20,12 +18,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
@TableName("db_question_bank")
public class DbQuestionBank extends BaseEntity {
private static final long serialVersionUID=1L;
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 类别id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBankAnswer.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 题目答案对象 db_question_bank_answer
......@@ -25,7 +23,7 @@ public class DbQuestionBankAnswer extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 题目id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBankAnswerTestPaper.java
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.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
......@@ -25,7 +23,7 @@ public class DbQuestionBankAnswerTestPaper extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 题目id
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbQuestionBankTestPaper.java
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.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
......@@ -25,7 +23,7 @@ public class DbQuestionBankTestPaper extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long 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;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 字典对象 db_dict
* 题目类型对象 db_question_type
*
* @author zyf
* @date 2023-07-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("db_dict")
public class DbDict extends BaseEntity {
@TableName("db_question_type")
public class DbQuestionType extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 父级id
*/
private Long parentId;
/**
* 类型：1 类别，2 阶段，3 班级
*/
private String type;
/**
* 名称
*/
private String typeValue;
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaper.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 试卷对象 db_test_paper
......@@ -25,7 +23,7 @@ public class DbTestPaper extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 试卷名称
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaperRecord.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 答题记录对象 db_test_paper_record
......@@ -20,12 +18,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
@TableName("db_test_paper_record")
public class DbTestPaperRecord extends BaseEntity {
private static final long serialVersionUID=1L;
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 用户id
......@@ -36,7 +34,12 @@ public class DbTestPaperRecord extends BaseEntity {
*/
private Long testPaperId;
/**
* 状态：0 批卷中，1 批卷完成
* 状态
* <ul>
* <ol>0:正在答题</ol>
* <ol>1:待批阅</ol>
* <ol>2:已批阅</ol>
* </ul>
*/
private Integer status;
/**
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaperRecordDetail.java
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.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 答题记录详情对象 db_test_paper_record_detail
......@@ -28,7 +26,7 @@ public class DbTestPaperRecordDetail extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 记录id
......@@ -43,6 +41,10 @@ public class DbTestPaperRecordDetail extends BaseEntity {
*/
private String answer;
/**
* 正确答案
*/
private String correctAnswer;
/**
* 得分
*/
private BigDecimal score;
......
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;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
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
* @date 2023-07-20
......@@ -19,7 +18,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
@Data
@EqualsAndHashCode(callSuper = true)
public class DbDictBo extends BaseEntity {
public class DbQuestionTypeBo extends BaseEntity {
/**
* 主键id
......@@ -34,12 +33,6 @@ public class DbDictBo extends BaseEntity {
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 })
......@@ -54,7 +47,6 @@ public class DbDictBo extends BaseEntity {
/**
* 状态：0正常，1删除
*/
@NotNull(message = "状态：0正常，1删除不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer typeStatus;
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbTestPaperRecordDetailBo.java
package com.ruoyi.school.paper.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
......@@ -27,55 +28,51 @@ public class DbTestPaperRecordDetailBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 记录id
*/
@NotNull(message = "记录id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long recordId;
/**
* 题目id
*/
@NotNull(message = "题目id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long questionBankId;
/**
* 答案
*/
@NotBlank(message = "答案不能为空", groups = { AddGroup.class, EditGroup.class })
private String answer;
/**
* 得分
*/
@NotNull(message = "得分不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal score;
/**
* 是否优秀答案：0是，1不是
*/
@NotNull(message = "是否优秀答案：0是，1不是不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer good;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
/**
* 正确答案
*/
private String correctAnswer;
/**
* 状态：0正常，1 删除
*/
@NotNull(message = "状态：0正常，1 删除不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer status;
/**
* 创建时间
*/
@NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date cerateTime;
......
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/bo/TestPaperAnswerBo.java 0 → 100644
package com.ruoyi.school.paper.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 试卷答题记录
* <p>created in 2023/7/21 18:59
*
* @author WangMin
* @version 1.0
*/
@Data
public class TestPaperAnswerBo {
/**
* 记录ID
*/
@NotNull(message = "记录id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long recordId;
/**
* 试卷考题答案
*/
private List<TestPaperAnswerItemBo> answers;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/TestPaperAnswerItemBo.java 0 → 100644
package com.ruoyi.school.paper.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* 答题卷结果单项
* <p>created in 2023/7/21 19:07
*
* @author WangMin
* @version 1.0
*/
@Data
public class TestPaperAnswerItemBo {
/**
* 问题ID
*/
@NotNull(message = "问题id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long id;
/**
* 学生答题内容
*/
private String answer;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/request/ErrorTopicRequest.java 0 → 100644
package com.ruoyi.school.paper.domain.request;
import lombok.Data;
import java.io.Serializable;
/**
* 错题集查询条件
*/
@Data
public class ErrorTopicRequest implements Serializable {
/**
* 类别ID
*/
private Integer categoryId;
/**
* 习题种类：1填空，2选择，3解答
*/
private Integer species;
/**
* 类型：1典例精讲
*/
private Integer type;
/**
* 强度：1基础，2中等，3提高
*/
private Integer intensity;
/**
* 用户编号
*/
private Long userId;
}
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;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
......@@ -17,7 +13,7 @@ import java.util.Date;
*/
@Data
@ExcelIgnoreUnannotated
public class DbDictVo {
public class DbQuestionTypeVo {
private static final long serialVersionUID = 1L;
......@@ -33,11 +29,6 @@ public class DbDictVo {
@ExcelProperty(value = "父级id")
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/DbTestPaperRecordDetailVo.java
......@@ -49,6 +49,12 @@ public class DbTestPaperRecordDetailVo {
private String answer;
/**
* 正确答案
*/
@ExcelProperty(value = "正确答案")
private String correctAnswer;
/**
* 得分
*/
@ExcelProperty(value = "得分")
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/ErrorTopicListDetailVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 错题详情
*/
@Data
public class ErrorTopicListDetailVo implements Serializable {
/**
* 类别名称
*/
private String typeName;
/**
* 强度分类
*/
private String intensity;
/**
* 习题种类
*/
private String species;
/**
* 题目
*/
private String topic;
/**
* 正确答案
*/
private String rightAnswers;
/**
* 选项标签
*/
private String optionTag;
/**
* 选项内容
*/
private String optionContent;
/**
* 选项标签集合
*/
private List<OptionVo> options;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/ErrorTopicListVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import lombok.Data;
import java.io.Serializable;
/**
* 错题集视图
*/
@Data
public class ErrorTopicListVo implements Serializable {
/**
* 错题ID
*/
private Long id;
/**
* 题目编号
*/
private Long questionBankId;
/**
* 题目名称
*/
private String topic;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/MyCollectListVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 我的收藏视图
*/
@Data
public class MyCollectListVo implements Serializable {
/**
* 题目编号
*/
private Long questionBankId;
/**
* 题目
*/
private String topic;
/**
* 正确答案
*/
private String rightAnswers;
/**
* 正确答案图片
*/
private String rightAnswersPic;
/**
* 选项
*/
private List<DbQuestionBankAnswerVo> list;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/MyErrorTopicListVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import com.ruoyi.school.paper.domain.DbQuestionBankAnswerTestPaper;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 我的错题视图
*/
@Data
public class MyErrorTopicListVo implements Serializable {
/**
* 错题编号
*/
private Long id;
/**
* 错题名称
*/
private String topic;
/**
* 我的答案
*/
private String answer;
/**
* 正确答案
*/
private String correctAnswer;
/**
* 题目编号
*/
private Long questionBankId;
/**
* 选项标签集合
*/
private List<DbQuestionBankAnswerTestPaper> options;
}
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/OptionVo.java 0 → 100644
package com.ruoyi.school.paper.domain.vo;
import lombok.Data;
import java.io.Serializable;
@Data
public class OptionVo implements Serializable {
/**
* 标签key
*/
private String optionTag;
/**
* 标签value
*/
private String optionContent;
}
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/DbCollectListMapper.java
package com.ruoyi.school.paper.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.school.paper.domain.DbCollectList;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.DbCollectListVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
import org.apache.ibatis.annotations.Param;
/**
* 收藏Mapper接口
......@@ -11,5 +18,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @date 2023-07-20
*/
public interface DbCollectListMapper extends BaseMapperPlus<DbCollectListMapper, DbCollectList, DbCollectListVo> {
Page<MyCollectListVo> findMyECollectListVoPage(IPage<MyCollectListVo> iPage,@Param("userId") Long userId, @Param("categoryId") Integer categoryId);
}
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbErrorListMapper.java
package com.ruoyi.school.paper.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.DbErrorListVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
/**
* 错题集Mapper接口
......@@ -10,6 +23,11 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf
* @date 2023-07-20
*/
@Mapper
public interface DbErrorListMapper extends BaseMapperPlus<DbErrorListMapper, DbErrorList, DbErrorListVo> {
Page<ErrorTopicListVo> findErrorTopicPage(IPage<ErrorTopicListVo> iPage, @Param("request") ErrorTopicRequest request);
List<ErrorTopicListDetailVo> findErrorTopicListDetailById(@Param("id") Long id);
Page<MyErrorTopicListVo> findMyErrorTopicListVoPage(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;
import com.ruoyi.school.paper.domain.DbQuestionBankAnswer;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankAnswerVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/**
* 题目答案Mapper接口
......@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf
* @date 2023-07-20
*/
@Mapper
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;
import com.ruoyi.school.paper.domain.DbQuestionBank;
import com.ruoyi.school.paper.domain.vo.DbQuestionBankVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/**
* 题库主Mapper接口
......@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf
* @date 2023-07-20
*/
@Mapper
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;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.school.paper.domain.DbQuestionBankTestPaper;
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接口
......@@ -10,6 +15,15 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf
* @date 2023-07-20
*/
@Mapper
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;
import com.ruoyi.school.paper.domain.DbDict;
import com.ruoyi.school.paper.domain.vo.DbDictVo;
import com.ruoyi.school.paper.domain.DbQuestionType;
import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/**
* 字典Mapper接口
......@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf
* @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;
import com.ruoyi.school.paper.domain.DbTestPaper;
import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/**
* 试卷Mapper接口
......@@ -10,6 +11,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @author zyf
* @date 2023-07-20
*/
@Mapper
public interface DbTestPaperMapper extends BaseMapperPlus<DbTestPaperMapper, DbTestPaper, DbTestPaperVo> {
}
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbCollectListService.java
......@@ -5,6 +5,7 @@ import com.ruoyi.school.paper.domain.vo.DbCollectListVo;
import com.ruoyi.school.paper.domain.bo.DbCollectListBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
import java.util.Collection;
import java.util.List;
......@@ -25,7 +26,7 @@ public interface IDbCollectListService {
/**
* 查询收藏列表
*/
TableDataInfo<DbCollectListVo> queryPageList(DbCollectListBo bo, PageQuery pageQuery);
TableDataInfo<MyCollectListVo> queryPageList(Integer categoryId,Long userId, PageQuery pageQuery);
/**
* 查询收藏列表
......
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbErrorListService.java
package com.ruoyi.school.paper.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.school.paper.domain.DbErrorList;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.DbErrorListVo;
import com.ruoyi.school.paper.domain.bo.DbErrorListBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
import java.util.Collection;
import java.util.List;
......@@ -20,7 +25,7 @@ public interface IDbErrorListService {
/**
* 查询错题集
*/
DbErrorListVo queryById(Long id);
ErrorTopicListDetailVo queryById(Long id);
/**
* 查询错题集列表
......@@ -46,4 +51,20 @@ public interface IDbErrorListService {
* 校验并批量删除错题集信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 错题集列表
* @param request
* @return
*/
TableDataInfo<ErrorTopicListVo> findErrorTopicPage(PageQuery pageQuery,ErrorTopicRequest request);
/**
* 我的错题列表
* @param pageQuery
* @param request
* @return
*/
TableDataInfo<MyErrorTopicListVo> findMyErrorTopicListVoPage(PageQuery pageQuery, ErrorTopicRequest request);
}
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbQuestionBankService.java
package com.ruoyi.school.paper.service;
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.bo.DbQuestionBankBo;
import com.ruoyi.common.core.page.TableDataInfo;
......@@ -37,6 +38,12 @@ public interface IDbQuestionBankService {
*/
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;
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.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.List;
......@@ -46,4 +46,12 @@ public interface IDbQuestionBankTestPaperService {
* 校验并批量删除试卷题库主信息
*/
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;
import com.ruoyi.school.paper.domain.DbDict;
import com.ruoyi.school.paper.domain.vo.DbDictVo;
import com.ruoyi.school.paper.domain.bo.DbDictBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.school.paper.domain.bo.DbQuestionTypeBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
......@@ -15,32 +14,32 @@ import java.util.List;
* @author zyf
* @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/IDbTestPaperRecordDetailService.java
......@@ -46,4 +46,6 @@ public interface IDbTestPaperRecordDetailService {
* 校验并批量删除答题记录详情信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
boolean saveBatch(Collection<DbTestPaperRecordDetail> collection);
}
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.bo.TestPaperAnswerBo;
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);
/**
* 交卷
*
* @param bo 试题类容
* @return 操作结果
*/
boolean paperTestEnd(TestPaperAnswerBo bo);
}
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbCollectListServiceImpl.java
package com.ruoyi.school.paper.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.toolkit.Wrappers;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbCollectListBo;
......@@ -35,7 +35,7 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
* 查询收藏
*/
@Override
public DbCollectListVo queryById(Long id){
public DbCollectListVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
......@@ -43,9 +43,8 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
* 查询收藏列表
*/
@Override
public TableDataInfo<DbCollectListVo> queryPageList(DbCollectListBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DbCollectList> lqw = buildQueryWrapper(bo);
Page<DbCollectListVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
public TableDataInfo<MyCollectListVo> queryPageList(Integer categoryId, Long userId, PageQuery pageQuery) {
Page<MyCollectListVo> result = baseMapper.findMyECollectListVoPage(pageQuery.build(), userId, categoryId);
return TableDataInfo.build(result);
}
......@@ -94,7 +93,7 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbCollectList entity){
private void validEntityBeforeSave(DbCollectList entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -103,7 +102,7 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
......
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbErrorListServiceImpl.java
package com.ruoyi.school.paper.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ruoyi.common.utils.StringUtils;
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.toolkit.Wrappers;
import com.ruoyi.school.paper.domain.DbQuestionBankAnswerTestPaper;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.*;
import com.ruoyi.school.paper.mapper.DbQuestionBankAnswerTestPaperMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbErrorListBo;
import com.ruoyi.school.paper.domain.vo.DbErrorListVo;
import com.ruoyi.school.paper.domain.DbErrorList;
import com.ruoyi.school.paper.mapper.DbErrorListMapper;
import com.ruoyi.school.paper.service.IDbErrorListService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;
import java.util.stream.Collectors;
/**
* 错题集Service业务层处理
......@@ -31,12 +34,35 @@ public class DbErrorListServiceImpl implements IDbErrorListService {
private final DbErrorListMapper baseMapper;
private final DbQuestionBankAnswerTestPaperMapper dbQuestionBankAnswerTestPaperMapper;
/**
* 查询错题集
*/
@Override
public DbErrorListVo queryById(Long id){
return baseMapper.selectVoById(id);
public ErrorTopicListDetailVo queryById(Long id) {
List<ErrorTopicListDetailVo> errorTopicListDetailVoList = baseMapper.findErrorTopicListDetailById(id);
if (CollectionUtils.isNotEmpty(errorTopicListDetailVoList)) {
List<OptionVo> list = errorTopicListDetailVoList.stream()
.map(errorTopicListDetailVo -> {
OptionVo optionVo = new OptionVo();
optionVo.setOptionTag(errorTopicListDetailVo.getOptionTag());
optionVo.setOptionContent(errorTopicListDetailVo.getOptionContent());
return optionVo;
})
.collect(Collectors.toList());
ErrorTopicListDetailVo firstErrorTopicListDetailVo = errorTopicListDetailVoList.get(0);
ErrorTopicListDetailVo errorTopicListDetailVo = new ErrorTopicListDetailVo();
errorTopicListDetailVo.setTopic(firstErrorTopicListDetailVo.getTopic());
errorTopicListDetailVo.setIntensity(firstErrorTopicListDetailVo.getIntensity());
errorTopicListDetailVo.setSpecies(firstErrorTopicListDetailVo.getSpecies());
errorTopicListDetailVo.setTypeName(firstErrorTopicListDetailVo.getTypeName());
errorTopicListDetailVo.setRightAnswers(firstErrorTopicListDetailVo.getRightAnswers());
errorTopicListDetailVo.setOptions(list);
return errorTopicListDetailVo;
}
return null;
}
/**
......@@ -95,7 +121,7 @@ public class DbErrorListServiceImpl implements IDbErrorListService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbErrorList entity){
private void validEntityBeforeSave(DbErrorList entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -104,9 +130,32 @@ public class DbErrorListServiceImpl implements IDbErrorListService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public TableDataInfo<ErrorTopicListVo> findErrorTopicPage(PageQuery pageQuery, ErrorTopicRequest request) {
Page<ErrorTopicListVo> result = baseMapper.findErrorTopicPage(pageQuery.build(), request);
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<MyErrorTopicListVo> findMyErrorTopicListVoPage(PageQuery pageQuery, ErrorTopicRequest request) {
Page<MyErrorTopicListVo> myErrorTopicListVoPage = baseMapper.findMyErrorTopicListVoPage(pageQuery.build(), request);
List<MyErrorTopicListVo> records = myErrorTopicListVoPage.getRecords();
if (CollectionUtils.isNotEmpty(records)) {
records.forEach(myErrorTopicListVo -> {
//根据每到题目查询对应的选项
Optional.ofNullable(dbQuestionBankAnswerTestPaperMapper.selectList(Wrappers.<DbQuestionBankAnswerTestPaper>lambdaQuery().eq(DbQuestionBankAnswerTestPaper::getQuestionBankId, myErrorTopicListVo.getQuestionBankId())))
.ifPresent(dbQuestionBankAnswerTestPapers -> {
//拿到对应选项填充至每道错题当中
myErrorTopicListVo.setOptions(dbQuestionBankAnswerTestPapers);
});
});
}
return TableDataInfo.build(myErrorTopicListVoPage);
}
}
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbProfileServiceImpl.java
......@@ -62,8 +62,6 @@ public class DbProfileServiceImpl implements IDbProfileService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DbProfile> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getProfileName()), DbProfile::getProfileName, bo.getProfileName());
lqw.eq(StringUtils.isNotBlank(bo.getProfileUrl()), DbProfile::getProfileUrl, bo.getProfileUrl());
lqw.eq(bo.getStatus() != null, DbProfile::getStatus, bo.getStatus());
return lqw;
}
......
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbQuestionBankServiceImpl.java
package com.ruoyi.school.paper.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.QuestionBankAndAnswerBo;
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.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.Map;
import java.util.Collection;
/**
* 题库主Service业务层处理
......@@ -31,11 +36,13 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
private final DbQuestionBankMapper baseMapper;
private final DbQuestionBankAnswerMapper questionBankAnswerMapper;
/**
* 查询题库主
*/
@Override
public DbQuestionBankVo queryById(Long id){
public DbQuestionBankVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
......@@ -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
......@@ -102,7 +134,7 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbQuestionBank entity){
private void validEntityBeforeSave(DbQuestionBank entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -111,7 +143,7 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
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;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.school.paper.domain.vo.TestQuestionsVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbQuestionBankTestPaperBo;
......@@ -35,7 +36,7 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa
* 查询试卷题库主
*/
@Override
public DbQuestionBankTestPaperVo queryById(Long id){
public DbQuestionBankTestPaperVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
......@@ -103,7 +104,7 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbQuestionBankTestPaper entity){
private void validEntityBeforeSave(DbQuestionBankTestPaper entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -112,9 +113,14 @@ public class DbQuestionBankTestPaperServiceImpl implements IDbQuestionBankTestPa
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
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;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbDictBo;
import com.ruoyi.school.paper.domain.vo.DbDictVo;
import com.ruoyi.school.paper.domain.DbDict;
import com.ruoyi.school.paper.mapper.DbDictMapper;
import com.ruoyi.school.paper.service.IDbDictService;
import com.ruoyi.school.paper.domain.bo.DbQuestionTypeBo;
import com.ruoyi.school.paper.domain.vo.DbQuestionTypeVo;
import com.ruoyi.school.paper.domain.DbQuestionType;
import com.ruoyi.school.paper.mapper.DbQuestionTypeMapper;
import com.ruoyi.school.paper.service.IDbQuestionTypeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 字典Service业务层处理
* 题型Service业务层处理
*
* @author zyf
* @date 2023-07-20
*/
@RequiredArgsConstructor
@Service
public class DbDictServiceImpl implements IDbDictService {
public class DbQuestionTypeServiceImpl implements IDbQuestionTypeService {
private final DbDictMapper baseMapper;
private final DbQuestionTypeMapper baseMapper;
/**
* 查询字典
* 查询题型
*/
@Override
public DbDictVo queryById(Long id){
public DbQuestionTypeVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 查询字典列表
* 查询题型列表
*/
@Override
public TableDataInfo<DbDictVo> queryPageList(DbDictBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DbDict> lqw = buildQueryWrapper(bo);
Page<DbDictVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
public TableDataInfo<DbQuestionTypeVo> queryPageList(DbQuestionTypeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DbQuestionType> lqw = buildQueryWrapper(bo);
Page<DbQuestionTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询字典列表
* 查询题型列表
*/
@Override
public List<DbDictVo> queryList(DbDictBo bo) {
LambdaQueryWrapper<DbDict> lqw = buildQueryWrapper(bo);
public List<DbQuestionTypeVo> queryList(DbQuestionTypeBo bo) {
LambdaQueryWrapper<DbQuestionType> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<DbDict> buildQueryWrapper(DbDictBo bo) {
private LambdaQueryWrapper<DbQuestionType> buildQueryWrapper(DbQuestionTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DbDict> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getParentId() != null, DbDict::getParentId, bo.getParentId());
lqw.eq(StringUtils.isNotBlank(bo.getType()), DbDict::getType, bo.getType());
lqw.eq(StringUtils.isNotBlank(bo.getTypeValue()), DbDict::getTypeValue, bo.getTypeValue());
lqw.eq(bo.getTypeStatus() != null, DbDict::getTypeStatus, bo.getTypeStatus());
LambdaQueryWrapper<DbQuestionType> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getParentId() != null, DbQuestionType::getParentId, bo.getParentId());
lqw.eq(StringUtils.isNotBlank(bo.getTypeValue()), DbQuestionType::getTypeValue, bo.getTypeValue());
lqw.eq(bo.getTypeStatus() != null, DbQuestionType::getTypeStatus, bo.getTypeStatus());
return lqw;
}
/**
* 新增字典
* 新增题型
*/
@Override
public Boolean insertByBo(DbDictBo bo) {
DbDict add = BeanUtil.toBean(bo, DbDict.class);
public Boolean insertByBo(DbQuestionTypeBo bo) {
DbQuestionType add = BeanUtil.toBean(bo, DbQuestionType.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
......@@ -83,11 +82,11 @@ public class DbDictServiceImpl implements IDbDictService {
}
/**
* 修改字典
* 修改题型
*/
@Override
public Boolean updateByBo(DbDictBo bo) {
DbDict update = BeanUtil.toBean(bo, DbDict.class);
public Boolean updateByBo(DbQuestionTypeBo bo) {
DbQuestionType update = BeanUtil.toBean(bo, DbQuestionType.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
......@@ -95,12 +94,12 @@ public class DbDictServiceImpl implements IDbDictService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbDict entity){
private void validEntityBeforeSave(DbQuestionType entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除字典
* 批量删除题型
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
......
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperRecordDetailServiceImpl.java
......@@ -35,7 +35,7 @@ public class DbTestPaperRecordDetailServiceImpl implements IDbTestPaperRecordDet
* 查询答题记录详情
*/
@Override
public DbTestPaperRecordDetailVo queryById(Long id){
public DbTestPaperRecordDetailVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
......@@ -98,7 +98,7 @@ public class DbTestPaperRecordDetailServiceImpl implements IDbTestPaperRecordDet
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbTestPaperRecordDetail entity){
private void validEntityBeforeSave(DbTestPaperRecordDetail entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -107,9 +107,14 @@ public class DbTestPaperRecordDetailServiceImpl implements IDbTestPaperRecordDet
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public boolean saveBatch(Collection<DbTestPaperRecordDetail> collection) {
return baseMapper.insertBatch(collection);
}
}
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/TestPaperServiceImpl.java 0 → 100644
package com.ruoyi.school.paper.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.school.paper.domain.DbTestPaperRecordDetail;
import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
import com.ruoyi.school.paper.domain.bo.TestPaperAnswerBo;
import com.ruoyi.school.paper.domain.bo.TestPaperAnswerItemBo;
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.*;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
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;
private final IDbTestPaperRecordDetailService paperRecordDetailService;
@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;
}
@Override
public boolean paperTestEnd(TestPaperAnswerBo bo) {
List<TestPaperAnswerItemBo> answers = bo.getAnswers();
if (CollUtil.isEmpty(answers)) {
return true;
}
List<DbTestPaperRecordDetail> insertPaperRecords = new ArrayList<>(answers.size());
for (TestPaperAnswerItemBo answer : answers) {
DbTestPaperRecordDetail buffer = new DbTestPaperRecordDetail();
buffer.setRecordId(bo.getRecordId());
buffer.setQuestionBankId(answer.getId());
buffer.setAnswer(answer.getAnswer());
insertPaperRecords.add(buffer);
}
if (CollUtil.isNotEmpty(insertPaperRecords)) {
paperRecordDetailService.saveBatch(insertPaperRecords);
return true;
}
return false;
}
}
school-paper/src/main/resources/mapper/school-paper/DbCollectListMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.school.paper.mapper.DbCollectListMapper">
<resultMap type="com.ruoyi.school.paper.domain.DbCollectList" id="DbCollectListResult">
......@@ -15,6 +15,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
<select id="findMyECollectListVoPage" resultType="com.ruoyi.school.paper.domain.vo.MyCollectListVo">
SELECT
dcl.question_bank_id questionBankId,
dqb.topic AS topic,
dqb.right_answers AS rightAnswers,
dqb.right_answers_pic AS rightAnswersPic
FROM
db_collect_list AS dcl
LEFT JOIN db_question_bank AS dqb ON dcl.question_bank_id = dqb.id
LEFT JOIN db_question_bank_answer AS dqba ON dqba.question_bank_id = dqb.id
<where>
dcl.user_id = #{userId}
<if test="categoryId != null">
and dqb.category_id = #{categoryId}
</if>
</where>
</select>
</mapper>
school-paper/src/main/resources/mapper/school-paper/DbErrorListMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.school.paper.mapper.DbErrorListMapper">
<resultMap type="com.ruoyi.school.paper.domain.DbErrorList" id="DbErrorListResult">
......@@ -16,6 +16,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
<select id="findErrorTopicPage" resultType="com.ruoyi.school.paper.domain.vo.ErrorTopicListVo"
parameterType="com.ruoyi.school.paper.domain.request.ErrorTopicRequest">
SELECT
del.id AS id,
del.question_bank_id AS questionBankId,
dqbtp.topic as topic
FROM
db_error_list AS del
LEFT JOIN db_test_paper_record AS dtpr ON del.paper_id = dtpr.test_paper_id
LEFT JOIN db_test_paper_record_detail AS dtprd ON dtpr.id = dtprd.record_id
LEFT JOIN db_question_bank_test_paper AS dqbtp ON dqbtp.test_paper_id = del.paper_id
<where>
<if test="request.categoryId != null">
dqbtp.category_id = #{request.categoryId}
</if>
<if test="request.species != null">
and dqbtp.species = #{request.species}
</if>
<if test="request.type != null">
and dqbtp.type = #{request.type}
</if>
<if test="request.intensity != null">
and dqbtp.intensity = #{request.intensity}
</if>
</where>
</select>
<select id="findErrorTopicListDetailById" resultType="com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo"
parameterType="java.lang.Long">
SELECT dqt.type_value AS typeName,
dqbtp.intensity AS intensity,
dqbtp.species AS species,
dqbtp.topic AS topic,
dqbtp.right_answers AS rightAnswers,
dpbatp.option_tag AS optionTag,
dpbatp.option_content AS optionContent
FROM db_error_list AS del
LEFT JOIN db_test_paper_record AS dtpr ON del.paper_id = dtpr.test_paper_id
LEFT JOIN db_test_paper_record_detail AS dtprd ON dtpr.id = dtprd.record_id
LEFT JOIN db_question_bank_answer_test_paper AS dpbatp
ON dtprd.question_bank_id = dpbatp.question_bank_id
LEFT JOIN db_question_bank_test_paper AS dqbtp ON dqbtp.test_paper_id = del.paper_id
LEFT JOIN db_question_type AS dqt ON dqt.id = dqbtp.category_id
WHERE del.id = #{id}
</select>
<select id="findMyErrorTopicListVoPage" resultType="com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo">
SELECT
del.id AS id,
dtprd.question_bank_id AS questionBankId,
dqbtp.topic AS topic,
dtprd.answer AS answer,
dtprd.correct_answer AS correctAnswer
FROM
db_error_list AS del
LEFT JOIN db_test_paper_record AS dtpr ON del.paper_id = dtpr.test_paper_id
LEFT JOIN db_test_paper_record_detail AS dtprd ON del.question_bank_id = dtprd.question_bank_id
LEFT JOIN db_question_bank_test_paper AS dqbtp ON dtprd.question_bank_id = dqbtp.id
<where>
del.user_id = #{request.userId}
<if test="request.categoryId != null">
and dqbtp.category_id = #{request.categoryId}
</if>
</where>
</select>
</mapper>
school-paper/src/main/resources/mapper/school-paper/DbQuestionBankTestPaperMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.school.paper.mapper.DbQuestionBankTestPaperMapper">
<resultMap type="com.ruoyi.school.paper.domain.DbQuestionBankTestPaper" id="DbQuestionBankTestPaperResult">
......@@ -25,5 +25,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/>
</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>
school-paper/src/main/resources/mapper/school-paper/DbDictMapper.xml → school-paper/src/main/resources/mapper/school-paper/DbQuestionTypeMapper.xml
......@@ -2,12 +2,11 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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="parentId" column="parent_id"/>
<result property="type" column="type"/>
<result property="typeValue" column="type_value"/>
<result property="remark" column="remark"/>
<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"
</resultMap>
</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