From 08c024b0c3c6d7415d10f4a47c095c030f6f98b9 Mon Sep 17 00:00:00 2001 From: FreeeBird <1032796097@qq.com> Date: Thu, 13 Dec 2018 19:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotel/controller/CheckInController.java | 12 ++++-- .../hotel/controller/WorkerController.java | 27 ++++++++++++++ .../mafangui/hotel/mapper/WorkerMapper.java | 4 +- .../hotel/service/CheckInService.java | 5 ++- .../mafangui/hotel/service/WorkerService.java | 1 + .../service/impl/CheckInServiceImpl.java | 19 ++++++---- .../hotel/service/impl/OrderServiceImpl.java | 1 + .../hotel/service/impl/WorkerServiceImpl.java | 5 +++ .../mafangui/hotel/utils/RandomCreation.java | 30 +++++++-------- src/main/resources/application.yml | 4 +- .../mybatis/mapper/CheckInMapper.xml | 2 +- .../resources/mybatis/mapper/OrderMapper.xml | 3 +- .../resources/mybatis/mapper/WorkerMapper.xml | 4 ++ .../hotel/service/UserServiceTest.java | 37 ------------------- 14 files changed, 85 insertions(+), 69 deletions(-) create mode 100644 src/main/java/cn/mafangui/hotel/controller/WorkerController.java delete mode 100644 src/test/java/cn/mafangui/hotel/service/UserServiceTest.java diff --git a/src/main/java/cn/mafangui/hotel/controller/CheckInController.java b/src/main/java/cn/mafangui/hotel/controller/CheckInController.java index 4f9a359..eb456b2 100644 --- a/src/main/java/cn/mafangui/hotel/controller/CheckInController.java +++ b/src/main/java/cn/mafangui/hotel/controller/CheckInController.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.Date; +import java.util.HashMap; import java.util.List; @RestController @@ -28,7 +29,7 @@ public class CheckInController { * @return */ @RequestMapping(value = "/in") - public int addCheckIn(int orderId, int peoCount, String persons, String ids){ + public HashMap addCheckIn(int orderId, int peoCount, String persons, String ids){ CheckIn checkIn = new CheckIn(); checkIn.setOrderId(orderId); checkIn.setPeoCount(peoCount); @@ -44,8 +45,13 @@ public class CheckInController { * @return */ @RequestMapping(value = "/out") - public int checkOut(String roomNumber){ - return checkInService.updateByRoomNumber(roomNumber); + public int checkOut(String roomNumber) { + try { + return checkInService.checkOut(roomNumber); + } catch (Exception e) { + e.printStackTrace(); + return -1; + } } diff --git a/src/main/java/cn/mafangui/hotel/controller/WorkerController.java b/src/main/java/cn/mafangui/hotel/controller/WorkerController.java new file mode 100644 index 0000000..152ab8a --- /dev/null +++ b/src/main/java/cn/mafangui/hotel/controller/WorkerController.java @@ -0,0 +1,27 @@ +package cn.mafangui.hotel.controller; + +import cn.mafangui.hotel.service.WorkerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(value = "/worker") +public class WorkerController { + @Autowired + private WorkerService workerService; + + /** + * 管理员登录 + * @param username + * @param password + * @return + */ + @RequestMapping(method = RequestMethod.POST,value = "/login") + public int login(String username,String password){ + if(workerService.login(username,password) != null ) + return 1; + else return 0; + } +} diff --git a/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java b/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java index 3b0f07e..9516453 100644 --- a/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java +++ b/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java @@ -22,9 +22,11 @@ public interface WorkerMapper { Worker selectByUsernameAndPassword(@Param("username") String username, @Param("password") String password, @Param("role") String role); + Worker selectByUsernamePassword(@Param("username") String username, @Param("password") String password); + List selectByRole(String role); Worker selectByUsername(String username); 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 index dab606d..abd6e96 100644 --- a/src/main/java/cn/mafangui/hotel/service/CheckInService.java +++ b/src/main/java/cn/mafangui/hotel/service/CheckInService.java @@ -2,19 +2,20 @@ package cn.mafangui.hotel.service; import cn.mafangui.hotel.entity.CheckIn; +import java.util.HashMap; import java.util.List; public interface CheckInService { int insert(CheckIn checkIn); - int checkIn(CheckIn checkIn); + HashMap checkIn(CheckIn checkIn); int delete(int checkInId); int update(CheckIn checkIn); - int checkOut(String roomNumber); + int checkOut(String roomNumber) throws Exception; int updateByRoomNumber(String roomNumber); diff --git a/src/main/java/cn/mafangui/hotel/service/WorkerService.java b/src/main/java/cn/mafangui/hotel/service/WorkerService.java index 3f23bb3..24d6640 100644 --- a/src/main/java/cn/mafangui/hotel/service/WorkerService.java +++ b/src/main/java/cn/mafangui/hotel/service/WorkerService.java @@ -13,4 +13,5 @@ public interface WorkerService { List findAll(); List selectByRole(String role); Worker login(String username,String password,String role); + Worker login(String username,String password); } diff --git a/src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java index 2e2cc87..0c48ff7 100644 --- a/src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java +++ b/src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.sql.Timestamp; +import java.util.HashMap; import java.util.List; @Service @@ -44,17 +44,22 @@ public class CheckInServiceImpl implements CheckInService { */ @Override @Transactional - public int checkIn(CheckIn checkIn) { + public HashMap checkIn(CheckIn checkIn) { + HashMap resultMap = new HashMap(); + int code = 0; Order order = orderService.selectById(checkIn.getOrderId()); RoomType rt = roomTypeService.selectById(order.getRoomTypeId()); Room r=roomService.selectById(roomService.inRoom(order.getRoomTypeId())); - if (r == null) return -3; + if (r == null) code = -3; checkIn.setRoomId(r.getRoomId()); checkIn.setRoomNumber(r.getRoomNumber()); - if (roomTypeService.updateRest(rt.getTypeId(),-1) <= 0) return -2; + if (roomTypeService.updateRest(rt.getTypeId(),-1) <= 0) code = -2; order.setOrderStatus(OrderStatus.CHECK_IN.getCode()); - if (orderService.update(order) <=0 ) return -1; - return checkInMapper.insert(checkIn); + if (orderService.update(order) <=0 ) code = -1; + code = checkInMapper.insert(checkIn); + resultMap.put("code",code); + resultMap.put("room",r); + return resultMap; } /** @@ -66,7 +71,7 @@ public class CheckInServiceImpl implements CheckInService { * @return */ @Override - public int checkOut(String roomNumber) { + public int checkOut(String roomNumber) throws Exception{ Room r = roomService.selectByNumber(roomNumber); RoomType ty = roomTypeService.selectById(r.getTypeId()); CheckIn checkIn = checkInMapper.selectLatestByRoomNumber(roomNumber); diff --git a/src/main/java/cn/mafangui/hotel/service/impl/OrderServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/OrderServiceImpl.java index 01797c9..0823d71 100644 --- a/src/main/java/cn/mafangui/hotel/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/mafangui/hotel/service/impl/OrderServiceImpl.java @@ -52,6 +52,7 @@ public class OrderServiceImpl implements OrderService { Order order = new Order(); order.setName(name); order.setPhone(phone); + order.setOrderStatus(OrderStatus.PAID.getCode()); return orderMapper.selectByNameAndPhone(order); } diff --git a/src/main/java/cn/mafangui/hotel/service/impl/WorkerServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/WorkerServiceImpl.java index 4b74e48..071fdcf 100644 --- a/src/main/java/cn/mafangui/hotel/service/impl/WorkerServiceImpl.java +++ b/src/main/java/cn/mafangui/hotel/service/impl/WorkerServiceImpl.java @@ -53,4 +53,9 @@ public class WorkerServiceImpl implements WorkerService { public Worker login(String username, String password,String role) { return workerMapper.selectByUsernameAndPassword(username,password,role); } + + @Override + public Worker login(String username, String password) { + return workerMapper.selectByUsernamePassword(username,password); + } } diff --git a/src/main/java/cn/mafangui/hotel/utils/RandomCreation.java b/src/main/java/cn/mafangui/hotel/utils/RandomCreation.java index 0868c6d..f4f205e 100644 --- a/src/main/java/cn/mafangui/hotel/utils/RandomCreation.java +++ b/src/main/java/cn/mafangui/hotel/utils/RandomCreation.java @@ -128,19 +128,19 @@ public class RandomCreation { return map; } - public static void main(String[] args) { - User user = new User(); - for (int i = 0; i < 30; i++) { - Map m = getAddress(); - user.setName((String) m.get("name")); - user.setUsername((String) m.get("username")); - user.setPassword((String) m.get("password")); - user.setGender((String) m.get("gender")); - user.setPhone((String) m.get("phone")); - user.setAddress((String) m.get("road")); - user.setEmail((String) m.get("email")); - user.setIdcard((String) m.get("idcard")); -// userService.insertUser(user); - } - } +// public static void main(String[] args) { +// User user = new User(); +// for (int i = 0; i < 30; i++) { +// Map m = getAddress(); +// user.setName((String) m.get("name")); +// user.setUsername((String) m.get("username")); +// user.setPassword((String) m.get("password")); +// user.setGender((String) m.get("gender")); +// user.setPhone((String) m.get("phone")); +// user.setAddress((String) m.get("road")); +// user.setEmail((String) m.get("email")); +// user.setIdcard((String) m.get("idcard")); +//// userService.insertUser(user); +// } +// } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 734e548..897f18d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -9,8 +9,8 @@ server: spring: datasource: driver-class-name: com.mysql.jdbc.Driver - username: muamua - password: muamua + username: root + password: liyiyong1997 url: jdbc:mysql://localhost:3306/hotel?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=true mybatis: type-aliases-package: classpath*:cn.mafangui.hotel.entity diff --git a/src/main/resources/mybatis/mapper/CheckInMapper.xml b/src/main/resources/mybatis/mapper/CheckInMapper.xml index c0ccd53..bb0e23d 100644 --- a/src/main/resources/mybatis/mapper/CheckInMapper.xml +++ b/src/main/resources/mybatis/mapper/CheckInMapper.xml @@ -45,7 +45,7 @@ update_time) values (#{checkInId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},#{roomId,jdbcType=INTEGER}, #{roomNumber,jdbcType=VARCHAR}, #{peoCount,jdbcType=INTEGER}, #{persons,jdbcType=VARCHAR}, - #{ids,jdbcType=VARCHAR}, #{checkInTime,jdbcType=TIMESTAMP}, now(),now()) + #{ids,jdbcType=VARCHAR}, now(), now(),now()) insert into check_in diff --git a/src/main/resources/mybatis/mapper/OrderMapper.xml b/src/main/resources/mybatis/mapper/OrderMapper.xml index ce480bb..64d91f7 100644 --- a/src/main/resources/mybatis/mapper/OrderMapper.xml +++ b/src/main/resources/mybatis/mapper/OrderMapper.xml @@ -32,10 +32,11 @@ from order_info - select from order_info where name = #{name,jdbcType=VARCHAR} and phone = #{phone,jdbcType=VARCHAR} + and order_status = #{orderStatus,jdbcType=INTEGER} +