From 0c7eb9897833d957535ab7d37c0aaa4129e41bf7 Mon Sep 17 00:00:00 2001 From: "1035134717@qq.com" <1035134717@qq.com> Date: Fri, 8 May 2020 17:08:56 +0800 Subject: [PATCH] =?UTF-8?q?[feat][M]:=E5=A2=9E=E5=8A=A0=E4=BA=86Lab?= =?UTF-8?q?=E7=B1=BB=E5=92=8CLabTime=E7=B1=BB=E7=9A=84=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzu/bookingsystem/bean/LabBean.java | 2 +- .../hzu/bookingsystem/bean/LabTimeBean.java | 6 +- .../repository/LabRepository.java | 50 +++++++++++++ .../repository/LabTimeRepository.java | 57 +++++++++++++++ .../hzu/bookingsystem/service/LabService.java | 63 ++++++++++++++++ .../bookingsystem/service/LabTimeService.java | 71 +++++++++++++++++++ .../service/impl/LabServiceImpl.java | 55 ++++++++++++++ .../service/impl/LabTimeServiceImpl.java | 60 ++++++++++++++++ .../BookingsystemApplicationTests.java | 27 +++++++ 9 files changed, 387 insertions(+), 4 deletions(-) create mode 100644 java/src/main/java/com/hzu/bookingsystem/repository/LabRepository.java create mode 100644 java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java create mode 100644 java/src/main/java/com/hzu/bookingsystem/service/LabService.java create mode 100644 java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java create mode 100644 java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java create mode 100644 java/src/main/java/com/hzu/bookingsystem/service/impl/LabTimeServiceImpl.java diff --git a/java/src/main/java/com/hzu/bookingsystem/bean/LabBean.java b/java/src/main/java/com/hzu/bookingsystem/bean/LabBean.java index 6aaab74..27f7aff 100644 --- a/java/src/main/java/com/hzu/bookingsystem/bean/LabBean.java +++ b/java/src/main/java/com/hzu/bookingsystem/bean/LabBean.java @@ -26,7 +26,7 @@ public class LabBean { private String position; // 实验室容量 - private String capacity; + private Integer capacity; // 实验室含有的软件（逗号隔开） private String software; 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 b01f60e..77e4d45 100644 --- a/java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java +++ b/java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java @@ -28,13 +28,13 @@ public class LabTimeBean { private String semester; // 几周 - private Integer week; + private String week; // 周几 - private Integer day; + private String day; // 第几节课 - private Integer time; + private String time; // 状态 private Integer status; diff --git a/java/src/main/java/com/hzu/bookingsystem/repository/LabRepository.java b/java/src/main/java/com/hzu/bookingsystem/repository/LabRepository.java new file mode 100644 index 0000000..7b4f2ab --- /dev/null +++ b/java/src/main/java/com/hzu/bookingsystem/repository/LabRepository.java @@ -0,0 +1,50 @@ +package com.hzu.bookingsystem.repository; + + +import com.hzu.bookingsystem.bean.LabBean; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +/** + * author 莫家豪 + */ +public interface LabRepository extends JpaRepository { + + /** + * 通过lab_id删除实验室 + * + * @param labId + * @return + */ + void deleteByLabId(Integer labId); + + + // 查找所有用户 + List findAll(); + + /** + * 通过lab_id查找实验室 + * + * @param labId + * @return + */ + LabBean findByLabId(Integer labId); + + /** + * 通过name查找实验室 + * + * @param name + * @return + */ + LabBean findByName(String name); + + /** + * 通过position查找实验室 + * + * @param position + * @return + */ + LabBean findByPosition(String position); + +} diff --git a/java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java b/java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java new file mode 100644 index 0000000..f925977 --- /dev/null +++ b/java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java @@ -0,0 +1,57 @@ +package com.hzu.bookingsystem.repository; + + +import com.hzu.bookingsystem.bean.LabTimeBean; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +/** + * author 莫家豪 + */ +public interface LabTimeRepository extends JpaRepository { + + /** + * 通过lt_id删除实验室 + * + * @param ltId + * @return + */ + void deleteByLtId(Integer ltId); + + // 查找所有用户 + List findAll(); + + /** + * 通过lt_id查找实验室可预约时间段 + * + * @param ltId + * @return + */ + LabTimeBean findByLtId(Integer ltId); + + /** + * 通过状态查找实验室可预约时间段 + * + * @param status + * @return + */ + LabTimeBean findByStatus(Integer status); + + /** + * 通过上课时间查找实验室可预约时间段 + * + * @param time + * @return + */ + LabTimeBean findByTime(String time); + + /** + * 通过学期、周、星期、上课时间查找实验室可预约时间段 + * + * @param year、weeks、day、time + * @return + */ + LabTimeBean findByYear(String year); + +} diff --git a/java/src/main/java/com/hzu/bookingsystem/service/LabService.java b/java/src/main/java/com/hzu/bookingsystem/service/LabService.java new file mode 100644 index 0000000..c119714 --- /dev/null +++ b/java/src/main/java/com/hzu/bookingsystem/service/LabService.java @@ -0,0 +1,63 @@ +package com.hzu.bookingsystem.service; + + +import com.hzu.bookingsystem.bean.LabBean; + +import java.util.List; +/** + * author 莫家豪 + */ +public interface LabService { + + /** + * 创建实验室 + * + * @param lab + * @return + */ + LabBean add(LabBean lab); + + /** + * 通过lab_id删除实验室 + * + * @param labId + * @return + */ + void deleteByLabId(Integer labId); + + /** + * 修改实验室 + * + * @param lab + * @return + */ + LabBean update(LabBean lab); + + // 查找所有用户 + List findAll(); + + /** + * 通过lab_id查找实验室 + * + * @param labId + * @return + */ + LabBean findByLabId(Integer labId); + + /** + * 通过name查找实验室 + * + * @param name + * @return + */ + LabBean findByName(String name); + + /** + * 通过position查找实验室 + * + * @param position + * @return + */ + LabBean findByPosition(String position); + +} \ No newline at end of file diff --git a/java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java b/java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java new file mode 100644 index 0000000..47d4970 --- /dev/null +++ b/java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java @@ -0,0 +1,71 @@ +package com.hzu.bookingsystem.service; + + +import com.hzu.bookingsystem.bean.LabTimeBean; + +import java.util.List; +/** + * author 莫家豪 + */ +public interface LabTimeService { + + /** + * 创建实验室可申请时间段 + * + * @param labTime + * @return + */ + LabTimeBean add(LabTimeBean labTime); + + /** + * 通过lt_id删除实验室 + * + * @param ltID + * @return + */ + void deleteByLtId(Integer ltID); + + /** + * 修改实验室 + * + * @param labTime + * @return + */ + LabTimeBean update(LabTimeBean labTime); + + // 查找所有用户 + List findAll(); + + /** + * 通过lt_id查找实验室可预约时间段 + * + * @param ltId + * @return + */ + LabTimeBean findByLtId(Integer ltId); + + /** + * 通过状态查找实验室可预约时间段 + * + * @param status + * @return + */ + LabTimeBean findByStatus(Integer status); + + /** + * 通过上课时间查找实验室可预约时间段 + * + * @param time + * @return + */ + LabTimeBean findByTime(String time); + + /** + * 通过学期、周、星期、上课时间查找实验室可预约时间段 + * + * @param year、weeks、day、time + * @return + */ + LabTimeBean findByYear(String year); + +} \ No newline at end of file diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java new file mode 100644 index 0000000..1d68ebc --- /dev/null +++ b/java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java @@ -0,0 +1,55 @@ +package com.hzu.bookingsystem.service.impl; + +import com.hzu.bookingsystem.bean.LabBean; +import com.hzu.bookingsystem.repository.LabRepository; +import com.hzu.bookingsystem.service.LabService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.transaction.Transactional; +import java.util.List; +/** + * author 莫家豪 + */ +@Service +public class LabServiceImpl implements LabService { + @Resource + private LabRepository labRepository; + + @Override + public LabBean add(LabBean lab) { + return labRepository.save(lab); + } + + @Override + @Transactional + public void deleteByLabId(Integer labId){ + labRepository.deleteByLabId(labId); + } + + @Override + public LabBean update(LabBean lab){ + return labRepository.save(lab); + } + + @Override + public List findAll() { + return labRepository.findAll(); + } + + @Override + public LabBean findByLabId(Integer labId){ + return labRepository.findByLabId(labId); + } + + @Override + public LabBean findByName(String name) { + return labRepository.findByName(name); + } + + @Override + public LabBean findByPosition(String position){ + return labRepository.findByPosition(position); + } + +} 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 new file mode 100644 index 0000000..007e697 --- /dev/null +++ b/java/src/main/java/com/hzu/bookingsystem/service/impl/LabTimeServiceImpl.java @@ -0,0 +1,60 @@ +package com.hzu.bookingsystem.service.impl; + +import com.hzu.bookingsystem.bean.LabTimeBean; +import com.hzu.bookingsystem.repository.LabTimeRepository; +import com.hzu.bookingsystem.service.LabTimeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.transaction.Transactional; +import java.util.List; +/** + * author 莫家豪 + */ +@Service +public class LabTimeServiceImpl implements LabTimeService { + @Resource + private LabTimeRepository labTimeRepository; + + @Override + public LabTimeBean add(LabTimeBean lab) { + return labTimeRepository.save(lab); + } + + @Override + @Transactional + public void deleteByLtId(Integer ltId){ + labTimeRepository.deleteByLtId(ltId); + } + + @Override + public LabTimeBean update(LabTimeBean labTime){ + return labTimeRepository.save(labTime); + } + + @Override + public List findAll() { + return labTimeRepository.findAll(); + } + + @Override + public LabTimeBean findByLtId(Integer ltId){ + return labTimeRepository.findByLtId(ltId); + } + + @Override + public LabTimeBean findByStatus(Integer status) { + return labTimeRepository.findByStatus(status); + } + + @Override + public LabTimeBean findByTime(String time){ + return labTimeRepository.findByTime(time); + } + + @Override + public LabTimeBean findByYear(String year){ + return labTimeRepository.findByYear(year); + } + +} \ No newline at end of file diff --git a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java b/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java index 48e3fdf..4805a05 100644 --- a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java +++ b/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java @@ -1,7 +1,9 @@ package com.hzu.bookingsystem; +import com.hzu.bookingsystem.bean.LabTimeBean; import com.hzu.bookingsystem.bean.UserBean; import com.hzu.bookingsystem.dto.UserDTO; +import com.hzu.bookingsystem.service.LabTimeService; import com.hzu.bookingsystem.service.UserService; import org.junit.jupiter.api.Test; @@ -17,6 +19,30 @@ class BookingsystemApplicationTests { void contextLoads() { } + @Autowired + private LabTimeService labTimeService; + @Test + +// public void test(){ +// LabBean lab = new LabBean(); +// lab.setLabId(1); +// lab.setName("android实验室"); +// lab.setPosition("5-501"); +// lab.setCapacity(50); +// lab.setSoftware("android studio"); +// lab.setManagerId(321); +// System.out.println(labService.findAll()); +// labService.add(lab); +// labService.save(lab); +// labService.deleteById(1); +// +// } + public void test(){ + LabTimeBean lab = new LabTimeBean(); + System.out.println(labTimeService.findAll()); + + } + /* @Autowired private UserService userService; @Test @@ -34,4 +60,5 @@ class BookingsystemApplicationTests { List userDTOList = userService.findAllUserInfo(); System.out.println(userDTOList); } + */ }