|
@@ -5,10 +5,10 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.dto.WmQuizDTO;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmQuizItem;
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.entity.WmQuestion;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.vo.WmQuizVO;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.SysUserService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmQuizItemService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.WmQuestionService;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmQuizService;
|
|
|
import com.qunzhixinxi.hnqz.common.core.exception.BizException;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
@@ -44,45 +44,45 @@ public class WmQuizController {
|
|
|
private final SysUserService userService;
|
|
|
|
|
|
private final WmQuizService quizService;
|
|
|
- private final WmQuizItemService quizItemService;
|
|
|
+ private final WmQuestionService questionService;
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 获取试题详情
|
|
|
*
|
|
|
- * @param itemId 试题ID
|
|
|
+ * @param questionId 试题ID
|
|
|
* @return 详情
|
|
|
*/
|
|
|
- @GetMapping(value = "/quiz/item/details")
|
|
|
- public R<WmQuizItem> getItemDetails(@RequestParam(value = "itemId", required = false) Integer itemId,
|
|
|
- @RequestParam(value = "sn", required = false) String sn) {
|
|
|
+ @GetMapping(value = "/quiz/question/details")
|
|
|
+ public R<WmQuestion> getQuestionDetails(@RequestParam(value = "questionId", required = false) Integer questionId,
|
|
|
+ @RequestParam(value = "sn", required = false) String sn) {
|
|
|
|
|
|
- if (itemId == null && StrUtil.isBlank(sn)) {
|
|
|
+ if (questionId == null && StrUtil.isBlank(sn)) {
|
|
|
log.error("试题编号或者ID缺失");
|
|
|
throw new BizException("试题编号或者ID缺失");
|
|
|
}
|
|
|
|
|
|
- WmQuizItem item = quizItemService.getItemDetails(itemId, sn);
|
|
|
+ WmQuestion item = questionService.getQuestionDetails(questionId, sn);
|
|
|
return R.ok(item);
|
|
|
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取试卷项分页
|
|
|
+ * 获取试题分页
|
|
|
*
|
|
|
* @param current 当前页
|
|
|
* @param size 每页记录数
|
|
|
* @param label 试题标题
|
|
|
* @return 分页结果
|
|
|
*/
|
|
|
- @GetMapping(value = "/quiz/item/page")
|
|
|
- public R<Page<?>> pageQuizItems(@RequestParam(value = "current", defaultValue = "1") Integer current,
|
|
|
+ @GetMapping(value = "/quiz/question/page")
|
|
|
+ public R<Page<?>> pageQuestions(@RequestParam(value = "current", defaultValue = "1") Integer current,
|
|
|
@RequestParam(value = "size", defaultValue = "20") Integer size,
|
|
|
@RequestParam(value = "label", required = false) String label) {
|
|
|
// 获取试题信息
|
|
|
- Page<WmQuizItem> itemPage = quizItemService.pageQuizItems(current, size, label);
|
|
|
+ Page<WmQuestion> itemPage = questionService.pageQuestions(current, size, label);
|
|
|
|
|
|
- List<WmQuizItem> records = itemPage.getRecords();
|
|
|
+ List<WmQuestion> records = itemPage.getRecords();
|
|
|
|
|
|
// 不存在试题的情况
|
|
|
if (CollUtil.isEmpty(records)) {
|
|
@@ -90,13 +90,13 @@ public class WmQuizController {
|
|
|
}
|
|
|
// 封装包含创建人的实体信息
|
|
|
else {
|
|
|
- Set<String> usernames = records.stream().map(WmQuizItem::getCreateBy).collect(Collectors.toSet());
|
|
|
+ Set<String> usernames = records.stream().map(WmQuestion::getCreateBy).collect(Collectors.toSet());
|
|
|
|
|
|
Map<String, List<SysUser>> users = userService.mapUsersByUsername(usernames);
|
|
|
|
|
|
- List<WmQuizVO.ToItemPageVO> vos = records.stream().map(item -> {
|
|
|
- WmQuizVO.ToItemPageVO vo = new WmQuizVO.ToItemPageVO();
|
|
|
- vo.setItemId(item.getItemId());
|
|
|
+ List<WmQuizVO.ToQuestionPageVO> vos = records.stream().map(item -> {
|
|
|
+ WmQuizVO.ToQuestionPageVO vo = new WmQuizVO.ToQuestionPageVO();
|
|
|
+ vo.setItemId(item.getQuestionId());
|
|
|
vo.setSerialNum(item.getSerialNumber());
|
|
|
vo.setLabel(item.getLabel());
|
|
|
vo.setCreateTime(item.getCreateTime());
|
|
@@ -105,7 +105,7 @@ public class WmQuizController {
|
|
|
return vo;
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
- Page<WmQuizVO.ToItemPageVO> pages = new Page<>();
|
|
|
+ Page<WmQuizVO.ToQuestionPageVO> pages = new Page<>();
|
|
|
pages.setCurrent(current);
|
|
|
pages.setSize(size);
|
|
|
pages.setPages(itemPage.getPages());
|
|
@@ -118,17 +118,17 @@ public class WmQuizController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 创建试卷项
|
|
|
+ * 创建试题
|
|
|
*
|
|
|
* @param resource 试卷项内容
|
|
|
* @return 创建结果
|
|
|
*/
|
|
|
@SysLog("创建试卷项")
|
|
|
- @PostMapping(value = "/quiz/item/create")
|
|
|
- public R<Boolean> createQuizItem(@Valid @RequestBody WmQuizDTO.OnItemCreate resource) {
|
|
|
+ @PostMapping(value = "/quiz/question/create")
|
|
|
+ public R<Boolean> createQuestion(@Valid @RequestBody WmQuizDTO.OnQuestionCreate resource) {
|
|
|
|
|
|
HnqzUser operator = SecurityUtils.getUser();
|
|
|
- Boolean passed = quizItemService.checkItem(operator, resource.getLabel(), null);
|
|
|
+ Boolean passed = questionService.checkQuestion(operator, resource.getLabel(), null);
|
|
|
|
|
|
if (!passed) {
|
|
|
String errorMsg = String.format("存在标题重复的试题,[%s]", resource.getLabel());
|
|
@@ -136,7 +136,7 @@ public class WmQuizController {
|
|
|
throw new BizException(errorMsg);
|
|
|
}
|
|
|
|
|
|
- Boolean succ = quizItemService.createItem(resource, operator);
|
|
|
+ Boolean succ = questionService.createQuestion(resource, operator);
|
|
|
return succ ? R.ok(succ, "添加试题成功") : R.failed(succ, "添加试题失败");
|
|
|
}
|
|
|
|
|
@@ -147,17 +147,17 @@ public class WmQuizController {
|
|
|
* @return 更新结果
|
|
|
*/
|
|
|
@SysLog("更新试卷项")
|
|
|
- @PostMapping(value = "/quiz/item/update")
|
|
|
- public R<Boolean> updateQuizItem(@Valid @RequestBody WmQuizDTO.OnItemUpdate resource) {
|
|
|
+ @PostMapping(value = "/quiz/question/update")
|
|
|
+ public R<Boolean> updateQuizItem(@Valid @RequestBody WmQuizDTO.OnQuestionUpdate resource) {
|
|
|
|
|
|
HnqzUser operator = SecurityUtils.getUser();
|
|
|
- Boolean passed = quizItemService.checkItem(operator, resource.getLabel(), resource.getItemId());
|
|
|
+ Boolean passed = questionService.checkQuestion(operator, resource.getLabel(), resource.getQuestionId());
|
|
|
if (!passed) {
|
|
|
String errorMsg = String.format("存在标题重复的试题,[%s]", resource.getLabel());
|
|
|
log.error(errorMsg);
|
|
|
throw new BizException(errorMsg);
|
|
|
}
|
|
|
- Boolean succ = quizItemService.updateItem(resource, operator);
|
|
|
+ Boolean succ = questionService.updateQuestion(resource, operator);
|
|
|
return succ ? R.ok(succ, "更新试题成功") : R.failed(succ, "更新试题失败");
|
|
|
|
|
|
}
|