From 3742d0e1df1743cf2438f8a3bac6695b8000d135 Mon Sep 17 00:00:00 2001 From: "1035134717@qq.com" <1035134717@qq.com> Date: Sat, 23 May 2020 21:34:49 +0800 Subject: [PATCH] =?UTF-8?q?[feat][M]:=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87l?= =?UTF-8?q?ab=E6=9F=A5=E6=89=BE=E5=AE=9E=E9=AA=8C=E5=AE=A4=E5=8F=AF?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4=E6=AE=B5=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzu/bookingsystem/bean/LabTimeBean.java | 30 ++++++++-------- .../controller/LabTimeController.java | 34 ++++++++++++++++--- .../com/hzu/bookingsystem/dto/LabTimeDTO.java | 10 +++--- .../repository/LabTimeRepository.java | 6 ++-- .../bookingsystem/service/LabTimeService.java | 6 ++-- .../service/impl/LabTimeServiceImpl.java | 6 ++-- java/src/main/resources/application.yml | 2 +- .../BookingsystemApplicationTests.java | 7 ++-- 8 files changed, 64 insertions(+), 37 deletions(-) diff --git a/java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java b/java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java index ae93305..00f488b 100644 --- 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; } diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/LabTimeController.java b/java/src/main/java/com/hzu/bookingsystem/controller/LabTimeController.java index df75548..aaadda5 100644 --- 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> findByLabTimeId(@RequestParam("LabTimeId") Integer labTimeId){ - LabTimeBean labTime1 = labTimeService.findByLtId(labTimeId); + //通过ltId查找实验室预约时间段 + @GetMapping(value = "/findLabTimeById") + public ResultVO> 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> findLabTimeByLabIdAndYearAndSemester(@RequestParam("labId") Integer lab_id , @RequestParam("year") String year , @RequestParam("semester") Integer semester , @RequestParam("status") Integer status){ + List 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 labTimelist = labTimeService.findAll(); + return ResultVOUtil.success(labTimelist); + } + } diff --git a/java/src/main/java/com/hzu/bookingsystem/dto/LabTimeDTO.java b/java/src/main/java/com/hzu/bookingsystem/dto/LabTimeDTO.java index c4f9322..ad45cac 100644 --- 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; diff --git a/java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java b/java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java index 8b06cda..1961198 100644 --- 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 { * @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 findByLabIdAndYearAndSemester(Integer lab_id,String year,Integer semester) ; } diff --git a/java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java b/java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java index e60a389..a3ee456 100644 --- 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 findByLabIdAndYearAndSemester(Integer lab_id,String year,Integer semester) ; /** * 查找所有实约时间信息 diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/LabTimeServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/LabTimeServiceImpl.java index 8d5a9ed..617b23f 100644 --- 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 findByLabIdAndYearAndSemester(Integer lab_id,String year,Integer semester){ + return labTimeRepository.findByLabIdAndYearAndSemester(lab_id , year , semester); } @Override diff --git a/java/src/main/resources/application.yml b/java/src/main/resources/application.yml index 62da168..13ff88e 100644 --- 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 diff --git a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java b/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java index 3d9e32d..8c21e38 100644 --- 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); } } +*/