diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java b/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java index 5817117..61b205f 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java +++ b/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java @@ -34,28 +34,28 @@ public class LabRecordController { @Autowired private UserController userController; - // 根据id查看实验室记录 - @GetMapping(value = "/findlabrecord/{lr_id}") - public ResultVO> FindLabRecordId(@PathVariable("lr_id") Integer lr_id) { - LabRecordBean labrecord = labrecordService.findById(lr_id); - return ResultVOUtil.success(labrecord); - } - - // 查找所有记录列表 - @GetMapping(value = "/getlabrecordlist") - public ResultVO getLabRecordList() { - - List labrecordList = labrecordService.findAll(); - return ResultVOUtil.success(labrecordList); - } +// // 根据id查看实验室记录 +// @GetMapping(value = "/findlabrecord/{lr_id}") +// public ResultVO> FindLabRecordId(@PathVariable("lr_id") Integer lr_id) { +// LabRecordBean labrecord = labrecordService.findById(lr_id); +// return ResultVOUtil.success(labrecord); +// } - // 查找所有记录审核/未审核 - @GetMapping(value = "/findstatus/{status}") - public ResultVO findStatus(@PathVariable("status") Integer status) { +// // 查找所有记录列表 +// @GetMapping(value = "/getlabrecordlist") +// public ResultVO getLabRecordList() { +// +// List labrecordList = labrecordService.findAll(); +// return ResultVOUtil.success(labrecordList); +// } - List labrecordstatusList = labrecordService.findByStatus(status); - return ResultVOUtil.success(labrecordstatusList); - } +// // 查找所有记录审核/未审核 +// @GetMapping(value = "/findstatus/{status}") +// public ResultVO findStatus(@PathVariable("status") Integer status) { +// +// List labrecordstatusList = labrecordService.findByStatus(status); +// return ResultVOUtil.success(labrecordstatusList); +// } // 增加申请记录 @PostMapping(value = "/addlabrecord", consumes = "application/json") @@ -73,18 +73,18 @@ public class LabRecordController { return ResultVOUtil.success(labrecordnew); } - // 通过lr_id删除记录 - @PostMapping(value = "/deletelabrecord/{lr_id}", consumes = "application/json") - public ResultVO deleteLabRecord(@PathVariable("lr_id") Integer lr_id) { - // 查找该用户看是否存在 - LabRecordBean labrecord = labrecordService.findById(lr_id); - if (labrecord == null) { - return ResultVOUtil.error(-1, "记录不存在"); - } - // 删除记录 - labrecordService.deleteById(lr_id); - return ResultVOUtil.success(); - } +// // 通过lr_id删除记录 +// @PostMapping(value = "/deletelabrecord/{lr_id}", consumes = "application/json") +// public ResultVO deleteLabRecord(@PathVariable("lr_id") Integer lr_id) { +// // 查找该用户看是否存在 +// LabRecordBean labrecord = labrecordService.findById(lr_id); +// if (labrecord == null) { +// return ResultVOUtil.error(-1, "记录不存在"); +// } +// // 删除记录 +// labrecordService.deleteById(lr_id); +// return ResultVOUtil.success(); +// } /** * author 吴志岳 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 ba18040..1d305a2 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/LabTimeController.java +++ b/java/src/main/java/com/hzu/bookingsystem/controller/LabTimeController.java @@ -26,52 +26,52 @@ public class LabTimeController { private UserController userController; //创建实验室可预约时间段 - @PostMapping(value = "/addLabTime", consumes = "application/json") - public ResultVO addLabTime(@RequestBody Map map) { - //转换对象 - LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class); - System.out.println(labTime1); - //查重 - if (labTimeService.findByTime(labTime1.getTime()) != null) { - return ResultVOUtil.error(-1, "该时间段已存在"); - } - labTimeService.add(labTime1); - return ResultVOUtil.success(); - } +// @PostMapping(value = "/addLabTime", consumes = "application/json") +// public ResultVO addLabTime(@RequestBody Map map) { +// //转换对象 +// LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class); +// System.out.println(labTime1); +// //查重 +// if (labTimeService.findByTime(labTime1.getTime()) != null) { +// return ResultVOUtil.error(-1, "该时间段已存在"); +// } +// labTimeService.add(labTime1); +// return ResultVOUtil.success(); +// } //通过ltId删除实验室可预约时间段 - @PostMapping(value = "/deleteLabTime") - public ResultVO deleteLabTime(@RequestBody LabTimeBean labTime) { - //查找实验室是否存在 - LabTimeBean labTime1 = labTimeService.findByLtId(labTime.getLtId()); - if (labTime1 == null) { - return ResultVOUtil.error(-1, "该时间段不存在"); - } else { - labTimeService.deleteByLtId(labTime1.getLabId()); - } - return ResultVOUtil.success(); - } +// @PostMapping(value = "/deleteLabTime") +// public ResultVO deleteLabTime(@RequestBody LabTimeBean labTime) { +// //查找实验室是否存在 +// LabTimeBean labTime1 = labTimeService.findByLtId(labTime.getLtId()); +// if (labTime1 == null) { +// return ResultVOUtil.error(-1, "该时间段不存在"); +// } else { +// labTimeService.deleteByLtId(labTime1.getLabId()); +// } +// return ResultVOUtil.success(); +// } //修改实验室可预约时间段 - @PostMapping(value = "/updateLabTimeOld", consumes = "application/json") - public ResultVO updateLabTimeOld(@RequestBody Map map, HttpServletRequest request) { - //转换对象 - LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class); - if (labTime1.getLtId() == null) { - return ResultVOUtil.error(-1, "该实验室不存在,无法修改"); - } else { - labTimeService.update(labTime1); - } - return ResultVOUtil.success(); - } +// @PostMapping(value = "/updateLabTimeOld", consumes = "application/json") +// public ResultVO updateLabTimeOld(@RequestBody Map map, HttpServletRequest request) { +// //转换对象 +// LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class); +// if (labTime1.getLtId() == null) { +// return ResultVOUtil.error(-1, "该实验室不存在,无法修改"); +// } else { +// labTimeService.update(labTime1); +// } +// return ResultVOUtil.success(); +// } //通过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 = "/findLabTimeById") +// public ResultVO> findLabTimeById(@RequestParam("ltId") Integer lt_id) { +// LabTimeBean labTime1 = labTimeService.findByLtId(lt_id); +// System.out.println(labTime1); +// return ResultVOUtil.success(labTime1); +// } //查找实验室预约周次(包含已预约) // author 吴志岳 @@ -186,7 +186,7 @@ public class LabTimeController { } /** - * 获取实验室可被预约的【5】【7】时间表 + * 获取用户可预约的【5】【7】时间表 * * @param lab_id * @param year 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 a0099f1..ed0fdec 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java +++ b/java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java @@ -36,11 +36,11 @@ public class UserCourseController { } // 根据教师id和学年,学期查询课程 - @GetMapping(value = "/finduidandyearandsemester/{u_id}/{year}/{semester}") - public ResultVO> findUidandYearandSemester(@PathVariable("u_id") Integer u_id,@PathVariable("year") String year,@PathVariable("semester") Integer semester ) { - List usercourselist = usercourseService.findAllByUidAndYearAndSemester( u_id,year,semester) ; - return ResultVOUtil.success(usercourselist); - } +// @GetMapping(value = "/finduidandyearandsemester/{u_id}/{year}/{semester}") +// public ResultVO> findUidandYearandSemester(@PathVariable("u_id") Integer u_id,@PathVariable("year") String year,@PathVariable("semester") Integer semester ) { +// List usercourselist = usercourseService.findAllByUidAndYearAndSemester( u_id,year,semester) ; +// return ResultVOUtil.success(usercourselist); +// } // author 吴志岳 // 根据用户登录id和学年,学期查询课程