From 53f8fc0e1e152656652d58a374c973191a527b9d Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 12 十一月 2024 16:06:25 +0800
Subject: [PATCH] 优化错题查询
---
src/main/java/com/ycl/jxkg/service/WrongService.java | 2 +-
src/main/java/com/ycl/jxkg/controller/student/WrongController.java | 6 +++---
src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java | 11 ++++++-----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/WrongController.java b/src/main/java/com/ycl/jxkg/controller/student/WrongController.java
index cb2d596..3947e50 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/WrongController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/WrongController.java
@@ -19,9 +19,9 @@
public class WrongController extends BaseApiController {
private final WrongService wrongService;
- @PostMapping("/page")
- public Result<WrongResponseVO> page(@RequestBody WrongRequestVo model) {
+ @PostMapping("/list")
+ public Result<WrongResponseVO> list(@RequestBody WrongRequestVo model) {
model.setUserId(getCurrentUser().getId());
- return Result.ok(wrongService.page(model));
+ return Result.ok(wrongService.list(model));
}
}
diff --git a/src/main/java/com/ycl/jxkg/service/WrongService.java b/src/main/java/com/ycl/jxkg/service/WrongService.java
index 3b4b8e3..066bff0 100644
--- a/src/main/java/com/ycl/jxkg/service/WrongService.java
+++ b/src/main/java/com/ycl/jxkg/service/WrongService.java
@@ -8,6 +8,6 @@
/**
* 鏉′欢鏌ヨ閿欓
* */
- WrongResponseVO page(WrongRequestVo wrongRequestVo);
+ WrongResponseVO list(WrongRequestVo wrongRequestVo);
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java
index bca6a68..70aa8fe 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
@Service
@@ -36,7 +37,7 @@
* 鏉′欢鏌ヨ閿欓
* */
@Override
- public WrongResponseVO page(WrongRequestVo wrongRequestVo) {
+ public WrongResponseVO list(WrongRequestVo wrongRequestVo) {
WrongResponseVO wrongResponseVO = new WrongResponseVO();
// 鏌ヨ璇ョ敤鎴风殑鎵�鏈夎�冭瘯
List<ExamPaperScore> examPaperScores = examPaperScoreMapper.selectByUserId(wrongRequestVo.getUserId());
@@ -72,10 +73,10 @@
List<DoQuestionVO> doQuestionVOS = questions.stream()
// 鏍囬涓嶄负绌烘垨绌哄瓧绗︿覆锛屾ā绯婃煡璇�
.filter(question -> {
- if (wrongRequestVo.getTitle() == null || wrongRequestVo.getTitle().trim().equals("")) {
+ if (wrongRequestVo.getTitle() == null || wrongRequestVo.getTitle().trim().isEmpty()) {
return true;
}
- return question.getTitle().toLowerCase().contains(wrongRequestVo.getTitle().toLowerCase());
+ return Optional.ofNullable(question.getTitle()).orElse("").toLowerCase().contains(wrongRequestVo.getTitle().toLowerCase());
})
.filter(question -> {
if (wrongRequestVo.getQuestionType() == null) {
@@ -84,10 +85,10 @@
return question.getQuestionType().equals(wrongRequestVo.getQuestionType());
})
.filter(question -> {
- if (wrongRequestVo.getExamName() == null || wrongRequestVo.getExamName().trim().equals("")) {
+ if (wrongRequestVo.getExamName() == null || wrongRequestVo.getExamName().trim().isEmpty()) {
return true;
}
- return question.getExamName().toLowerCase().contains(wrongRequestVo.getExamName().toLowerCase());
+ return Optional.ofNullable(question.getExamName()).orElse("").toLowerCase().contains(wrongRequestVo.getExamName().toLowerCase());
})
.collect(Collectors.toList());
// 鍒嗛〉
--
Gitblit v1.8.0