From 938eb561be962b3482a8dedfdaff2365aa7edbcf Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Thu, 12 Sep 2024 10:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tz/platform/pc/PCQuestionController.java  | 65 ++++++++++---------
 .../com/tz/platform/pc/vo/CourseList.java     |  4 +-
 .../com/tz/platform/pc/vo/GetCourseList.java  | 15 +++++
 3 files changed, 53 insertions(+), 31 deletions(-)
 create mode 100644 tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/GetCourseList.java

diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/PCQuestionController.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/PCQuestionController.java
index 43d66ac..5003341 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/PCQuestionController.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/PCQuestionController.java
@@ -83,42 +83,47 @@ public class PCQuestionController extends BaseController {
     }
 
     @GetMapping(value = "getCourseList")
-    public List<CourseDTO> getCourseList() {
-        return questionDao.getCourseList();
+    public Result<GetCourseList> getCourseList() {
+        GetCourseList getCourseList =new GetCourseList();
+        List<CourseDTO> courseList = questionDao.getCourseList();
+        getCourseList.setList(courseList);
+        return Result.success(getCourseList);
     }
 
 
     @PostMapping(value = "getIdsByCount")
-    public List<Long> getIdsByCount(@RequestBody GetIdsVo vo) {
+    public Result<CourseList> getIdsByCount(@RequestBody GetIdsVo vo) {
         List<Long> ids = new ArrayList<>();
         List<Long> courseIds = vo.getCourseIds();
-            int judgeCount = vo.getJudgeCount();
-            int singleCount = vo.getSingleCount();
-            int gapFillingCount = vo.getGapFillingCount();
-            int multyCount = vo.getMultyCount();
-
-            // 随机抽取题目ID
-            if (judgeCount > 0) {
-                List<Question> judgeIds = questionDao.findAllByQuestionTypeAndCourseIdIn(3, courseIds);
-                List<Long> collect = judgeIds.stream().map(Question::getId).collect(Collectors.toList());
-                ids.addAll(randomSelect(collect, judgeCount));
-            }
-            if (singleCount > 0) {
-                List<Question> singleIds = questionDao.findAllByQuestionTypeAndCourseIdIn(1, courseIds);
-                List<Long> collect = singleIds.stream().map(Question::getId).collect(Collectors.toList());
-                ids.addAll(randomSelect(collect, singleCount));
-            }
-            if (gapFillingCount > 0) {
-                List<Question> gapFillingIds = questionDao.findAllByQuestionTypeAndCourseIdIn(4, courseIds);
-                List<Long> collect = gapFillingIds.stream().map(Question::getId).collect(Collectors.toList());
-                ids.addAll(randomSelect(collect, gapFillingCount));
-            }
-            if (multyCount > 0) {
-                List<Question> multyIds= questionDao.findAllByQuestionTypeAndCourseIdIn(2, courseIds);
-                List<Long> collect = multyIds.stream().map(Question::getId).collect(Collectors.toList());
-                ids.addAll(randomSelect(collect, multyCount));
-            }
-        return ids;
+        int judgeCount = vo.getJudgeCount();
+        int singleCount = vo.getSingleCount();
+        int gapFillingCount = vo.getGapFillingCount();
+        int multyCount = vo.getMultyCount();
+
+        // 随机抽取题目ID
+        if (judgeCount > 0) {
+            List<Question> judgeIds = questionDao.findAllByQuestionTypeAndCourseIdIn(3, courseIds);
+            List<Long> collect = judgeIds.stream().map(Question::getId).collect(Collectors.toList());
+            ids.addAll(randomSelect(collect, judgeCount));
+        }
+        if (singleCount > 0) {
+            List<Question> singleIds = questionDao.findAllByQuestionTypeAndCourseIdIn(1, courseIds);
+            List<Long> collect = singleIds.stream().map(Question::getId).collect(Collectors.toList());
+            ids.addAll(randomSelect(collect, singleCount));
+        }
+        if (gapFillingCount > 0) {
+            List<Question> gapFillingIds = questionDao.findAllByQuestionTypeAndCourseIdIn(4, courseIds);
+            List<Long> collect = gapFillingIds.stream().map(Question::getId).collect(Collectors.toList());
+            ids.addAll(randomSelect(collect, gapFillingCount));
+        }
+        if (multyCount > 0) {
+            List<Question> multyIds = questionDao.findAllByQuestionTypeAndCourseIdIn(2, courseIds);
+            List<Long> collect = multyIds.stream().map(Question::getId).collect(Collectors.toList());
+            ids.addAll(randomSelect(collect, multyCount));
+        }
+        CourseList courseList = new CourseList();
+        courseList.setList(ids);
+        return Result.success(courseList);
     }
 
     /**
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseList.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseList.java
index b38953c..cae7e17 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseList.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/CourseList.java
@@ -2,6 +2,7 @@ package com.tz.platform.pc.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -9,5 +10,6 @@ import java.util.List;
  * @Date 2024/9/11
  */
 @Data
-public class CourseList {
+public class CourseList implements Serializable {
+    List<Long> list;
 }
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/GetCourseList.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/GetCourseList.java
new file mode 100644
index 0000000..af928e1
--- /dev/null
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/GetCourseList.java
@@ -0,0 +1,15 @@
+package com.tz.platform.pc.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author xcj
+ * @Date 2024/9/12
+ */
+@Data
+public class GetCourseList implements Serializable {
+    List<CourseDTO> list;
+}