From c39dcd5dfa415648e09e2042c5992a3d040f436b Mon Sep 17 00:00:00 2001 From: freeebird <1032796097@qq.com> Date: Fri, 16 Nov 2018 11:35:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=A5=E4=BD=8F=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotel/controller/CheckInController.java | 57 +++++++++++++++++++ .../cn/mafangui/hotel/entity/CheckIn.java | 46 ++++++++++++--- .../mafangui/hotel/mapper/CheckInMapper.java | 9 +++ .../hotel/service/CheckInService.java | 21 +++++++ .../service/impl/CheckInServiceImpl.java | 46 +++++++++++++++ .../mybatis/mapper/CheckInMapper.xml | 55 ++++++++---------- 6 files changed, 195 insertions(+), 39 deletions(-) create mode 100644 src/main/java/cn/mafangui/hotel/controller/CheckInController.java create mode 100644 src/main/java/cn/mafangui/hotel/service/CheckInService.java create mode 100644 src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java diff --git a/src/main/java/cn/mafangui/hotel/controller/CheckInController.java b/src/main/java/cn/mafangui/hotel/controller/CheckInController.java new file mode 100644 index 0000000..63681c0 --- /dev/null +++ b/src/main/java/cn/mafangui/hotel/controller/CheckInController.java @@ -0,0 +1,57 @@ +package cn.mafangui.hotel.controller; + +import cn.mafangui.hotel.entity.CheckIn; +import cn.mafangui.hotel.service.CheckInService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping(value = "/checkIn") +public class CheckInController { + + @Autowired + private CheckInService checkInService; + + @RequestMapping(value = "/add") + public int addCheckIn(int peo_count, String persons, String ids){ + CheckIn checkIn = new CheckIn(); + checkIn.setPeoCount(peo_count); + checkIn.setPersons(persons); + checkIn.setIds(ids); + checkIn.setCheckInTime(new Date()); + return checkInService.insert(checkIn); + } + + @RequestMapping(value = "/delete") + public int deleteCheckIn(int checkId){ + return checkInService.delete(checkId) + } + + @RequestMapping(value = "/update") + public int update(int checkId,String roomNumber){ + CheckIn checkIn = new CheckIn(); + checkIn.setCheckInId(checkId); + checkIn.setRoomNumber(roomNumber); + return checkInService.update(checkIn); + } + + @RequestMapping(value = "/checkOut") + public int checkOut(String roomNumber){ + return checkInService.updateByRoomNumber(roomNumber); + } + + @RequestMapping(value = "/withId") + public CheckIn getById(int checkId){ + return checkInService.selectById(checkId); + } + + @RequestMapping(value = "/all") + public List getAll(){ + return checkInService.selectAll(); + } + +} diff --git a/src/main/java/cn/mafangui/hotel/entity/CheckIn.java b/src/main/java/cn/mafangui/hotel/entity/CheckIn.java index 1387646..526de12 100644 --- a/src/main/java/cn/mafangui/hotel/entity/CheckIn.java +++ b/src/main/java/cn/mafangui/hotel/entity/CheckIn.java @@ -9,8 +9,6 @@ public class CheckIn { private String roomNumber; - private String roomType; - private Integer peoCount; private String persons; @@ -19,10 +17,20 @@ public class CheckIn { private Date checkInTime; + private Date checkOutTime; + private Date createTime; private Date updateTime; + public Date getCheckOutTime() { + return checkOutTime; + } + + public void setCheckOutTime(Date checkOutTime) { + this.checkOutTime = checkOutTime; + } + public Integer getCheckInId() { return checkInId; } @@ -47,13 +55,6 @@ public class CheckIn { this.roomNumber = roomNumber == null ? null : roomNumber.trim(); } - public String getRoomType() { - return roomType; - } - - public void setRoomType(String roomType) { - this.roomType = roomType == null ? null : roomType.trim(); - } public Integer getPeoCount() { return peoCount; @@ -102,4 +103,31 @@ public class CheckIn { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + public CheckIn() { + } + + public CheckIn(String roomNumber, String roomType, Integer peoCount, String persons, String ids, Date checkInTime) { + this.roomNumber = roomNumber; + this.peoCount = peoCount; + this.persons = persons; + this.ids = ids; + this.checkInTime = checkInTime; + } + + @Override + public String toString() { + return "CheckIn{" + + "checkInId=" + checkInId + + ", orderId=" + orderId + + ", roomNumber='" + roomNumber + '\'' + + ", peoCount=" + peoCount + + ", persons='" + persons + '\'' + + ", ids='" + ids + '\'' + + ", checkInTime=" + checkInTime + + ", checkOutTime=" + checkOutTime + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + '}'; + } } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/mapper/CheckInMapper.java b/src/main/java/cn/mafangui/hotel/mapper/CheckInMapper.java index 714391f..76690da 100644 --- a/src/main/java/cn/mafangui/hotel/mapper/CheckInMapper.java +++ b/src/main/java/cn/mafangui/hotel/mapper/CheckInMapper.java @@ -1,7 +1,11 @@ package cn.mafangui.hotel.mapper; import cn.mafangui.hotel.entity.CheckIn; +import org.springframework.stereotype.Component; +import java.util.List; + +@Component public interface CheckInMapper { int deleteByPrimaryKey(Integer checkInId); @@ -11,7 +15,12 @@ public interface CheckInMapper { CheckIn selectByPrimaryKey(Integer checkInId); + int updateByRoomNumber(String roomNumber); + int updateByPrimaryKeySelective(CheckIn record); int updateByPrimaryKey(CheckIn record); + + List selectAll(); + } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/service/CheckInService.java b/src/main/java/cn/mafangui/hotel/service/CheckInService.java new file mode 100644 index 0000000..d93be26 --- /dev/null +++ b/src/main/java/cn/mafangui/hotel/service/CheckInService.java @@ -0,0 +1,21 @@ +package cn.mafangui.hotel.service; + +import cn.mafangui.hotel.entity.CheckIn; + +import java.util.List; + +public interface CheckInService { + + int insert(CheckIn checkIn); + + int delete(int checkInId); + + int update(CheckIn checkIn); + + int updateByRoomNumber(String roomNumber); + + CheckIn selectById(int checkInId); + + List selectAll(); + +} diff --git a/src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java new file mode 100644 index 0000000..fb51c76 --- /dev/null +++ b/src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java @@ -0,0 +1,46 @@ +package cn.mafangui.hotel.service.impl; + +import cn.mafangui.hotel.entity.CheckIn; +import cn.mafangui.hotel.mapper.CheckInMapper; +import cn.mafangui.hotel.service.CheckInService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CheckInServiceImpl implements CheckInService { + @Autowired + private CheckInMapper checkInMapper; + + + @Override + public int insert(CheckIn checkIn) { + return checkInMapper.insert(checkIn); + } + + @Override + public int delete(int checkInId) { + return checkInMapper.deleteByPrimaryKey(checkInId); + } + + @Override + public int update(CheckIn checkIn) { + return checkInMapper.updateByPrimaryKeySelective(checkIn); + } + + @Override + public int updateByRoomNumber(String roomNumber) { + return checkInMapper.updateByRoomNumber(roomNumber); + } + + @Override + public CheckIn selectById(int checkInId) { + return checkInMapper.selectByPrimaryKey(checkInId); + } + + @Override + public List selectAll() { + return checkInMapper.selectAll(); + } +} diff --git a/src/main/resources/mybatis/mapper/CheckInMapper.xml b/src/main/resources/mybatis/mapper/CheckInMapper.xml index 724a15e..13b5ab0 100644 --- a/src/main/resources/mybatis/mapper/CheckInMapper.xml +++ b/src/main/resources/mybatis/mapper/CheckInMapper.xml @@ -5,16 +5,16 @@ - + - check_in_id, order_id, room_number, room_type, peo_count, persons, ids, check_in_time, + check_in_id, order_id, room_number,peo_count, persons, ids, check_in_time, check_out_time, create_time, update_time + delete from check_in where check_in_id = #{checkInId,jdbcType=INTEGER} insert into check_in (check_in_id, order_id, room_number, - room_type, peo_count, persons, + peo_count, persons, ids, check_in_time, create_time, update_time) values (#{checkInId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER}, #{roomNumber,jdbcType=VARCHAR}, - #{roomType,jdbcType=VARCHAR}, #{peoCount,jdbcType=INTEGER}, #{persons,jdbcType=VARCHAR}, + #{peoCount,jdbcType=INTEGER}, #{persons,jdbcType=VARCHAR}, #{ids,jdbcType=VARCHAR}, #{checkInTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) @@ -49,9 +54,6 @@ room_number, - - room_type, - peo_count, @@ -64,12 +66,8 @@ check_in_time, - create_time, - - update_time, - @@ -81,9 +79,6 @@ #{roomNumber,jdbcType=VARCHAR}, - - #{roomType,jdbcType=VARCHAR}, - #{peoCount,jdbcType=INTEGER}, @@ -96,12 +91,11 @@ #{checkInTime,jdbcType=TIMESTAMP}, - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, + + #{checkOutTime,jdbcType=TIMESTAMP}, + now(), + now(), @@ -113,9 +107,6 @@ room_number = #{roomNumber,jdbcType=VARCHAR}, - - room_type = #{roomType,jdbcType=VARCHAR}, - peo_count = #{peoCount,jdbcType=INTEGER}, @@ -128,26 +119,30 @@ check_in_time = #{checkInTime,jdbcType=TIMESTAMP}, - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, + + check_out_time = #{checkOutTime,jdbcType=TIMESTAMP}, + update_time = now(), where check_in_id = #{checkInId,jdbcType=INTEGER} + + update check_in + set + check_out_time = now(), + update_time = now() + where room_number = #{roomNumber,jdbcType=VARCHAR} and check_out_time = '0000-00-00 00:00:00' + update check_in set order_id = #{orderId,jdbcType=INTEGER}, room_number = #{roomNumber,jdbcType=VARCHAR}, - room_type = #{roomType,jdbcType=VARCHAR}, peo_count = #{peoCount,jdbcType=INTEGER}, persons = #{persons,jdbcType=VARCHAR}, ids = #{ids,jdbcType=VARCHAR}, check_in_time = #{checkInTime,jdbcType=TIMESTAMP}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} + check_out_time = #{checkOutTime,jdbcType=TIMESTAMP}, + update_time = now() where check_in_id = #{checkInId,jdbcType=INTEGER} \ No newline at end of file