From 01475b62157f7abafb7755ea58dc9203b18d42a9 Mon Sep 17 00:00:00 2001 From: freeebird <1032796097@qq.com> Date: Mon, 12 Nov 2018 16:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90RoomTypeService=E7=B1=BB?= =?UTF-8?q?=E7=BC=96=E5=86=99=EF=BC=8C=E9=80=9A=E8=BF=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/mafangui/hotel/entity/RoomType.java | 23 +++++- .../mafangui/hotel/mapper/RoomTypeMapper.java | 12 ++- .../hotel/service/RoomTypeService.java | 12 +-- .../service/impl/RoomTypeServiceImpl.java | 46 +++++++++++ src/main/resources/TODO.md | 0 .../mybatis/mapper/RoomTypeMapper.xml | 48 +++++------- .../service/impl/RoomTypeServiceImplTest.java | 76 +++++++++++++++++++ 7 files changed, 178 insertions(+), 39 deletions(-) create mode 100644 src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java create mode 100644 src/main/resources/TODO.md create mode 100644 src/test/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImplTest.java diff --git a/src/main/java/cn/mafangui/hotel/entity/RoomType.java b/src/main/java/cn/mafangui/hotel/entity/RoomType.java index b846aa7..800afad 100644 --- a/src/main/java/cn/mafangui/hotel/entity/RoomType.java +++ b/src/main/java/cn/mafangui/hotel/entity/RoomType.java @@ -3,7 +3,7 @@ package cn.mafangui.hotel.entity; import java.util.Date; public class RoomType { - private Long typeId; + private Integer typeId; private String roomType; @@ -25,11 +25,11 @@ public class RoomType { private Date updateTime; - public Long getTypeId() { + public Integer getTypeId() { return typeId; } - public void setTypeId(Long typeId) { + public void setTypeId(Integer typeId) { this.typeId = typeId; } @@ -112,4 +112,21 @@ public class RoomType { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + @Override + public String toString() { + return "RoomType{" + + "typeId=" + typeId + + ", roomType='" + roomType + '\'' + + ", remark='" + remark + '\'' + + ", price=" + price + + ", discount=" + discount + + ", area=" + area + + ", bedNum=" + bedNum + + ", bedSize='" + bedSize + '\'' + + ", window=" + window + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + '}'; + } } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/mapper/RoomTypeMapper.java b/src/main/java/cn/mafangui/hotel/mapper/RoomTypeMapper.java index cf68e77..b3e54f3 100644 --- a/src/main/java/cn/mafangui/hotel/mapper/RoomTypeMapper.java +++ b/src/main/java/cn/mafangui/hotel/mapper/RoomTypeMapper.java @@ -1,17 +1,25 @@ package cn.mafangui.hotel.mapper; import cn.mafangui.hotel.entity.RoomType; +import org.springframework.stereotype.Component; +import java.util.List; + +@Component public interface RoomTypeMapper { - int deleteByPrimaryKey(Long typeId); + int deleteByPrimaryKey(Integer typeId); int insert(RoomType record); int insertSelective(RoomType record); - RoomType selectByPrimaryKey(Long typeId); + RoomType selectByPrimaryKey(Integer typeId); int updateByPrimaryKeySelective(RoomType record); int updateByPrimaryKey(RoomType record); + + List selectAll(); + + RoomType selectByRoomType(String roomType); } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/service/RoomTypeService.java b/src/main/java/cn/mafangui/hotel/service/RoomTypeService.java index 9800dbe..f5e9bac 100644 --- a/src/main/java/cn/mafangui/hotel/service/RoomTypeService.java +++ b/src/main/java/cn/mafangui/hotel/service/RoomTypeService.java @@ -1,20 +1,20 @@ package cn.mafangui.hotel.service; import cn.mafangui.hotel.entity.RoomType; +import org.springframework.stereotype.Service; import java.util.List; +@Service public interface RoomTypeService { - int addRoomType(RoomType roomType); + int insert(RoomType roomType); - int delRoomType(RoomType roomType); + int delete(int typeId); - int delById(int typeId); + int update(RoomType roomType); - int updateRoomType(RoomType roomType); - - RoomType selectByName(RoomType roomType); + RoomType selectByName(String roomType); RoomType selectById(int typeId); diff --git a/src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java new file mode 100644 index 0000000..6d669a7 --- /dev/null +++ b/src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java @@ -0,0 +1,46 @@ +package cn.mafangui.hotel.service.impl; + + +import cn.mafangui.hotel.entity.RoomType; +import cn.mafangui.hotel.mapper.RoomTypeMapper; +import cn.mafangui.hotel.service.RoomTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class RoomTypeServiceImpl implements RoomTypeService { + @Autowired + private RoomTypeMapper roomTypeMapper; + + @Override + public int insert(RoomType roomType) { + return roomTypeMapper.insertSelective(roomType); + } + + @Override + public int delete(int typeId) { + return roomTypeMapper.deleteByPrimaryKey(typeId); + } + + @Override + public int update(RoomType roomType) { + return roomTypeMapper.updateByPrimaryKeySelective(roomType); + } + + @Override + public RoomType selectByName(String roomType) { + return roomTypeMapper.selectByRoomType(roomType); + } + + @Override + public RoomType selectById(int typeId) { + return roomTypeMapper.selectByPrimaryKey(typeId); + } + + @Override + public List findAllType() { + return roomTypeMapper.selectAll(); + } +} diff --git a/src/main/resources/TODO.md b/src/main/resources/TODO.md new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/mybatis/mapper/RoomTypeMapper.xml b/src/main/resources/mybatis/mapper/RoomTypeMapper.xml index 95e4bc3..4175ab0 100644 --- a/src/main/resources/mybatis/mapper/RoomTypeMapper.xml +++ b/src/main/resources/mybatis/mapper/RoomTypeMapper.xml @@ -2,7 +2,7 @@ - + @@ -18,25 +18,31 @@ type_id, room_type, remark, price, discount, area, bed_num, bed_size, window, create_time, update_time - select from room_type - where type_id = #{typeId,jdbcType=BIGINT} + where type_id = #{typeId,jdbcType=INTEGER} - + + + delete from room_type - where type_id = #{typeId,jdbcType=BIGINT} + where type_id = #{typeId,jdbcType=INTEGER} insert into room_type (type_id, room_type, remark, price, discount, area, bed_num, bed_size, window, create_time, update_time) - values (#{typeId,jdbcType=BIGINT}, #{roomType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + values (#{typeId,jdbcType=INTEGER}, #{roomType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{price,jdbcType=DOUBLE}, #{discount,jdbcType=DOUBLE}, #{area,jdbcType=INTEGER}, #{bedNum,jdbcType=INTEGER}, #{bedSize,jdbcType=VARCHAR}, #{window,jdbcType=INTEGER}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) + now(), now()) insert into room_type @@ -68,16 +74,12 @@ window, - create_time, - - update_time, - - #{typeId,jdbcType=BIGINT}, + #{typeId,jdbcType=INTEGER}, #{roomType,jdbcType=VARCHAR}, @@ -103,12 +105,8 @@ #{window,jdbcType=INTEGER}, - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - + now(), + now(), @@ -138,14 +136,9 @@ window = #{window,jdbcType=INTEGER}, - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - + update_time = now(), - where type_id = #{typeId,jdbcType=BIGINT} + where type_id = #{typeId,jdbcType=INTEGER} update room_type @@ -157,8 +150,7 @@ bed_num = #{bedNum,jdbcType=INTEGER}, bed_size = #{bedSize,jdbcType=VARCHAR}, window = #{window,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where type_id = #{typeId,jdbcType=BIGINT} + update_time = now() + where type_id = #{typeId,jdbcType=INTEGER} \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImplTest.java b/src/test/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImplTest.java new file mode 100644 index 0000000..0f94a55 --- /dev/null +++ b/src/test/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImplTest.java @@ -0,0 +1,76 @@ +package cn.mafangui.hotel.service.impl; + +import cn.mafangui.hotel.entity.RoomType; +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; + +import static org.junit.Assert.*; + +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class) +public class RoomTypeServiceImplTest { + @Autowired + RoomTypeServiceImpl roomTypeService; + + @Test + public void insert() { + String typeName = "big"; + double price = 123; + double discount = 12; + int area = 10; + int bedNum = 1; + String bedSize = "15*12"; + int window = 0; + RoomType roomType = new RoomType(); + roomType.setArea(area); + roomType.setBedNum(bedNum); + roomType.setBedSize(bedSize); + roomType.setDiscount(discount); + roomType.setPrice(price); + roomType.setRoomType(typeName); + roomType.setWindow(window); + Assert.assertEquals(1,roomTypeService.insert(roomType)); + } + + @Test + public void delete() { + int id = 1; + Assert.assertEquals(1,roomTypeService.delete(id)); + } + + @Test + public void update() { + String typeName = "single"; + int id = 1; + RoomType roomType = new RoomType(); + roomType.setTypeId(id); + roomType.setRoomType(typeName); + Assert.assertEquals(1,roomTypeService.update(roomType)); + } + + @Test + public void selectByName() { + String typeName = "single"; + int id = roomTypeService.selectByName(typeName).getTypeId(); + System.out.println(roomTypeService.selectByName(typeName)); + Assert.assertEquals(1,id); + } + + @Test + public void selectById() { + int id = 1; + String typeName = roomTypeService.selectById(id).getRoomType(); + System.out.println(roomTypeService.selectById(id)); + Assert.assertEquals("single",typeName); + } + + @Test + public void findAllType() { + System.out.println(roomTypeService.findAllType()); + Assert.assertNotNull(roomTypeService.findAllType()); + } +} \ No newline at end of file