Merge branch 'master' of http://bdgit.educoder.net/p35z7urxv/pqa2fspn3

java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java

@@ -25,19 +25,19 @@ public class LabTimeBean {
     private String year;
 
     // 学期
-    private String semester;
+    private Integer semester;
 
     // 几周
-    private String week;
+    private Integer week;
 
     // 周几
-    private String day;
+    private Integer day;
 
     // 第几节课
-    private String time;
+    private Integer time;
 
     // 状态
-    private String status;
+    private Integer status;
 
     //备注
     private String remind;
@@ -78,43 +78,43 @@ public class LabTimeBean {
         this.year = year;
     }
 
-    public String getSemester() {
+    public Integer getSemester() {
         return semester;
     }
 
-    public void setSemester(String semester) {
+    public void setSemester(Integer semester) {
         this.semester = semester;
     }
 
-    public String getWeek() {
+    public Integer getWeek() {
         return week;
     }
 
-    public void setWeek(String week) {
+    public void setWeek(Integer week) {
         this.week = week;
     }
 
-    public String getDay() {
+    public Integer getDay() {
         return day;
     }
 
-    public void setDay(String day) {
+    public void setDay(Integer day) {
         this.day = day;
     }
 
-    public String getTime() {
+    public Integer getTime() {
         return time;
     }
 
-    public void setTime(String time) {
+    public void setTime(Integer time) {
         this.time = time;
     }
 
-    public String getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 

java/src/main/java/com/hzu/bookingsystem/controller/LabTimeController.java

@@ -36,7 +36,7 @@ public class LabTimeController {
     }
 
     //通过ltId删除实验室可预约时间段
-    @PostMapping(value = "/deleteLabTime" , consumes = "application/json")
+    @PostMapping(value = "/deleteLabTime")
     public ResultVO deleteLabTime(@RequestBody LabTimeBean labTime){
         //查找实验室是否存在
         LabTimeBean labTime1 = labTimeService.findByLtId(labTime.getLtId());
@@ -61,14 +61,31 @@ public class LabTimeController {
         return ResultVOUtil.success();
     }
 
-    //查找实验室
-    @GetMapping(value = "/findByLabIdTime" , consumes = "application/json")
-    public ResultVO<Map<String,Object>> findByLabTimeId(@RequestParam("LabTimeId") Integer labTimeId){
-        LabTimeBean labTime1 = labTimeService.findByLtId(labTimeId);
+    //通过ltId查找实验室预约时间段
+    @GetMapping(value = "/findLabTimeById")
+    public ResultVO<Map<String,Object>> findLabTimeById(@RequestParam("ltId") Integer lt_id){
+        LabTimeBean labTime1 = labTimeService.findByLtId(lt_id);
         System.out.println(labTime1);
         return ResultVOUtil.success(labTime1);
     }
 
+    //查找实验室可预约时间段
+    @GetMapping(value = "/findlabtimebylabidandyearandsemester")
+    public ResultVO<Map<String,Object>> findLabTimeByLabIdAndYearAndSemester(@RequestParam("labId") Integer lab_id , @RequestParam("year") String year , @RequestParam("semester") Integer semester , @RequestParam("status") Integer status){
+        List<LabTimeBean> labTimeList1 = labTimeService.findByLabIdAndYearAndSemester(lab_id , year , semester);
+        System.out.println(labTimeList1);
+        LabTimeBean array[] = new LabTimeBean[labTimeList1.size()];
+        int i = 0;
+        for(LabTimeBean labtime : labTimeList1){
+            if (labtime.getStatus().equals(status)) {
+                    System.out.println(labtime.getTime());
+                    array[i] = labtime;
+                    i++;
+                }
+            }
+        return ResultVOUtil.success(array);
+    }
+
     //查找所有实验室列表
     @GetMapping(value = "/getLabListTime")
     public ResultVO getLabTimeList(){
@@ -76,4 +93,11 @@ public class LabTimeController {
         return ResultVOUtil.success(labTimeList);
     }
 
+    // 查找所有课程列表
+    @GetMapping(value = "/getLabTimelist")
+    public ResultVO getUserCourseList(){
+        List<LabTimeBean> labTimelist = labTimeService.findAll();
+        return ResultVOUtil.success(labTimelist);
+    }
+
 }

java/src/main/java/com/hzu/bookingsystem/dto/LabTimeDTO.java

@@ -18,19 +18,19 @@ public class LabTimeDTO {
     private String year;
 
     // 学期
-    private String semester;
+    private Integer semester;
 
     // 几周
-    private String week;
+    private Integer week;
 
     // 周几
-    private String day;
+    private Integer day;
 
     // 第几节课
-    private String time;
+    private Integer time;
 
     // 状态
-    private String status;
+    private Integer status;
 
     //备注
     private String remind;

java/src/main/java/com/hzu/bookingsystem/repository/LabRecordRepository.java

@@ -24,6 +24,7 @@ public interface LabRecordRepository extends JpaRepository<LabRecordBean,String>
 
     void deleteBylrId(Integer lt_id);
 
+    LabRecordBean findByUcId(Integer uc_id);
 
 
 

java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java

@@ -44,14 +44,14 @@ public interface LabTimeRepository extends JpaRepository<LabTimeBean,String> {
      * @param time
      * @return
      */
-    LabTimeBean findByTime(String time);
+    LabTimeBean findByTime(Integer time);
 
     /**
      * 通过学期、周、星期、上课时间查找实验室可预约时间段
      *
-     * @param year、weeks、day、time
+     * @param lab_id、year、semester
      * @return
      */
-    LabTimeBean findByYear(String year);
+    List<LabTimeBean> findByLabIdAndYearAndSemester(Integer lab_id,String year,Integer semester) ;
 
 }

java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java

@@ -48,7 +48,21 @@ public interface LabRecordService {
      */
     void deleteById(Integer lr_id);
 
+    /**
+     * 根据ucid查出实验室记录
+     * @param uc_id
+     * @return
+     */
+    LabRecordBean findByUcId(Integer uc_id);
 
+    /**
+     * 根据教师id和学年，学期查询课表
+     * @param u_id
+     * @param year
+     * @param semester
+     * @return
+     */
+    String[][][] getcourseByuser(Integer u_id , String year ,Integer semester ) ;
 
 
 

java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java

@@ -59,15 +59,15 @@ public interface LabTimeService {
      * @param time
      * @return
      */
-    LabTimeBean findByTime(String time);
+    LabTimeBean findByTime(Integer time);
 
     /**
      * 通过学期、周、星期、上课时间查找实验室可预约时间段
      *
-     * @param year、weeks、day、time
+     * @param lab_id、year、semester
      * @return
      */
-    LabTimeBean findByYear(String year);
+    List<LabTimeBean> findByLabIdAndYearAndSemester(Integer lab_id,String year,Integer semester) ;
 
     /**
      * 查找所有实约时间信息

java/src/main/java/com/hzu/bookingsystem/service/impl/LabRecordServiceImpl.java

@@ -1,8 +1,12 @@
 package com.hzu.bookingsystem.service.impl;
 
 import com.hzu.bookingsystem.bean.LabRecordBean;
+import com.hzu.bookingsystem.bean.LabTimeBean;
+import com.hzu.bookingsystem.bean.UserCourseBean;
 import com.hzu.bookingsystem.repository.LabRecordRepository;
 import com.hzu.bookingsystem.service.LabRecordService;
+import com.hzu.bookingsystem.service.LabTimeService;
+import com.hzu.bookingsystem.service.UserCourseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +18,10 @@ import java.util.List;
 public class LabRecordServiceImpl implements LabRecordService{
     @Resource
     private LabRecordRepository labrecordRepository;
+    @Resource
+    private UserCourseService usercourseservice  ;
+    @Resource
+    private LabTimeService labtimeservice  ;
 
     @Override
     public LabRecordBean add(LabRecordBean labrcecord) {
@@ -23,10 +31,12 @@ public class LabRecordServiceImpl implements LabRecordService{
 
     @Override
     public List<LabRecordBean> findAll() {
+
         return labrecordRepository.findAll();
     }
     @Override
     public List<LabRecordBean> findByStatus(Integer status) {
+
         return labrecordRepository.findByStatus(status);
     }
 
@@ -46,4 +56,27 @@ public class LabRecordServiceImpl implements LabRecordService{
         labrecordRepository.deleteBylrId(lr_id);
     }
 
+
+    @Override
+    public LabRecordBean findByUcId(Integer uc_id) {
+        return labrecordRepository.findByUcId(uc_id);
+    }
+
+    @Override
+    public String[][][] getcourseByuser(Integer u_id , String year ,Integer semester ) {
+        String value[][][] = new String[7][5][20] ;
+        List<UserCourseBean> usercourses=usercourseservice.findAllByUidAndYearAndSemester(u_id,year,semester) ;
+        for ( UserCourseBean uc : usercourses)
+        {
+            LabRecordBean labrecord = findByUcId(uc.getUcId()) ;
+            LabTimeBean labtime=labtimeservice.findByLtId(labrecord.getLtId());
+
+            Integer day= Integer.valueOf(labtime.getTime()) -1 ;
+            Integer time= Integer.valueOf(labtime.getTime()) -1 ;
+            Integer week= Integer.valueOf(labtime.getWeek()) -1 ;
+
+            value[day][time][week] =uc.getName() ;
+        }
+        return value ;
+    }
 }

java/src/main/java/com/hzu/bookingsystem/service/impl/LabTimeServiceImpl.java

@@ -58,13 +58,13 @@ public class LabTimeServiceImpl implements LabTimeService {
     }
 
     @Override
-    public LabTimeBean findByTime(String time){
+    public LabTimeBean findByTime(Integer time){
         return labTimeRepository.findByTime(time);
     }
 
     @Override
-    public LabTimeBean findByYear(String year){
-        return labTimeRepository.findByYear(year);
+    public List<LabTimeBean> findByLabIdAndYearAndSemester(Integer lab_id,String year,Integer semester){
+        return labTimeRepository.findByLabIdAndYearAndSemester(lab_id , year , semester);
     }
 
     @Override

java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java

@@ -32,6 +32,7 @@ class BookingsystemApplicationTests {
 
     @Autowired
     private LabTimeService labTimeService;
+
     @Test
 
 //    public void test(){
@@ -48,12 +49,13 @@ class BookingsystemApplicationTests {
 //        labService.deleteById(1);
 //
 //    }
-    public void test(){
+    public void test() {
         LabTimeBean lab = new LabTimeBean();
         System.out.println(labTimeService.findAll());
 
     }
-
+}
+/*
     @Autowired
     private UserService userService;
     @Autowired
@@ -117,3 +119,4 @@ class BookingsystemApplicationTests {
 //        userCourseService.add(userCourseBean);
     }
 }
+*/