From 83c46f6b0770485ba2c26986c7ff77e45fa51995 Mon Sep 17 00:00:00 2001 From: KaiyuanOSG Date: Tue, 13 Jun 2023 20:47:23 +0800 Subject: [PATCH] =?UTF-8?q?2023.6.13=201.=20=E5=AE=8C=E6=88=90=E4=BA=86?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=A1=86=E6=9E=B6=E7=9A=84=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdut/labex/Factory/BorrowInfoFactory.java | 25 ++++++++ .../sdut/labex/Factory/ExperimentFactory.java | 27 ++++++++ .../controller/BorrowInfoController.java | 40 +++++++++++- .../controller/ExperimentsController.java | 27 ++++++-- .../sdut/labex/controller/RoomController.java | 42 ++++++++++++- .../controller/TimeOptionController.java | 35 +++++++++++ .../com/sdut/labex/entity/BorrowInfo.java | 6 +- .../com/sdut/labex/entity/Experiment.java | 5 ++ .../sdut/labex/mapper/BorrowInfoMapper.java | 3 +- .../sdut/labex/mapper/ExperimentsMapper.java | 3 +- .../sdut/labex/service/BorrowInfoService.java | 8 +++ .../labex/service/ExperimentsService.java | 2 +- .../com/sdut/labex/service/RoomService.java | 8 +++ .../sdut/labex/service/TimeOptionService.java | 7 +++ .../service/impl/BorrowInfoServiceImpl.java | 62 +++++++++++++++++++ .../service/impl/ExperimentsServiceImpl.java | 31 ++++++++-- .../labex/service/impl/RoomServiceImpl.java | 58 +++++++++++++++++ .../service/impl/TimeOptionServiceImpl.java | 48 ++++++++++++++ .../resources/mapper/BorrowInfoMapper.xml | 15 +++-- .../resources/mapper/ExperimentsMapper.xml | 4 ++ 20 files changed, 430 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/sdut/labex/Factory/BorrowInfoFactory.java create mode 100644 src/main/java/com/sdut/labex/Factory/ExperimentFactory.java diff --git a/src/main/java/com/sdut/labex/Factory/BorrowInfoFactory.java b/src/main/java/com/sdut/labex/Factory/BorrowInfoFactory.java new file mode 100644 index 0000000..9a1fe44 --- /dev/null +++ b/src/main/java/com/sdut/labex/Factory/BorrowInfoFactory.java @@ -0,0 +1,25 @@ +package com.sdut.labex.Factory; + +import com.alibaba.fastjson.JSONObject; +import com.sdut.labex.entity.BorrowInfo; + +/** + * File: BorrowInfoFactory + * Created: 2023/6/13 + * Author: springforest + * Description: + */ + +public class BorrowInfoFactory { + public static BorrowInfo createBorrowInfo(JSONObject jsonObject) { + BorrowInfo borrowInfo = new BorrowInfo(); + borrowInfo.setId(jsonObject.getInteger("id")); + borrowInfo.setApplyUser(jsonObject.getString("applyUser")); + borrowInfo.setTime(jsonObject.getString("time")); + borrowInfo.setDate(jsonObject.getDate("date")); + borrowInfo.setApplyDate(jsonObject.getDate("applyDate")); + borrowInfo.setIsAdmit(jsonObject.getInteger("isAdmit")); + borrowInfo.setRoomName(jsonObject.getString("roomName")); + return borrowInfo; + } +} diff --git a/src/main/java/com/sdut/labex/Factory/ExperimentFactory.java b/src/main/java/com/sdut/labex/Factory/ExperimentFactory.java new file mode 100644 index 0000000..731c7ed --- /dev/null +++ b/src/main/java/com/sdut/labex/Factory/ExperimentFactory.java @@ -0,0 +1,27 @@ +package com.sdut.labex.Factory; + +import com.alibaba.fastjson.JSONObject; +import com.sdut.labex.entity.Experiment; + +/** + * File: ExperimentFactory + * Created: 2023/6/13 + * Author: springforest + * Description: + */ + +public class ExperimentFactory { + public static Experiment createExperiment(JSONObject jsonObject) { + Experiment experiment = new Experiment(); + experiment.setId(jsonObject.getInteger("id")); + experiment.setName(jsonObject.getString("name")); + experiment.setTime(jsonObject.getString("time")); + experiment.setDate(jsonObject.getDate("date")); + experiment.setRoomName(jsonObject.getString("roomName")); + experiment.setStatus(jsonObject.getInteger("status")); + experiment.setClassName(jsonObject.getString("className")); + experiment.setApplyTime(jsonObject.getDate("applyTime")); + experiment.setApplyUser(jsonObject.getString("applyUser")); + return experiment; + } +} diff --git a/src/main/java/com/sdut/labex/controller/BorrowInfoController.java b/src/main/java/com/sdut/labex/controller/BorrowInfoController.java index 714193e..4d421bf 100644 --- a/src/main/java/com/sdut/labex/controller/BorrowInfoController.java +++ b/src/main/java/com/sdut/labex/controller/BorrowInfoController.java @@ -1,11 +1,49 @@ package com.sdut.labex.controller; +import com.alibaba.fastjson.JSONObject; +import com.sdut.labex.Factory.BorrowInfoFactory; +import com.sdut.labex.entity.BorrowInfo; +import com.sdut.labex.service.BorrowInfoService; +import com.sdut.labex.utils.ResVo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + /** * File: BorrowInfoController * Created: 2023/6/12 * Author: springforest * Description: */ - +@RestController +@CrossOrigin public class BorrowInfoController { + + @Resource + private BorrowInfoService borrowInfoService; + + @PostMapping("/borrowInfo") + public ResVo addBorrowInfo(@RequestBody JSONObject jsonObject) { + BorrowInfo borrowInfo = BorrowInfoFactory.createBorrowInfo(jsonObject); + return borrowInfoService.addBorrowInfo(borrowInfo); + } + + @PutMapping("/borrowInfo") + public ResVo updateBorrowInfo(@RequestBody JSONObject jsonObject) { + BorrowInfo borrowInfo = BorrowInfoFactory.createBorrowInfo(jsonObject); + return borrowInfoService.updateBorrowInfo(borrowInfo); + } + + @DeleteMapping("/borrowInfo/{id}") + public ResVo deleteBorrowInfoById(@PathVariable("id") Integer id) { + return borrowInfoService.deleteBorrowInfoById(id); + } + + @PostMapping("/borrowInfo/{pageNum}/{pageSize}") + public ResVo getBorrowInfo(@RequestBody JSONObject jsonObject, + @PathVariable("pageNum") int pageNum, + @PathVariable("pageSize") int pageSize) { + BorrowInfo borrowInfo = BorrowInfoFactory.createBorrowInfo(jsonObject); + return borrowInfoService.getBorrowInfo(borrowInfo, pageNum, pageSize); + } } diff --git a/src/main/java/com/sdut/labex/controller/ExperimentsController.java b/src/main/java/com/sdut/labex/controller/ExperimentsController.java index f70b49a..47136b5 100644 --- a/src/main/java/com/sdut/labex/controller/ExperimentsController.java +++ b/src/main/java/com/sdut/labex/controller/ExperimentsController.java @@ -1,6 +1,7 @@ package com.sdut.labex.controller; import com.alibaba.fastjson.JSONObject; +import com.sdut.labex.Factory.ExperimentFactory; import com.sdut.labex.entity.Experiment; import com.sdut.labex.service.ExperimentsService; import com.sdut.labex.utils.ResVo; @@ -25,14 +26,11 @@ public class ExperimentsController { @Resource private ExperimentsService experimentsService; + //添加实验 @PostMapping("/experiment") public ResVo applyExperiment(@RequestBody JSONObject jsonObject) { - Experiment experiment = new Experiment(); - experiment.setName(jsonObject.getString("name")); - experiment.setTime(jsonObject.getString("time")); - experiment.setDate(jsonObject.getDate("date")); - experiment.setClassName(jsonObject.getString("className")); - experiment.setRoomName(jsonObject.getString("roomName")); + Experiment experiment = ExperimentFactory.createExperiment(jsonObject); + //获取当前时间 LocalDateTime currentDateTime = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -48,25 +46,42 @@ public class ExperimentsController { return experimentsService.applyExperiment(experiment); } + //修改实验信息 @PutMapping("/experiment") public ResVo updateExperiment(@RequestBody JSONObject jsonObject) { Experiment experiment = jsonObject.toJavaObject(Experiment.class); return experimentsService.updateExperiment(experiment); } + //删除实验 @DeleteMapping("/experiment/{id}") public ResVo deleteExperiment(@PathVariable String id) { return experimentsService.deleteExperiment(id); } + //获取未审核的实验 @GetMapping("/unreviewed") public ResVo getUnreviewedExperiments() { return experimentsService.getUnreviewedExperiments(); } + //设置实验审核状态 @PutMapping("/isAdmitted/{id}{status}") public ResVo isAdmit(@PathVariable Integer id, @PathVariable Integer status) { return experimentsService.isAdmitted(id, status); } + //获取实验列表 + @PostMapping("/experiments/{pageNum}/{pageSize}") + public ResVo getExperiments(@RequestBody JSONObject jsonObject, @PathVariable int pageNum, @PathVariable int pageSize) { + Experiment experiment = ExperimentFactory.createExperiment(jsonObject); + + return experimentsService.getExperiments(experiment, pageNum, pageSize); + } + + //按ID获取实验 + @GetMapping("/experiment/{id}") + public ResVo getExperiment(@PathVariable String id) { + return experimentsService.getExperiment(id); + } } diff --git a/src/main/java/com/sdut/labex/controller/RoomController.java b/src/main/java/com/sdut/labex/controller/RoomController.java index 75207f3..d478c6a 100644 --- a/src/main/java/com/sdut/labex/controller/RoomController.java +++ b/src/main/java/com/sdut/labex/controller/RoomController.java @@ -1,11 +1,51 @@ package com.sdut.labex.controller; +import com.alibaba.fastjson.JSONObject; +import com.sdut.labex.entity.Room; +import com.sdut.labex.service.RoomService; +import com.sdut.labex.utils.ResVo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + /** * File: RoomController * Created: 2023/6/12 * Author: springforest * Description: */ - +@RestController +@CrossOrigin public class RoomController { + @Resource + private RoomService roomService; + + @GetMapping("/room") + public ResVo getAllRoom() { + return roomService.getAllRoom(); + } + + @PostMapping("/room") + public ResVo addRoom(@RequestBody JSONObject jsonObject) { + Room room = new Room(); + room.setName(jsonObject.getString("name")); + room.setDescription(jsonObject.getString("description")); + room.setStatus(jsonObject.getInteger("status")); + return roomService.addRoom(room); + } + + @PutMapping("/room") + public ResVo updateRoom(@RequestBody JSONObject jsonObject) { + Room room = new Room(); + room.setId(jsonObject.getInteger("id")); + room.setName(jsonObject.getString("name")); + room.setDescription(jsonObject.getString("description")); + room.setStatus(jsonObject.getInteger("status")); + return roomService.updateRoom(room); + } + + @DeleteMapping("/room/{id}") + public ResVo removeRoom(@PathVariable("id") int id) { + return roomService.deleteRoomById(id); + } } diff --git a/src/main/java/com/sdut/labex/controller/TimeOptionController.java b/src/main/java/com/sdut/labex/controller/TimeOptionController.java index ad6996d..bd28703 100644 --- a/src/main/java/com/sdut/labex/controller/TimeOptionController.java +++ b/src/main/java/com/sdut/labex/controller/TimeOptionController.java @@ -1,6 +1,13 @@ package com.sdut.labex.controller; +import com.alibaba.fastjson.JSONObject; +import com.sdut.labex.entity.TimeOption; +import com.sdut.labex.service.TimeOptionService; +import com.sdut.labex.utils.ResVo; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; /** * File: TimeOptionController @@ -9,6 +16,34 @@ import org.springframework.stereotype.Controller; * Description: */ @Controller +@CrossOrigin public class TimeOptionController { + @Resource + private TimeOptionService timeOptionService; + + @PostMapping("/timeOption") + public ResVo addTimeOption(@RequestBody JSONObject jsonObject) { + TimeOption timeOption = new TimeOption(); + timeOption.setName(jsonObject.getString("name")); + return timeOptionService.addTimeOption(timeOption); + } + + @PutMapping("/timeOption") + public ResVo updateTimeOption(@RequestBody JSONObject jsonObject) { + TimeOption timeOption = new TimeOption(); + timeOption.setId(jsonObject.getInteger("id")); + timeOption.setName(jsonObject.getString("name")); + return timeOptionService.updateTimeOption(timeOption); + } + + @DeleteMapping("/timeOption") + public ResVo deleteTimeOption(@RequestBody JSONObject jsonObject) { + return timeOptionService.deleteTimeOption(jsonObject.getInteger("id")); + } + + @GetMapping("/timeOptions") + public ResVo getTimeOptions() { + return timeOptionService.getTimeOptions(); + } } diff --git a/src/main/java/com/sdut/labex/entity/BorrowInfo.java b/src/main/java/com/sdut/labex/entity/BorrowInfo.java index 51ac19c..6619848 100644 --- a/src/main/java/com/sdut/labex/entity/BorrowInfo.java +++ b/src/main/java/com/sdut/labex/entity/BorrowInfo.java @@ -26,7 +26,7 @@ public class BorrowInfo implements Serializable { /** * 借用人 */ - private String name; + private String applyUser; /** * 时间 @@ -49,9 +49,9 @@ public class BorrowInfo implements Serializable { private Integer isAdmit; /** - * + * 教室名称 */ - private Integer roomId; + private String roomName; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/sdut/labex/entity/Experiment.java b/src/main/java/com/sdut/labex/entity/Experiment.java index 0b724da..85d4ae4 100644 --- a/src/main/java/com/sdut/labex/entity/Experiment.java +++ b/src/main/java/com/sdut/labex/entity/Experiment.java @@ -58,6 +58,11 @@ public class Experiment implements Serializable { */ private Date applyTime; + /** + * 申请人 + */ + private String applyUser; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/sdut/labex/mapper/BorrowInfoMapper.java b/src/main/java/com/sdut/labex/mapper/BorrowInfoMapper.java index 6148d37..3f34697 100644 --- a/src/main/java/com/sdut/labex/mapper/BorrowInfoMapper.java +++ b/src/main/java/com/sdut/labex/mapper/BorrowInfoMapper.java @@ -1,6 +1,7 @@ package com.sdut.labex.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sdut.labex.entity.BorrowInfo; import org.apache.ibatis.annotations.Mapper; @@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface BorrowInfoMapper extends BaseMapper { - + public Page queryBorrowInfoByOptions(Page page, BorrowInfo borrowInfo); } diff --git a/src/main/java/com/sdut/labex/mapper/ExperimentsMapper.java b/src/main/java/com/sdut/labex/mapper/ExperimentsMapper.java index 9ef36fb..4dc2d24 100644 --- a/src/main/java/com/sdut/labex/mapper/ExperimentsMapper.java +++ b/src/main/java/com/sdut/labex/mapper/ExperimentsMapper.java @@ -1,6 +1,7 @@ package com.sdut.labex.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sdut.labex.entity.Experiment; import org.apache.ibatis.annotations.Mapper; @@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ExperimentsMapper extends BaseMapper { - + public Page getExperimentsByPage(Page page, Experiment experiment); } diff --git a/src/main/java/com/sdut/labex/service/BorrowInfoService.java b/src/main/java/com/sdut/labex/service/BorrowInfoService.java index 2cfecad..87edbce 100644 --- a/src/main/java/com/sdut/labex/service/BorrowInfoService.java +++ b/src/main/java/com/sdut/labex/service/BorrowInfoService.java @@ -2,6 +2,7 @@ package com.sdut.labex.service; import com.baomidou.mybatisplus.extension.service.IService; import com.sdut.labex.entity.BorrowInfo; +import com.sdut.labex.utils.ResVo; /** * @author springforest @@ -10,4 +11,11 @@ import com.sdut.labex.entity.BorrowInfo; */ public interface BorrowInfoService extends IService { + public ResVo addBorrowInfo(BorrowInfo borrowInfo); + + public ResVo deleteBorrowInfoById(Integer id); + + public ResVo updateBorrowInfo(BorrowInfo borrowInfo); + + public ResVo getBorrowInfo(BorrowInfo borrowInfo, int pageNum, int pageSize); } diff --git a/src/main/java/com/sdut/labex/service/ExperimentsService.java b/src/main/java/com/sdut/labex/service/ExperimentsService.java index 9e9705f..52f15c3 100644 --- a/src/main/java/com/sdut/labex/service/ExperimentsService.java +++ b/src/main/java/com/sdut/labex/service/ExperimentsService.java @@ -18,7 +18,7 @@ public interface ExperimentsService extends IService { public ResVo getExperiment(String id); - public ResVo getExperiments(); + public ResVo getExperiments(Experiment experiment, int pageNum, int pageSize); public ResVo getUnreviewedExperiments(); diff --git a/src/main/java/com/sdut/labex/service/RoomService.java b/src/main/java/com/sdut/labex/service/RoomService.java index 1a1d0dc..b21a62e 100644 --- a/src/main/java/com/sdut/labex/service/RoomService.java +++ b/src/main/java/com/sdut/labex/service/RoomService.java @@ -2,6 +2,7 @@ package com.sdut.labex.service; import com.baomidou.mybatisplus.extension.service.IService; import com.sdut.labex.entity.Room; +import com.sdut.labex.utils.ResVo; /** * @author springforest @@ -10,4 +11,11 @@ import com.sdut.labex.entity.Room; */ public interface RoomService extends IService { + public ResVo getAllRoom(); + + public ResVo deleteRoomById(int id); + + public ResVo addRoom(Room room); + + public ResVo updateRoom(Room room); } diff --git a/src/main/java/com/sdut/labex/service/TimeOptionService.java b/src/main/java/com/sdut/labex/service/TimeOptionService.java index 1b2029c..f794f54 100644 --- a/src/main/java/com/sdut/labex/service/TimeOptionService.java +++ b/src/main/java/com/sdut/labex/service/TimeOptionService.java @@ -2,6 +2,7 @@ package com.sdut.labex.service; import com.baomidou.mybatisplus.extension.service.IService; import com.sdut.labex.entity.TimeOption; +import com.sdut.labex.utils.ResVo; /** * @author springforest @@ -9,5 +10,11 @@ import com.sdut.labex.entity.TimeOption; * @createDate 2023-06-12 08:07:15 */ public interface TimeOptionService extends IService { + public ResVo addTimeOption(TimeOption timeOption); + public ResVo deleteTimeOption(int id); + + public ResVo updateTimeOption(TimeOption timeOption); + + public ResVo getTimeOptions(); } diff --git a/src/main/java/com/sdut/labex/service/impl/BorrowInfoServiceImpl.java b/src/main/java/com/sdut/labex/service/impl/BorrowInfoServiceImpl.java index 5377f66..1e39532 100644 --- a/src/main/java/com/sdut/labex/service/impl/BorrowInfoServiceImpl.java +++ b/src/main/java/com/sdut/labex/service/impl/BorrowInfoServiceImpl.java @@ -1,11 +1,17 @@ package com.sdut.labex.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sdut.labex.entity.BorrowInfo; import com.sdut.labex.mapper.BorrowInfoMapper; import com.sdut.labex.service.BorrowInfoService; +import com.sdut.labex.utils.ResVo; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + /** * @author springforest * @description 针对表【borrowInfo(借用记录)】的数据库操作Service实现 @@ -15,6 +21,62 @@ import org.springframework.stereotype.Service; public class BorrowInfoServiceImpl extends ServiceImpl implements BorrowInfoService { + @Resource + private BorrowInfoMapper borrowInfoMapper; + + @Override + public ResVo addBorrowInfo(BorrowInfo borrowInfo) { + try { + borrowInfoMapper.insert(borrowInfo); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("借用失败"); + } + + + return ResVo.ok("借用成功"); + } + + @Override + public ResVo deleteBorrowInfoById(Integer id) { + if (borrowInfoMapper.selectById(id) == null) { + return ResVo.error("该借用记录不存在"); + } + + try { + borrowInfoMapper.deleteById(id); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("删除失败"); + } + return ResVo.ok("删除成功"); + } + + @Override + public ResVo updateBorrowInfo(BorrowInfo borrowInfo) { + if (borrowInfoMapper.selectById(borrowInfo.getId()) == null) { + return ResVo.error("该借用记录不存在"); + } + + try { + borrowInfoMapper.updateById(borrowInfo); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("更新失败"); + } + return ResVo.ok("更新成功"); + } + + @Override + public ResVo getBorrowInfo(BorrowInfo borrowInfo, int pageNum, int pageSize) { + Page page = new Page<>(pageNum, pageSize); + borrowInfoMapper.queryBorrowInfoByOptions(page, borrowInfo); + Map res = new HashMap<>(); + res.put("total", page.getTotal()); + res.put("current", page.getCurrent()); + res.put("list", page.getRecords()); + return ResVo.ok(res); + } } diff --git a/src/main/java/com/sdut/labex/service/impl/ExperimentsServiceImpl.java b/src/main/java/com/sdut/labex/service/impl/ExperimentsServiceImpl.java index 1ce29e5..71de7c7 100644 --- a/src/main/java/com/sdut/labex/service/impl/ExperimentsServiceImpl.java +++ b/src/main/java/com/sdut/labex/service/impl/ExperimentsServiceImpl.java @@ -1,6 +1,7 @@ package com.sdut.labex.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sdut.labex.entity.Experiment; import com.sdut.labex.mapper.ExperimentsMapper; @@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -77,18 +79,39 @@ public class ExperimentsServiceImpl extends ServiceImpl page = new Page<>(pageNum, pageSize); + experimentsMapper.getExperimentsByPage(page, experiment); + Map res = new HashMap<>(); + res.put("list", page.getRecords()); + res.put("total", page.getTotal()); + res.put("current", page.getCurrent()); + return ResVo.ok(res); } @Override public ResVo getUnreviewedExperiments() { - return null; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("status", "0"); + List list = experimentsMapper.selectList(queryWrapper); + Map map = new HashMap<>(); + map.put("list", list); + return ResVo.ok(map); } @Override public ResVo isAdmitted(int id, int status) { - return null; + Experiment experiment = experimentsMapper.selectById(id); + if (experiment == null) + return ResVo.error("该实验不存在"); + experiment.setStatus(status); + try { + experimentsMapper.updateById(experiment); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error(); + } + return ResVo.ok(); } } diff --git a/src/main/java/com/sdut/labex/service/impl/RoomServiceImpl.java b/src/main/java/com/sdut/labex/service/impl/RoomServiceImpl.java index 47ab6ba..903b922 100644 --- a/src/main/java/com/sdut/labex/service/impl/RoomServiceImpl.java +++ b/src/main/java/com/sdut/labex/service/impl/RoomServiceImpl.java @@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sdut.labex.entity.Room; import com.sdut.labex.mapper.RoomMapper; import com.sdut.labex.service.RoomService; +import com.sdut.labex.utils.ResVo; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @author springforest * @description 针对表【room(房间)】的数据库操作Service实现 @@ -15,6 +21,58 @@ import org.springframework.stereotype.Service; public class RoomServiceImpl extends ServiceImpl implements RoomService { + @Resource + private RoomMapper roomMapper; + + @Override + public ResVo getAllRoom() { + List list = roomMapper.selectList(null); + Map map = new HashMap<>(); + map.put("list", list); + return ResVo.ok(map); + } + + @Override + public ResVo deleteRoomById(int id) { + if (roomMapper.selectById(id) == null) { + return ResVo.error("该房间不存在"); + } + + try { + roomMapper.deleteById(id); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("删除失败"); + } + return ResVo.ok("删除成功"); + } + + @Override + public ResVo addRoom(Room room) { + try { + roomMapper.insert(room); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("添加失败"); + } + + return ResVo.ok("添加成功"); + } + + @Override + public ResVo updateRoom(Room room) { + if (roomMapper.selectById(room.getId()) == null) { + return ResVo.error("该房间不存在"); + } + + try { + roomMapper.updateById(room); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("更新失败"); + } + return ResVo.ok("更新成功"); + } } diff --git a/src/main/java/com/sdut/labex/service/impl/TimeOptionServiceImpl.java b/src/main/java/com/sdut/labex/service/impl/TimeOptionServiceImpl.java index c9645cc..d01775c 100644 --- a/src/main/java/com/sdut/labex/service/impl/TimeOptionServiceImpl.java +++ b/src/main/java/com/sdut/labex/service/impl/TimeOptionServiceImpl.java @@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sdut.labex.entity.TimeOption; import com.sdut.labex.mapper.TimeOptionMapper; import com.sdut.labex.service.TimeOptionService; +import com.sdut.labex.utils.ResVo; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @author springforest * @description 针对表【timeOption(时间)】的数据库操作Service实现 @@ -14,7 +20,49 @@ import org.springframework.stereotype.Service; @Service public class TimeOptionServiceImpl extends ServiceImpl implements TimeOptionService { + @Resource + private TimeOptionMapper timeOptionMapper; + @Override + public ResVo addTimeOption(TimeOption timeOption) { + try { + timeOptionMapper.insert(timeOption); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("添加失败"); + } + return ResVo.ok("添加成功"); + } + + @Override + public ResVo deleteTimeOption(int id) { + try { + timeOptionMapper.deleteById(id); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("删除失败"); + } + return ResVo.ok("删除成功"); + } + + @Override + public ResVo updateTimeOption(TimeOption timeOption) { + try { + timeOptionMapper.updateById(timeOption); + } catch (Exception e) { + e.printStackTrace(); + return ResVo.error("更新失败"); + } + return ResVo.ok("更新成功"); + } + + @Override + public ResVo getTimeOptions() { + List list = timeOptionMapper.selectList(null); + Map res = new HashMap<>(); + res.put("list", list); + return ResVo.ok(res); + } } diff --git a/src/main/resources/mapper/BorrowInfoMapper.xml b/src/main/resources/mapper/BorrowInfoMapper.xml index b6d265e..e8416cc 100644 --- a/src/main/resources/mapper/BorrowInfoMapper.xml +++ b/src/main/resources/mapper/BorrowInfoMapper.xml @@ -6,18 +6,17 @@ - + - + - - id - ,name,time, - date,apply_date,is_admit, - room_id - + diff --git a/src/main/resources/mapper/ExperimentsMapper.xml b/src/main/resources/mapper/ExperimentsMapper.xml index b7d383c..3fc4f62 100644 --- a/src/main/resources/mapper/ExperimentsMapper.xml +++ b/src/main/resources/mapper/ExperimentsMapper.xml @@ -20,4 +20,8 @@ date,room_name,status, class_name + +