From ef13714a95bf9f82e423ff17581e04ed252a8b77 Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Tue, 19 May 2020 02:26:27 +0800
Subject: [PATCH] =?UTF-8?q?[fix][M]:=20=E5=AE=8C=E5=96=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=87=BD=E6=95=B0=EF=BC=8C=E5=B9=B6=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95ID?=
 =?UTF-8?q?=E5=92=8C=E5=AD=A6=E5=B9=B4=E5=AD=A6=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserCourseController.java      | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java b/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java
index ffe608a..a0099f1 100644
--- a/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java
+++ b/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java
@@ -18,6 +18,9 @@ public class UserCourseController {
     @Autowired
     private UserCourseService usercourseService;
 
+    @Autowired
+    private UserController userController;
+
     // 根据id查看课程记录
     @GetMapping(value = "/findusercourse/{uc_id}")
     public ResultVO<Map<String, UserCourseBean>> FindUserCourseId(@PathVariable("uc_id") Integer uc_id) {
@@ -39,13 +42,26 @@ public class UserCourseController {
         return ResultVOUtil.success(usercourselist);
     }
 
+    // author 吴志岳
+    // 根据用户登录id和学年，学期查询课程
+    @GetMapping(value = "/findbyyearandsemester/{year}/{semester}")
+    public ResultVO<Map<String, UserCourseBean>> findUidandYearandSemester(@PathVariable("year") String year,@PathVariable("semester") Integer semester,HttpServletRequest request) {
+        List<UserCourseBean> usercourselist = usercourseService.findAllByUidAndYearAndSemester(userController.getUIdByCookie(request),year,semester) ;
+        return ResultVOUtil.success(usercourselist);
+    }
+
 
     // 增加课程记录
     @PostMapping(value = "/addusercourse", consumes = "application/json")
-    public ResultVO addUserCourse(@RequestBody Map<String,Object> map) {
+    public ResultVO addUserCourse(@RequestBody Map<String,Object> map,HttpServletRequest request) {
         // 1.转换对象
         UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class);
-        // 2.插入
+
+        // author 吴志岳
+        // 2.设置用户ID
+        usercourse.setUId(userController.getUIdByCookie(request));
+
+        // 3.插入
         usercourseService.add(usercourse);
         return ResultVOUtil.success();
     }
@@ -56,12 +72,16 @@ public class UserCourseController {
         // 转换对象
         UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class);
 
+        // author 吴志岳
+        // 2.设置用户ID
+        usercourse.setUId(userController.getUIdByCookie(request));
+
         UserCourseBean usercoursenew = usercourseService.update(usercourse) ;
         return ResultVOUtil.success(usercoursenew);
     }
 
     // 通过uc_id删除记录
-    @PostMapping(value = "/deleteusercourse/{uc_id}", consumes = "application/json")
+    @PostMapping(value = "/deleteusercourse/{uc_id}")
     public ResultVO deleteUsercourse(@PathVariable("uc_id") Integer uc_id){
         // 查找该用户看是否存在
         UserCourseBean usercourse = usercourseService.findById(uc_id);