From 435e38198d839edc1b6e9e1d1612e85909513f8a Mon Sep 17 00:00:00 2001 From: freeebird <1032796097@qq.com> Date: Mon, 12 Nov 2018 16:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90RoomService=E7=B1=BB=E7=BC=96?= =?UTF-8?q?=E5=86=99=EF=BC=8C=E9=80=9A=E8=BF=87=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/mafangui/hotel/entity/Room.java | 16 +++++ .../cn/mafangui/hotel/mapper/RoomMapper.java | 9 +++ .../mafangui/hotel/service/RoomService.java | 16 ++--- .../hotel/service/impl/RoomServiceImpl.java | 50 +++++++++++++ .../resources/mybatis/mapper/RoomMapper.xml | 37 +++++----- .../service/impl/RoomServiceImplTest.java | 72 +++++++++++++++++++ 6 files changed, 171 insertions(+), 29 deletions(-) create mode 100644 src/main/java/cn/mafangui/hotel/service/impl/RoomServiceImpl.java create mode 100644 src/test/java/cn/mafangui/hotel/service/impl/RoomServiceImplTest.java diff --git a/src/main/java/cn/mafangui/hotel/entity/Room.java b/src/main/java/cn/mafangui/hotel/entity/Room.java index 31d4fe0..a59e76a 100644 --- a/src/main/java/cn/mafangui/hotel/entity/Room.java +++ b/src/main/java/cn/mafangui/hotel/entity/Room.java @@ -102,4 +102,20 @@ public class Room { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + @Override + public String toString() { + return "Room{" + + "roomId=" + roomId + + ", roomNumber='" + roomNumber + '\'' + + ", typeId=" + typeId + + ", roomType='" + roomType + '\'' + + ", roomPrice=" + roomPrice + + ", roomDiscount=" + roomDiscount + + ", roomStatus=" + roomStatus + + ", remark='" + remark + '\'' + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + '}'; + } } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/mapper/RoomMapper.java b/src/main/java/cn/mafangui/hotel/mapper/RoomMapper.java index caed91f..3706533 100644 --- a/src/main/java/cn/mafangui/hotel/mapper/RoomMapper.java +++ b/src/main/java/cn/mafangui/hotel/mapper/RoomMapper.java @@ -1,7 +1,10 @@ package cn.mafangui.hotel.mapper; import cn.mafangui.hotel.entity.Room; +import org.springframework.stereotype.Component; +import java.util.List; +@Component public interface RoomMapper { int deleteByPrimaryKey(Integer roomId); @@ -14,4 +17,10 @@ public interface RoomMapper { int updateByPrimaryKeySelective(Room record); int updateByPrimaryKey(Room record); + + List selectByType(Integer typeId); + + List selectByStatus(Integer roomStatus); + + List selectAll(); } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/service/RoomService.java b/src/main/java/cn/mafangui/hotel/service/RoomService.java index 98b6e6e..0886741 100644 --- a/src/main/java/cn/mafangui/hotel/service/RoomService.java +++ b/src/main/java/cn/mafangui/hotel/service/RoomService.java @@ -6,13 +6,11 @@ import java.util.List; public interface RoomService { - int addRoom(Room room); - int deleteRoom(int roomId); - int deleteRoom(String roomNumber); - int updateRoom(Room room); - Room findById(int roomId); - Room findByNumber(String roomNumber); - List findByStatus(String status); - List findByType(String typeName); - List findAll(); + int insert(Room room); + int delete(int roomId); + int update(Room room); + Room selectById(int roomId); + List selectByStatus(int roomStatus); + List selectByType(int typeId); + List selectAll(); } diff --git a/src/main/java/cn/mafangui/hotel/service/impl/RoomServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/RoomServiceImpl.java new file mode 100644 index 0000000..cb249f2 --- /dev/null +++ b/src/main/java/cn/mafangui/hotel/service/impl/RoomServiceImpl.java @@ -0,0 +1,50 @@ +package cn.mafangui.hotel.service.impl; + +import cn.mafangui.hotel.entity.Room; +import cn.mafangui.hotel.mapper.RoomMapper; +import cn.mafangui.hotel.service.RoomService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class RoomServiceImpl implements RoomService { + @Autowired + private RoomMapper roomMapper; + + @Override + public int insert(Room room) { + return roomMapper.insertSelective(room); + } + + @Override + public int delete(int roomId) { + return roomMapper.deleteByPrimaryKey(roomId); + } + + @Override + public int update(Room room) { + return roomMapper.updateByPrimaryKeySelective(room); + } + + @Override + public Room selectById(int roomId) { + return roomMapper.selectByPrimaryKey(roomId); + } + + @Override + public List selectByStatus(int roomStatus) { + return roomMapper.selectByStatus(roomStatus); + } + + @Override + public List selectByType(int typeId) { + return roomMapper.selectByType(typeId); + } + + @Override + public List selectAll() { + return roomMapper.selectAll(); + } +} diff --git a/src/main/resources/mybatis/mapper/RoomMapper.xml b/src/main/resources/mybatis/mapper/RoomMapper.xml index 5aa86f3..6ff2d14 100644 --- a/src/main/resources/mybatis/mapper/RoomMapper.xml +++ b/src/main/resources/mybatis/mapper/RoomMapper.xml @@ -23,6 +23,17 @@ from room_info where room_id = #{roomId,jdbcType=INTEGER} + + + delete from room_info where room_id = #{roomId,jdbcType=INTEGER} @@ -34,8 +45,8 @@ update_time) values (#{roomId,jdbcType=INTEGER}, #{roomNumber,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER}, #{roomType,jdbcType=VARCHAR}, #{roomPrice,jdbcType=DOUBLE}, #{roomDiscount,jdbcType=DOUBLE}, - #{roomStatus,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) + #{roomStatus,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, now(), + now()) insert into room_info @@ -64,12 +75,8 @@ remark, - create_time, - - update_time, - @@ -96,12 +103,8 @@ #{remark,jdbcType=VARCHAR}, - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - + now(), + now(), @@ -128,12 +131,7 @@ remark = #{remark,jdbcType=VARCHAR}, - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - + update_time = now(), where room_id = #{roomId,jdbcType=INTEGER} @@ -146,8 +144,7 @@ room_discount = #{roomDiscount,jdbcType=DOUBLE}, room_status = #{roomStatus,jdbcType=INTEGER}, remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} + update_time = now() where room_id = #{roomId,jdbcType=INTEGER} \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/service/impl/RoomServiceImplTest.java b/src/test/java/cn/mafangui/hotel/service/impl/RoomServiceImplTest.java new file mode 100644 index 0000000..32229ac --- /dev/null +++ b/src/test/java/cn/mafangui/hotel/service/impl/RoomServiceImplTest.java @@ -0,0 +1,72 @@ +package cn.mafangui.hotel.service.impl; + +import cn.mafangui.hotel.entity.Room; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + + +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class) +public class RoomServiceImplTest { + + @Autowired + RoomServiceImpl roomService; + + @Test + public void insert() { + Room room = new Room(); + room.setRoomNumber("101"); + room.setRoomPrice(123.0); + room.setRoomDiscount(12.1); + room.setRoomStatus(0); + room.setTypeId(1); + room.setRoomType("ade"); + Assert.assertEquals(1,roomService.insert(room)); + } + + @Test + public void delete() { + Assert.assertEquals(1,roomService.delete(1)); + } + + @Test + public void update() { + Room room = new Room(); + room.setRoomId(1); + room.setRoomNumber("222"); + room.setRoomPrice(123.0); + room.setRoomDiscount(12.1); + room.setRoomStatus(0); + room.setTypeId(1); + room.setRoomType("ade"); + Assert.assertEquals(1,roomService.update(room)); + } + + @Test + public void selectById() { + System.out.println(roomService.selectById(1)); + Assert.assertEquals("222",roomService.selectById(1).getRoomNumber()); + } + + @Test + public void selectByStatus() { + System.out.println(roomService.selectByStatus(0)); + Assert.assertEquals(1,roomService.selectByStatus(0).size()); + } + + @Test + public void selectByType() { + System.out.println(roomService.selectByType(1)); + Assert.assertEquals(1,roomService.selectByType(1).size()); + } + + @Test + public void selectAll() { + System.out.println(roomService.selectAll()); + Assert.assertEquals(1,roomService.selectAll().size()); + } +} \ No newline at end of file