diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java index 2dc2701da..37605ee38 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java @@ -36,14 +36,23 @@ public class ApiUserCollectionQuestionController extends BaseController { * @param id * @return */ - @PostMapping("/v1/question/collection/{id}") + @GetMapping("/v1/question/collection/{id}") public AjaxResult answer(@PathVariable("id") Integer id) { SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); - - int insert = examUserCollectionQuestionService.insertSelectiveBySelf(id,sysUser); - AjaxResult success = success( "插入我的收藏记录成功" ); - return success; + ExamUserCollectionQuestionVO examUserCollectionQuestionVO = new ExamUserCollectionQuestionVO(); + examUserCollectionQuestionVO.setVipUserId( sysUser.getUserId().intValue() ); + examUserCollectionQuestionVO.setExamQuestionId( id ); + List collectionQuestionVOList = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage( examUserCollectionQuestionVO ); + if (collectionQuestionVOList != null && collectionQuestionVOList.size() > 0) { + //删除收藏记录 + examUserCollectionQuestionService.delete(examUserCollectionQuestionVO); + return success( "取消收藏成功" ); + } else { + //插入收藏记录 + int insert = examUserCollectionQuestionService.insertSelectiveBySelf( id, sysUser ); + return success( "收藏成功" ); + } } /** diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java index cc9c39a30..dbb1e4733 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java @@ -7,6 +7,7 @@ public class ExamExaminationVO extends ExamExamination { private String trainCourseName; + private String examExaminationUserId; public String getTrainCourseName() { return trainCourseName; diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml index 73cc81b51..23cde84a4 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml @@ -118,10 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and exam_examination.remarks = #{ination.remarks} and exam_examination.del_flag = #{ination.delFlag} - - -