list = objectivesTypeService.list();
- return ResultUtils.success(list);
- }
-
-
-
-}
diff --git a/src/main/java/com/teaching/backend/controller/courses/StudentCoursesController.java b/src/main/java/com/teaching/backend/controller/courses/StudentCoursesController.java
index f0433f9..c68e460 100644
--- a/src/main/java/com/teaching/backend/controller/courses/StudentCoursesController.java
+++ b/src/main/java/com/teaching/backend/controller/courses/StudentCoursesController.java
@@ -3,19 +3,14 @@ package com.teaching.backend.controller.courses;
import com.teaching.backend.common.BaseResponse;
import com.teaching.backend.common.ResultUtils;
-import com.teaching.backend.model.dto.courses.ObjectiveContentKnowDTO;
-import com.teaching.backend.model.dto.courses.PageDTO;
import com.teaching.backend.model.dto.courses.StudentCoursesDTO;
-import com.teaching.backend.model.query.CourseQuery;
-import com.teaching.backend.model.vo.courses.CoursesVO;
import com.teaching.backend.service.courses.IStudentCoursesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-
/**
*
* 前端控制器
@@ -27,6 +22,7 @@ import org.springframework.stereotype.Controller;
@Api(tags = "学生课程接口")
@RestController
@RequestMapping("/api/student_courses")
+@Validated
public class StudentCoursesController {
@Autowired
@@ -34,7 +30,7 @@ public class StudentCoursesController {
@ApiOperation("给学生添加课程")
@PostMapping("/addcoursess")
- public BaseResponse saveCoursesToStudents(@RequestBody StudentCoursesDTO studentCoursesDTO){
+ public BaseResponse saveCoursesToStudents(@RequestBody @Validated StudentCoursesDTO studentCoursesDTO){
String data = studentCoursesService.saveCoursesToStudents(studentCoursesDTO);
return ResultUtils.success(data);
}
diff --git a/src/main/java/com/teaching/backend/controller/favour/SeCourseFavourController.java b/src/main/java/com/teaching/backend/controller/favour/CourseFavourController.java
similarity index 57%
rename from src/main/java/com/teaching/backend/controller/favour/SeCourseFavourController.java
rename to src/main/java/com/teaching/backend/controller/favour/CourseFavourController.java
index fe2548b..1ffd0f6 100644
--- a/src/main/java/com/teaching/backend/controller/favour/SeCourseFavourController.java
+++ b/src/main/java/com/teaching/backend/controller/favour/CourseFavourController.java
@@ -3,20 +3,20 @@ package com.teaching.backend.controller.favour;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.teaching.backend.common.BaseResponse;
-import com.teaching.backend.common.CommonResult;
import com.teaching.backend.common.ErrorCode;
import com.teaching.backend.common.ResultUtils;
import com.teaching.backend.exception.BusinessException;
import com.teaching.backend.model.dto.favour.courseFavour.CourseFavourAddRequest;
-import com.teaching.backend.model.dto.favour.courseFavour.CourseFavourAllRequest;
import com.teaching.backend.model.dto.favour.courseFavour.CourseFavourQueryRequest;
import com.teaching.backend.model.entity.courses.Courses;
import com.teaching.backend.model.vo.courses.CoursesVO;
import com.teaching.backend.model.vo.favour.CourseFavourDetailVO;
-import com.teaching.backend.service.favour.SeCourseFavourService;
+import com.teaching.backend.service.favour.CourseFavourService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -30,10 +30,12 @@ import java.util.List;
@RestController
@RequestMapping("/api/course_favour")
@Slf4j
-public class SeCourseFavourController {
+@Api(tags = "课程喜欢接口")
+@Validated
+public class CourseFavourController {
@Resource
- private SeCourseFavourService seCourseFavourService;
+ private CourseFavourService CourseFavourService;
@@ -44,32 +46,27 @@ public class SeCourseFavourController {
* @return result 执行情况
*/
@PostMapping("/add")
+ @ApiOperation("课程喜欢")
// 加上 HttpServletRequest request 在一个fitter里面进行鉴权操作
- public BaseResponse doFavour(@RequestBody CourseFavourAddRequest courseFavourAddRequest) {
- System.out.println(courseFavourAddRequest);
- //判断字段是否为空
- if (StringUtils.isAnyBlank(courseFavourAddRequest.getCourseId(), courseFavourAddRequest.getUserId())) {
- throw new BusinessException(ErrorCode.PARAMS_ERROR);
- }
+ public BaseResponse doFavour(@RequestBody @Validated CourseFavourAddRequest courseFavourAddRequest) {
- return seCourseFavourService.doCourseFavour(courseFavourAddRequest.getCourseId(), courseFavourAddRequest.getUserId());
+ return CourseFavourService.doCourseFavour(courseFavourAddRequest.getCourseId(), courseFavourAddRequest.getUserId());
}
/**
- * 课程点赞总数
+ * 课程点赞总数 课程有多少人喜欢
*
- * @param courseFavourAddRequest
* @return result 课程点赞总数
*/
- @PostMapping("/count")
- // HttpServletRequest request 在一个fitter里面进行鉴权操作
- public BaseResponse favourCount(@RequestBody CourseFavourAddRequest courseFavourAddRequest) {
- if (StringUtils.isAnyBlank(courseFavourAddRequest.getCourseId())) {
+ @GetMapping("/count")
+ @ApiOperation("课程喜欢总数")
+ public BaseResponse favourCount(@RequestParam String courseId) {
+ if (StringUtils.isAnyBlank(courseId)) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "请求参数不能为空");
}
- return seCourseFavourService.favourCount(courseFavourAddRequest.getCourseId());
+ return CourseFavourService.favourCount(courseId);
}
@@ -80,15 +77,14 @@ public class SeCourseFavourController {
*/
@PostMapping("/list/page")
public BaseResponse> listPostByPage(@RequestBody CourseFavourQueryRequest courseFavourQueryRequest) {
- System.out.println(courseFavourQueryRequest);
+
long current = courseFavourQueryRequest.getCurrent();
long size = courseFavourQueryRequest.getPageSize();
String userId = courseFavourQueryRequest.getUserId();
- List ids = seCourseFavourService.courseList(userId);
+ List ids = CourseFavourService.courseList(userId);
QueryWrapper courseQueryWrapper = new QueryWrapper<>();
courseQueryWrapper.in("id", ids);
- Page courseFavourDetailVOPage = seCourseFavourService.listCourseFavourByPage(new Page<>(current, size), courseQueryWrapper);
-
+ Page courseFavourDetailVOPage = CourseFavourService.listCourseFavourByPage(new Page<>(current, size), courseQueryWrapper);
return ResultUtils.success(courseFavourDetailVOPage);
}
@@ -99,12 +95,12 @@ public class SeCourseFavourController {
*/
@ApiOperation("查询最新收藏")
@PostMapping("/newCollect")
- public CommonResult> newCollect(@RequestParam String userId) {
- List newCoursesVO = seCourseFavourService.queryNewCollect(userId);
+ public BaseResponse> newCollect(@RequestParam String userId) {
+ List newCoursesVO = CourseFavourService.queryNewCollect(userId);
if (newCoursesVO == null){
- CommonResult.failed("用户或角色错误");
+ ResultUtils.error(ErrorCode.PARAMS_ERROR,"用户或角色错误");
}
- return CommonResult.success(newCoursesVO);
+ return ResultUtils.success(newCoursesVO);
}
}
diff --git a/src/main/java/com/teaching/backend/controller/favour/KnowFavourController.java b/src/main/java/com/teaching/backend/controller/favour/KnowFavourController.java
new file mode 100644
index 0000000..7739a73
--- /dev/null
+++ b/src/main/java/com/teaching/backend/controller/favour/KnowFavourController.java
@@ -0,0 +1,48 @@
+package com.teaching.backend.controller.favour;
+
+import com.teaching.backend.common.BaseResponse;
+import com.teaching.backend.common.ErrorCode;
+import com.teaching.backend.exception.BusinessException;
+import com.teaching.backend.model.dto.favour.knowFavour.KnowFavourAddRequest;
+import com.teaching.backend.service.favour.KnowFavourService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @Author:youhang
+ * @Date:2024-05-30-20:22
+ * @Description:
+ */
+@RestController
+@RequestMapping("/api/know_favour")
+@Slf4j
+@Api(tags = "知识点喜欢接口")
+@Validated
+public class KnowFavourController {
+
+ @Autowired
+ private KnowFavourService KnowFavourService;
+
+
+ /**
+ * 知识点喜欢
+ *
+ * @param knowFavourAddRequest
+ * @return result 执行情况
+ */
+ @PostMapping("/add")
+ // 加上 HttpServletRequest request 在一个fitter里面进行鉴权操作
+ public BaseResponse doFavour(@RequestBody @Validated KnowFavourAddRequest knowFavourAddRequest) {
+ return KnowFavourService.doKnowFavour( knowFavourAddRequest.getKnowId(), knowFavourAddRequest.getUserId());
+
+ }
+
+}
diff --git a/src/main/java/com/teaching/backend/controller/favour/ResourceFavourController.java b/src/main/java/com/teaching/backend/controller/favour/ResourceFavourController.java
new file mode 100644
index 0000000..85839ac
--- /dev/null
+++ b/src/main/java/com/teaching/backend/controller/favour/ResourceFavourController.java
@@ -0,0 +1,72 @@
+package com.teaching.backend.controller.favour;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.teaching.backend.common.BaseResponse;
+import com.teaching.backend.common.ErrorCode;
+import com.teaching.backend.common.ResultUtils;
+import com.teaching.backend.exception.BusinessException;
+import com.teaching.backend.model.dto.favour.resourceFavour.ResourceFavourAddRequest;
+import com.teaching.backend.model.dto.favour.resourceFavour.ResourceFavourQueryRequest;
+
+import com.teaching.backend.model.entity.resource.ResourceMysql;
+import com.teaching.backend.service.favour.ResourceFavourService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @Author:youhang
+ * @Date:2024-05-30-20:22
+ * @Description:
+ */
+@RestController
+@RequestMapping("/api/resource_favour")
+@Slf4j
+@Api(tags = "资源喜欢接口")
+@Validated
+public class ResourceFavourController {
+
+ @Autowired
+ private ResourceFavourService seResourceFavourService;
+
+
+ /**
+ * 资源喜欢
+ *
+ * @param resourceFavourAddRequest
+ * @return result 执行情况
+ */
+ @PostMapping("/add")
+ @ApiOperation("资源喜欢")
+ public BaseResponse doFavour(@RequestBody @Validated ResourceFavourAddRequest resourceFavourAddRequest) {
+ return seResourceFavourService.doResourceFavour(resourceFavourAddRequest.getResourceId(), resourceFavourAddRequest.getUserId());
+ }
+
+
+
+
+ /**
+ * 分页获取资源列表
+ *
+ * @return
+ */
+ @PostMapping("/list/page")
+ @ApiOperation("分页获取资源列表")
+ public BaseResponse> listPostByPage(@RequestBody @Validated ResourceFavourQueryRequest resourceFavourQueryRequest) {
+ Integer current = resourceFavourQueryRequest.getCurrent();
+ Integer size = resourceFavourQueryRequest.getPageSize();
+ Long userId = resourceFavourQueryRequest.getUserId();
+ Integer type = resourceFavourQueryRequest.getType();
+ return ResultUtils.success(seResourceFavourService.listCourseFavourByPage(userId,type,current,size));
+ }
+
+
+}
diff --git a/src/main/java/com/teaching/backend/controller/favour/SeKnowFavourController.java b/src/main/java/com/teaching/backend/controller/favour/SeKnowFavourController.java
deleted file mode 100644
index 97d3731..0000000
--- a/src/main/java/com/teaching/backend/controller/favour/SeKnowFavourController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//package com.teaching.backend.controller.favour;
-//
-//import com.teaching.backend.common.BaseResponse;
-//import com.teaching.backend.common.ErrorCode;
-//import com.teaching.backend.exception.BusinessException;
-//import com.teaching.backend.model.dto.favour.knowFavour.KnowFavourAddRequest;
-//import com.teaching.backend.service.favour.SeKnowFavourService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.lang3.StringUtils;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.annotation.ResourceMysql;
-//
-///**
-// * @Author:youhang
-// * @Date:2024-05-30-20:22
-// * @Description:
-// */
-//@RestController
-//@RequestMapping("/api/know_favour")
-//@Slf4j
-//public class SeKnowFavourController {
-//
-// @ResourceMysql
-// private SeKnowFavourService seKnowFavourService;
-//
-//
-// /**
-// * 知识点收藏
-// *
-// * @param knowFavourAddRequest
-// * @return result 执行情况
-// */
-// @PostMapping("/add")
-// // 加上 HttpServletRequest request 在一个fitter里面进行鉴权操作
-// public BaseResponse doFavour(@RequestBody KnowFavourAddRequest knowFavourAddRequest) {
-// if (StringUtils.isAnyBlank(knowFavourAddRequest.getCourseId(), knowFavourAddRequest.getKnowId(), knowFavourAddRequest.getUserId())) {
-// throw new BusinessException(ErrorCode.PARAMS_ERROR);
-// }
-// return seKnowFavourService.doKnowFavour( knowFavourAddRequest.getKnowId(), knowFavourAddRequest.getUserId());
-//
-// }
-//
-//}
diff --git a/src/main/java/com/teaching/backend/controller/favour/SeResourceFavourController.java b/src/main/java/com/teaching/backend/controller/favour/SeResourceFavourController.java
deleted file mode 100644
index d22bd33..0000000
--- a/src/main/java/com/teaching/backend/controller/favour/SeResourceFavourController.java
+++ /dev/null
@@ -1,69 +0,0 @@
-//package com.teaching.backend.controller.favour;
-//
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.teaching.backend.common.BaseResponse;
-//import com.teaching.backend.common.ErrorCode;
-//import com.teaching.backend.common.ResultUtils;
-//import com.teaching.backend.exception.BusinessException;
-//import com.teaching.backend.model.dto.favour.resourceFavour.ResourceFavourAddRequest;
-//import com.teaching.backend.model.dto.favour.resourceFavour.ResourceFavourQueryRequest;
-//import com.teaching.backend.model.entity.resource.CourseResources;
-//import com.teaching.backend.service.favour.SeResourceFavourService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.lang3.StringUtils;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.annotation.ResourceMysql;
-//
-///**
-// * @Author:youhang
-// * @Date:2024-05-30-20:22
-// * @Description:
-// */
-//@RestController
-//@RequestMapping("/api/resource_favour")
-//@Slf4j
-//public class SeResourceFavourController {
-//
-// @ResourceMysql
-// private SeResourceFavourService seResourceFavourService;
-//
-//
-// /**
-// * 资源收藏
-// *
-// * @param resourceFavourAddRequest
-// * @return result 执行情况
-// */
-// @PostMapping("/add")
-// // 加上 HttpServletRequest request 在一个fitter里面进行鉴权操作
-// public BaseResponse doFavour(@RequestBody ResourceFavourAddRequest resourceFavourAddRequest) {
-// if (StringUtils.isAnyBlank(resourceFavourAddRequest.getUserId())) {
-// throw new BusinessException(ErrorCode.PARAMS_ERROR);
-// }
-//
-// return seResourceFavourService.doResourceFavour(resourceFavourAddRequest.getResourceId(), resourceFavourAddRequest.getUserId());
-// }
-//
-//
-//
-//
-// /**
-// * 分页获取资源列表
-// *
-// * @return
-// */
-// @PostMapping("/list/page")
-// public BaseResponse> listPostByPage(@RequestBody ResourceFavourQueryRequest resourceFavourQueryRequest) {
-// Integer current = resourceFavourQueryRequest.getCurrent();
-// Integer size = resourceFavourQueryRequest.getPageSize();
-// String userId = resourceFavourQueryRequest.getUserId();
-// Integer type = resourceFavourQueryRequest.getType();
-// return ResultUtils.success(seResourceFavourService.listCourseFavourByPage(userId,type,current,size));
-// }
-//
-//
-//}
diff --git a/src/main/java/com/teaching/backend/controller/learn/CourseLearnController.java b/src/main/java/com/teaching/backend/controller/learn/CourseLearnController.java
new file mode 100644
index 0000000..776a93b
--- /dev/null
+++ b/src/main/java/com/teaching/backend/controller/learn/CourseLearnController.java
@@ -0,0 +1,89 @@
+package com.teaching.backend.controller.learn;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.teaching.backend.common.BaseResponse;
+import com.teaching.backend.common.ErrorCode;
+import com.teaching.backend.common.ResultUtils;
+import com.teaching.backend.filter.ValidateParams;
+import com.teaching.backend.model.dto.learn.CourseLearnDTO;
+import com.teaching.backend.service.learn.CourseLearnService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author:youhang
+ * @Date:2024-05-30-20:22
+ * @Description:
+ */
+@RestController
+@RequestMapping("/api/course_learn")
+@Slf4j
+@Api(tags = "课程学习接口")
+@Validated
+public class CourseLearnController {
+
+ @Resource
+ private CourseLearnService courseLearnService;
+
+
+ @PostMapping("/learn")
+ // HttpServletRequest request 在一个fitter里面进行鉴权操作
+ public BaseResponse doLearn(@RequestBody @Validated CourseLearnDTO courseLearnDTO) {
+
+ return courseLearnService.doLearn(courseLearnDTO.getCourseId(), courseLearnDTO.getUserId());
+
+ }
+
+
+ /**
+ * 课程学习总数
+ *
+ */
+ @PostMapping("/count")
+ // HttpServletRequest request 在一个fitter里面进行鉴权操作
+ public BaseResponse learnCount(@RequestParam String courseId) {
+ if(courseId == null){
+ return ResultUtils.error(ErrorCode.PARAMS_ERROR,"参数不能为空");
+ }
+ return courseLearnService.learnCount(courseId);
+
+ }
+
+ /**
+ * 获取当前登录用户的学习知识点记录
+ * @param pagenum
+ * @param pagesize
+ * @return
+ */
+ @ApiOperation("根据用户id查询学习记录")
+ @ValidateParams({"userId"})
+ @GetMapping("/page")
+ public BaseResponse getAll(@RequestParam(value = "pagenum", defaultValue = "1") int pagenum,
+ @RequestParam(value = "pagesize", defaultValue = "10") int pagesize,
+ @RequestParam String userId){
+ return courseLearnService.getPage(pagenum, pagesize, userId);
+ }
+
+ /**
+ * 根据ids删除
+ * @param ids
+ * @return
+ */
+ @ApiOperation("学习记录删除")
+ @DeleteMapping("/delete")
+ public BaseResponse deleteRecords(@RequestParam List ids){
+ return courseLearnService.removeCoursesRecords(ids);
+ }
+
+
+
+
+
+
+}
diff --git a/src/main/java/com/teaching/backend/controller/learn/KnowLearnController.java b/src/main/java/com/teaching/backend/controller/learn/KnowLearnController.java
new file mode 100644
index 0000000..cb05173
--- /dev/null
+++ b/src/main/java/com/teaching/backend/controller/learn/KnowLearnController.java
@@ -0,0 +1,56 @@
+package com.teaching.backend.controller.learn;
+
+import com.teaching.backend.common.BaseResponse;
+import com.teaching.backend.common.ErrorCode;
+import com.teaching.backend.common.ResultUtils;
+import com.teaching.backend.model.dto.collection.CourseCollectionDTO;
+import com.teaching.backend.model.dto.learn.KnowLearnDTO;
+import com.teaching.backend.service.collection.CourseCollectionService;
+import com.teaching.backend.service.learn.KnowLearnService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author:youhang
+ * @Date:2024-05-30-20:22
+ * @Description:
+ */
+@RestController
+@RequestMapping("/api/know_learn")
+@Slf4j
+@Api(tags = "知识点学习接口")
+@Validated
+public class KnowLearnController {
+
+ @Resource
+ private KnowLearnService knowLearnService;
+
+
+ @PostMapping("/learn")
+ // HttpServletRequest request 在一个fitter里面进行鉴权操作
+ public BaseResponse doLearn(@RequestBody @Validated KnowLearnDTO knowLearnDTO) {
+
+ return knowLearnService.doKnowLearn(knowLearnDTO.getKnowId(), knowLearnDTO.getUserId());
+
+ }
+
+
+ /**
+ * 课程收藏总数
+ *
+ */
+ @PostMapping("/count")
+ // HttpServletRequest request 在一个fitter里面进行鉴权操作
+ public BaseResponse learnnCount(@RequestParam Long knowId) {
+ return knowLearnService.learnCount(knowId);
+
+ }
+
+
+
+
+}
diff --git a/src/main/java/com/teaching/backend/controller/message/MessagesController.java b/src/main/java/com/teaching/backend/controller/message/MessagesController.java
index bfcf1c6..25fbe6e 100644
--- a/src/main/java/com/teaching/backend/controller/message/MessagesController.java
+++ b/src/main/java/com/teaching/backend/controller/message/MessagesController.java
@@ -4,20 +4,14 @@ package com.teaching.backend.controller.message;
import com.teaching.backend.common.BaseResponse;
import com.teaching.backend.common.ResultUtils;
import com.teaching.backend.filter.ValidateParams;
-import com.teaching.backend.model.dto.courses.PageDTO;
import com.teaching.backend.model.dto.message.SysMessageDTO;
import com.teaching.backend.model.entity.message.SysMessages;
-import com.teaching.backend.model.query.CourseQuery;
-import com.teaching.backend.model.query.MessagesQuery;
-import com.teaching.backend.model.vo.courses.CoursesVO;
-import com.teaching.backend.model.vo.message.SysMessageVO;
import com.teaching.backend.service.message.IMessagesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.time.LocalDateTime;
import java.util.List;
/**
diff --git a/src/main/java/com/teaching/backend/controller/records/BaseSourceApiController.java b/src/main/java/com/teaching/backend/controller/records/BaseSourceApiController.java
deleted file mode 100644
index 5253649..0000000
--- a/src/main/java/com/teaching/backend/controller/records/BaseSourceApiController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.teaching.backend.controller.records;
-
-import com.teaching.backend.config.NonStaticResourceHttpRequestHandler;
-import org.mybatis.logging.Logger;
-import org.mybatis.logging.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-
-@RestController
-@RequestMapping(value = "/api/baseResource")
-public class BaseSourceApiController {
-
-
- @Autowired
- private NonStaticResourceHttpRequestHandler nonStaticResourceHttpRequestHandler;
-
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @RequestMapping(value = "/video", method = RequestMethod.GET)
- public void video(
- HttpServletRequest request,
- HttpServletResponse response
- ) {
- try {
- String path = "D:/Users/Desktop/image/剪映/7.18/7月20.mp4";
- File file = new File(path);
- if (file.exists()) {
- request.setAttribute(NonStaticResourceHttpRequestHandler.ATTR_FILE, path);
- nonStaticResourceHttpRequestHandler.handleRequest(request, response);
- } else {
- response.setStatus(HttpServletResponse.SC_NOT_FOUND);
- response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
- }
- } catch (Exception e) {
-
- }
- }
-}
diff --git a/src/main/java/com/teaching/backend/controller/records/Bf.java b/src/main/java/com/teaching/backend/controller/records/Bf.java
deleted file mode 100644
index ab83b32..0000000
--- a/src/main/java/com/teaching/backend/controller/records/Bf.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.teaching.backend.controller.records;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.OutputStream;
-import java.util.AbstractCollection;
-@RestController
-@RequestMapping("/api/bf")
-public class Bf {
- /**
- * 根据本地图片全路径，响应给浏览器1个图片流
- */
- @RequestMapping("/showImage")
- public void showImage(HttpServletResponse response, @RequestParam("fileName")String fileName) {
- System.out.println(fileName);
- show(response,fileName,"image");
- }
-
- /**
- * 根据本地视频全路径，响应给浏览器1个视频
- */
- @RequestMapping("/showVideo")
- public void showVideo(HttpServletResponse response, @RequestParam("fileName")String fileName) {
- show(response,fileName,"video");
- }
-
- /**
- * 响应文件
- * @param response
- * @param fileName 文件全路径
- * @param type 响应流类型
- */
- public void show(HttpServletResponse response, String fileName,String type){
- try{
- FileInputStream fis = new FileInputStream(fileName); // 以byte流的方式打开文件
- int i=fis.available(); //得到文件大小
- System.out.println(i);
- byte data[]=new byte[i];
- fis.read(data); //读数据
- response.setContentType(type+"/*"); //设置返回的文件类型
- OutputStream toClient=response.getOutputStream(); //得到向客户端输出二进制数据的对象
- toClient.write(data); //输出数据
- toClient.flush();
- toClient.close();
- fis.close();
- }catch(Exception e){
- e.printStackTrace();
- System.out.println("文件不存在");
- }
- }
-}
diff --git a/src/main/java/com/teaching/backend/controller/records/CourseLearningRecordController.java b/src/main/java/com/teaching/backend/controller/records/CourseLearningRecordController.java
index f9ad0f0..d395d46 100644
--- a/src/main/java/com/teaching/backend/controller/records/CourseLearningRecordController.java
+++ b/src/main/java/com/teaching/backend/controller/records/CourseLearningRecordController.java
@@ -1,6 +1,8 @@
package com.teaching.backend.controller.records;
-import com.teaching.backend.common.CommonResult;
+import com.teaching.backend.common.ErrorCode;
+import com.teaching.backend.common.ResultUtils;
+import com.teaching.backend.model.vo.courses.CourseListVO;
import com.teaching.backend.model.vo.courses.CoursesVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -63,12 +65,12 @@ public class CourseLearningRecordController {
*/
@ApiOperation("按新旧排序查询的课程列表")
@PostMapping("/courseList")
- public CommonResult> courseList(@RequestParam String userId) {
- List coursesVOList = courseLearningRecordService.queryCourseList(userId);
+ public BaseResponse> courseList(@RequestParam String userId) {
+ List coursesVOList = courseLearningRecordService.queryCourseList(userId);
if (coursesVOList == null){
- CommonResult.failed("用户或角色错误");
+ return ResultUtils.error(ErrorCode.NOT_FOUND_ERROR,"用户或角色错误");
}
- return CommonResult.success(coursesVOList);
+ return ResultUtils.success(coursesVOList);
}
/**
@@ -77,9 +79,9 @@ public class CourseLearningRecordController {
*/
@ApiOperation("推荐课程")
@PostMapping("/recommendCourses")
- public CommonResult> recommendCourses(@RequestParam String userId) {
+ public BaseResponse> recommendCourses(@RequestParam String userId) {
List coursesVOList = courseLearningRecordService.queryrecommendCourses(userId);
- return CommonResult.success(coursesVOList);
+ return ResultUtils.success(coursesVOList);
}
}
diff --git a/src/main/java/com/teaching/backend/controller/records/KnowledgeLearningRecordController.java b/src/main/java/com/teaching/backend/controller/records/KnowledgeLearningRecordController.java
index 1faff85..f3e144a 100644
--- a/src/main/java/com/teaching/backend/controller/records/KnowledgeLearningRecordController.java
+++ b/src/main/java/com/teaching/backend/controller/records/KnowledgeLearningRecordController.java
@@ -1,14 +1,10 @@
package com.teaching.backend.controller.records;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.teaching.backend.common.BaseResponse;
-import com.teaching.backend.common.CommonResult;
+import com.teaching.backend.common.ErrorCode;
import com.teaching.backend.common.ResultUtils;
-import com.teaching.backend.filter.ValidateParams;
import com.teaching.backend.mapper.records.KnowledgeLearningRecordMapper;
-import com.teaching.backend.model.entity.records.CourseLearningRecord;
import com.teaching.backend.model.entity.records.KnowledgeLearningRecord;
-import com.teaching.backend.model.vo.courses.CoursesVO;
import com.teaching.backend.model.vo.knowGraph.KnowVO;
import com.teaching.backend.service.impl.records.KnowledgeLearningRecordServiceImpl;
import io.swagger.annotations.ApiOperation;
@@ -32,21 +28,21 @@ public class KnowledgeLearningRecordController {
return knowledgeLearningRecordService.saveCoursesRecords(knowledgeLearningRecord);
}
- /**
- * 获取当前登录用户的学习知识点记录
- * @param pagenum
- * @param pagesize
- * @return
- */
- @ApiOperation("根据用户id查询学习记录")
- @ValidateParams({"userId"})
- @GetMapping("/page")
- public BaseResponse getAll(@RequestParam(value = "pagenum", defaultValue = "1") int pagenum,
- @RequestParam(value = "pagesize", defaultValue = "10") int pagesize,
- @RequestParam String userId,
- @RequestParam String courseId){
- return knowledgeLearningRecordService.getPage(pagenum, pagesize, userId, courseId);
- }
+// /**
+// * 获取当前登录用户的学习知识点记录
+// * @param pagenum
+// * @param pagesize
+// * @return
+// */
+// @ApiOperation("根据用户id查询学习记录")
+// @ValidateParams({"userId"})
+// @GetMapping("/page")
+// public BaseResponse getAll(@RequestParam(value = "pagenum", defaultValue = "1") int pagenum,
+// @RequestParam(value = "pagesize", defaultValue = "10") int pagesize,
+// @RequestParam String userId,
+// @RequestParam String courseId){
+// return knowledgeLearningRecordService.getPage(pagenum, pagesize, userId, courseId);
+// }
/**
* 根据ids删除
@@ -77,12 +73,12 @@ public class KnowledgeLearningRecordController {
*/
@ApiOperation("查询学习最多的知识点")
@PostMapping("/studyMaxKnowledge")
- public CommonResult> studyMaxKnowledge(@RequestParam String userId) {
+ public BaseResponse> studyMaxKnowledge(@RequestParam String userId) {
List knowVO = knowledgeLearningRecordService.queryMaxKnowledge(userId);
if (knowVO == null){
- CommonResult.failed("用户或角色错误");
+ return ResultUtils.error(ErrorCode.OPERATION_ERROR,"用户或角色错误");
}
- return CommonResult.success(knowVO);
+ return ResultUtils.success(knowVO);
}
/**
@@ -91,9 +87,9 @@ public class KnowledgeLearningRecordController {
*/
@ApiOperation("推荐知识点")
@PostMapping("/recommendKnowledge")
- public CommonResult> recommendCourses(@RequestParam String userId) {
+ public BaseResponse> recommendCourses(@RequestParam String userId) {
List coursesVOList = knowledgeLearningRecordService.queryRecommendKnowledge(userId);
- return CommonResult.success(coursesVOList);
+ return ResultUtils.success(coursesVOList);
}
/**
diff --git a/src/main/java/com/teaching/backend/controller/resource/ResourceController.java b/src/main/java/com/teaching/backend/controller/resource/ResourceController.java
index f66710d..bb40739 100644
--- a/src/main/java/com/teaching/backend/controller/resource/ResourceController.java
+++ b/src/main/java/com/teaching/backend/controller/resource/ResourceController.java
@@ -8,48 +8,185 @@ package com.teaching.backend.controller.resource;
import com.teaching.backend.common.BaseResponse;
+import com.teaching.backend.model.dto.resource.ResourceRelationshipDTO;
import com.teaching.backend.model.entity.resource.ResourceMysql;
-import com.teaching.backend.model.entity.resource.Resources;
+import com.teaching.backend.service.resource.ResourceGraphService;
+import com.teaching.backend.service.resource.ResourceRelationshipService;
import com.teaching.backend.service.resource.ResourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
@RestController
@RequestMapping("/api/resource")
@Api(tags= "资源管理")
+@Validated
public class ResourceController {
@Autowired
private ResourceService resourceService;
+ @Autowired
+ private ResourceGraphService resourceGraphService;
+
+ @Autowired
+ private ResourceRelationshipService resourceRelationshipService;
+
+
+
+
+//
+// //添加知识点
+// @PostMapping("/upload")
+// @ResponseBody
+// @ApiOperation(value = "添加资源")
+// public BaseResponse uploadFile(@RequestPart("file") MultipartFile file) {
+// return resourceService.upload(file);
+// }
+
+// //删除资源
+// @GetMapping ("/deleteFile")
+// @ResponseBody
+// @ApiOperation(value = "删除资源")
+// public BaseResponse deleteResource(@RequestParam("filename") @NotBlank String filename) {
+// return resourceService.delete(filename);
+// }
- //添加知识点
- @PostMapping("/upload")
+// @GetMapping("/read")
+// @ApiOperation(value = "查询资源")
+// public ResponseEntity readFile(@RequestParam @NotBlank String filename) {
+// return resourceService.readFile(filename);
+// }
+//
+
+ @PostMapping("/add")
@ResponseBody
@ApiOperation(value = "添加资源")
- public BaseResponse uploadFile(@RequestPart("file") MultipartFile file) {
- return resourceService.upload(file);
+ public BaseResponse addResourceForMysql(@RequestPart("file") MultipartFile file,@RequestParam Long knowId){
+ return resourceService.addResourceForMysql(file,knowId);
}
- //删除资源
- @GetMapping ("delete")
- @ResponseBody
+ @GetMapping("/delete")
@ApiOperation(value = "删除资源")
- public BaseResponse deleteResource(@RequestParam("filename") String filename) {
- return resourceService.delete(filename);
+ public BaseResponse