From ba755e563e47cf683e03ad7d12659bb1d8642b93 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:32:23 +0800
Subject: [PATCH] 9.1
---
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java | 4 +++-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGame.java | 4 ++++
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/GameDTO.java | 4 +++-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 9 ++++++++-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/GameVO.java | 5 ++++-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/GameDTO.java | 4 +++-
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java | 5 ++++-
7 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/GameDTO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/GameDTO.java
index c4d303a..8700443 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/GameDTO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/GameDTO.java
@@ -24,6 +24,8 @@
private String rate;
@ApiModelProperty("超级记忆通关率")
private String answerRate;
- @ApiModelProperty("题目ids")
+ @ApiModelProperty("题目ids 超级听力")
private String subjectIds;
+ @ApiModelProperty("题目ids 超级记忆")
+ private String subjectIdsOne;
}
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java
index e0ef0c9..6f47059 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java
@@ -27,6 +27,8 @@
private String rate;
@ApiModelProperty(value = "超级记忆通关率")
private String answerRate;
- @ApiModelProperty(value = "游戏题目")
+ @ApiModelProperty(value = "游戏题目 超级听力")
private List<TSubject> subjects;
+ @ApiModelProperty(value = "游戏题目 超级记忆")
+ private List<TSubject> subjectsOne;
}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java
index 39c17e6..79586d0 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java
@@ -56,8 +56,11 @@
@ResponseBody
public AjaxResult addStudySet(@RequestBody AddStudySetDTO dto) {
System.err.println("后台"+dto);
+ if(dto.getGame().getCount()>dto.getGame().getSubjectIds().split(",").length){
+ return AjaxResult.error("超级听力选择题目数量不足");
+ }
if(dto.getGame().getAnswerCount()>dto.getGame().getSubjectIds().split(",").length){
- return AjaxResult.error("选择题目数量不足");
+ return AjaxResult.error("超级记忆选择题目数量不足");
}
R<Object> objectR = studyClient.addStudySet(dto);
int code = objectR.getCode();
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 5ed1919..06eafd2 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -355,6 +355,7 @@
studyId.setRate(game.getRate());
studyId.setAnswerRate(game.getAnswerRate());
studyId.setSubjectIds(game.getSubjectIds());
+ studyId.setSubjectIdsOne(game.getSubjectIdsOne());
gameService.updateById(studyId);
} else {
// 判断当前周目配置的题目数量
@@ -384,6 +385,7 @@
tGame.setAnswerIntegral(game.getAnswerIntegral());
tGame.setAnswerCount(game.getAnswerCount());
tGame.setSubjectIds(game.getSubjectIds());
+ tGame.setSubjectIdsOne(game.getSubjectIdsOne());
gameService.save(tGame);
}
@@ -931,6 +933,11 @@
if(subjectIds!=null && subjectIds.length()>0){
gameVO.setSubjects(subjectService.list(new QueryWrapper<TSubject>()
.in("id", subjectIds.split(","))));
+ }
+ String subjectIdsOne = tGame.getSubjectIdsOne();
+ if(subjectIdsOne!=null && subjectIdsOne.length()>0){
+ gameVO.setSubjectsOne(subjectService.list(new QueryWrapper<TSubject>()
+ .in("id", subjectIdsOne.split(","))));
}
gameVOS.add(gameVO);
}
@@ -1788,7 +1795,7 @@
}
// List<String> subjectId = getSubjectId(week);
List<String> subjectId = new ArrayList<>();
- String subjectIds = game.getSubjectIds();
+ String subjectIds = game.getSubjectIdsOne();
if(subjectIds!=null){
String[] split = subjectIds.split(",");
for (String s : split) {
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGame.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGame.java
index bb8045b..7ae2f99 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGame.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGame.java
@@ -84,4 +84,8 @@
@ApiModelProperty("题目ids")
private String subjectIds;
+
+ @ApiModelProperty("题目ids")
+ private String subjectIdsOne;
+
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/GameDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/GameDTO.java
index 9b9ec6e..b65509a 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/GameDTO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/GameDTO.java
@@ -24,7 +24,9 @@
private Integer answerIntegral;
@ApiModelProperty("超级记忆游戏题目数量")
private Integer answerCount;
- @ApiModelProperty("题目ids")
+ @ApiModelProperty("题目ids 超级听力")
private String subjectIds;
+ @ApiModelProperty("题目ids 超级记忆 ")
+ private String subjectIdsOne;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/GameVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/GameVO.java
index 44ee6a0..9081ffc 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/GameVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/GameVO.java
@@ -27,6 +27,9 @@
private Integer answerIntegral;
@ApiModelProperty(value = "超级记忆游戏题目数量")
private Integer answerCount;
- @ApiModelProperty(value = "超级记忆游戏时间")
+ @ApiModelProperty(value = "超级听力游戏时间")
private List<TSubject> subjects;
+
+ @ApiModelProperty(value = "超级记忆游戏时间")
+ private List<TSubject> subjectsOne;
}
\ No newline at end of file
--
Gitblit v1.7.1