From 0670c9fdf1e504255cef31ac41e55ecc4ee9b7cb Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 29 Nov 2022 02:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=A2=98=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseQuestionLogService.java  | 33 ++++++++++++++++++-
 ...eacherOpenCourseQuestionLogController.java | 28 +++++++++++++---
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
index f785a68d..0501a516 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -51,6 +51,7 @@ import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.FINALLY_SUBMIT;
 import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.PRE_SUBMIT;
 import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE;
 import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.joining;
 
 /**
  * 题目日志 Service
@@ -593,7 +594,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
      * @param teacherOpenCourseQuestionLogIds
      * @param isTuck
      */
-    public void tuck(@NotEmpty(message = "题目日志ID不能为空！") String teacherOpenCourseQuestionLogIds, final boolean isTuck) {
+    public void tuckByLogIds(@NotEmpty(message = "题目日志ID不能为空！") String teacherOpenCourseQuestionLogIds, final boolean isTuck) {
 
         Function<String, TeacherOpenCourseQuestionLog> stringTeacherOpenCourseQuestionLogFunction = logId -> {
             TeacherOpenCourseQuestionLog questionLog = new TeacherOpenCourseQuestionLog();
@@ -607,6 +608,35 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
         updateBatchTemplate(logSet);
     }
 
+    /**
+     * 收藏题目，根据题目配置ID + 题目快照ID
+     *
+     * @param questionSettingId     题目配置ID
+     * @param questionSnapshotIds   题目快照IDs
+     * @param isTuck                是否收藏 true收藏 false取消收藏
+     * @param student               学生信息
+     */
+    public void tuck(@NotNull(message = "题目配置ID不能为空！")  Long questionSettingId,
+                     @NotBlank(message = "题目快照IDs不能为空！") String questionSnapshotIds, boolean isTuck,
+                     @NotNull(message = "学生信息不能为空！") Student student) {
+        TeacherOpenCourseQuestionLogQuery logQuery = new TeacherOpenCourseQuestionLogQuery();
+        logQuery.setTeacherOpenCourseQuestionSettingId(questionSettingId);
+        logQuery.setResourcesQuestionSnapshotIdPlural(questionSnapshotIds);
+        logQuery.setTeacherOpenCourseQuestionLogStatus(1);
+        logQuery.setStudentId(student.getStudentId());
+        List<TeacherOpenCourseQuestionLog> list = getValuesByQueryNotWithPermission(logQuery);
+
+        if (ObjectUtil.isEmpty(list)) {
+            throw new PlatformException("收藏失败，未查询到要收藏的题目");
+        }
+
+        String logIds = list.stream()
+                .map(o -> o.getTeacherOpenCourseQuestionLogId().toString()).collect(joining(","));
+
+        // 根据做题的日志ID，收藏题目
+        tuckByLogIds(logIds, isTuck);
+    }
+
     /**
      * 批量收藏到错题库
      * @param teacherOpenCourseQuestionLogIds
@@ -660,4 +690,5 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
         return false;
     }
 
+
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
index 64eacbf5..098c7ac6 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.LinkedHashMap;
@@ -202,13 +203,30 @@ public class TeacherOpenCourseQuestionLogController {
 
     /**
      * 批量收藏题目 / 取消收藏
-     * @param teacherOpenCourseQuestionLogIds   题目日志ID
-     * @param isTuck                            是否收藏：true, false
+     * @param questionSettingId     题目配置ID
+     * @param questionSnapshotIds   题目快照IDs
+     * @param isTuck                是否收藏：true, false
      * @return
      */
     @PostMapping(API + "/tuck.do")
-    public JsonResult tuck(String questionSettingId, String questionSnapshotIds, String teacherOpenCourseQuestionLogIds, boolean isTuck) {
-        teacherOpenCourseQuestionLogService.tuck(teacherOpenCourseQuestionLogIds, isTuck);
+    public JsonResult tuck(Long questionSettingId, String questionSnapshotIds, boolean isTuck) {
+        Student student = getStudent();
+        Assert.notNull(student, "该接口只能学生操作!");
+        teacherOpenCourseQuestionLogService.tuck(questionSettingId, questionSnapshotIds, isTuck, student);
+        return JsonResult.success();
+    }
+
+    /**
+     * 批量收藏题目 / 取消收藏
+     * @param teacherOpenCourseQuestionLogIds   题目日志IDs
+     * @param isTuck                            是否收藏：true, false
+     * @return
+     */
+    @PostMapping(API + "/tuckByLogIds.do")
+    public JsonResult tuck(@NotBlank(message = "题目日志IDs不能为空！") String teacherOpenCourseQuestionLogIds, boolean isTuck) {
+        Student student = getStudent();
+        Assert.notNull(student, "该接口只能学生操作!");
+        teacherOpenCourseQuestionLogService.tuckByLogIds(teacherOpenCourseQuestionLogIds, isTuck);
         return JsonResult.success();
     }
 
@@ -219,7 +237,7 @@ public class TeacherOpenCourseQuestionLogController {
     @GetMapping(API + "/tuckList.do")
     public JsonResult tuckList(PageParam pageParam) {
         Student student = getStudent();
-        Assert.notNull(student, "非学生身份，无法获取题目分析!");
+        Assert.notNull(student, "非学生身份，无法获取收藏的题目!");
         PageQuery query = new PageQuery(pageParam.getPage().longValue(), pageParam.getLimit().longValue());
         query.setPara("studentId", student.getStudentId());
         query.setPara("teacherOpenCourseQuestionLogStatus", 1);