[feat][M]:新增通过lab查找实验室可预约时间段，不可预约时间段

5 years ago · 3742d0e1df
parent e61d7d5576
commit 3742d0e1df
8 changed files with 64 additions and 37 deletions
--- a/java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java
+++ b/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;
    }

--- a/java/src/main/java/com/hzu/bookingsystem/controller/LabTimeController.java
+++ b/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);
+    }
+
 }
--- a/java/src/main/java/com/hzu/bookingsystem/dto/LabTimeDTO.java
+++ b/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;
--- a/java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java
+++ b/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) ;

 }
--- a/java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java
+++ b/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) ;

    /**
     * 查找所有实约时间信息
--- a/java/src/main/java/com/hzu/bookingsystem/service/impl/LabTimeServiceImpl.java
+++ b/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
--- a/java/src/main/resources/application.yml
+++ b/java/src/main/resources/application.yml
@ -1,7 +1,7 @@
 spring:
  datasource:
    username: root
-    password: 123456
+    password: hidongdongdong
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/lab_booking?characterEncoding=utf-8&serverTimezone=UTC
    type: com.alibaba.druid.pool.DruidDataSource
--- a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java
+++ b/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);
    }
 }
+*/