Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

src/main/java/com/peanut/modules/sociology/controller/CourseController.java

@@ -1,10 +1,12 @@
 package com.peanut.modules.sociology.controller;
 
 import com.aliyun.vod20170321.models.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
 import com.peanut.common.utils.ShiroUtils;
 import com.peanut.common.utils.SpdbUtil;
+import com.peanut.modules.common.dao.UserCourseStudyingDao;
 import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.to.ParamTo;
 import com.peanut.modules.master.service.CourseCatalogueChapterVideoService;
@@ -35,6 +37,8 @@ public class CourseController {
     private SysCourseDirectService sysCourseDirectService;
     @Autowired
     private CourseSociologyService courseSociologyService;
+    @Autowired
+    private UserCourseStudyingDao userCourseStudyingDao;
 
     /**
      * 获取用户最近学习课程列表
@@ -91,6 +95,32 @@ public class CourseController {
         return R.ok().put("courses",sociologyCourseList);
     }
 
+    /**
+     * 加入收藏（加入正在学习）
+     * @param map
+     * @return
+     */
+    @RequestMapping("/addUserCourseStudying")
+    public R addUserCourseStudying(@RequestBody Map<String,Integer> map){
+        UserCourseStudying userCourseStudying = new UserCourseStudying();
+        userCourseStudying.setUserId(ShiroUtils.getUId());
+        userCourseStudying.setCatalogueId(map.get("catalogueId"));
+        userCourseStudyingDao.insert(userCourseStudying);
+        return R.ok().put("result",userCourseStudying);
+    }
+
+    /**
+     * 移出收藏（移出正在学习）
+     * @param map
+     * @return
+     */
+    @RequestMapping("/removeUserCourseStudying")
+    public R removeUserCourseStudying(@RequestBody Map<String,Integer> map){
+        userCourseStudyingDao.delete(new LambdaQueryWrapper<UserCourseStudying>()
+                .eq(UserCourseStudying::getUserId,ShiroUtils.getUId()).eq(UserCourseStudying::getCatalogueId,map.get("catalogueId")));
+        return R.ok();
+    }
+
     /**
      * 获取课程目录章节详情
      * @param param