From dbee98a4f0bed90d25d24e9a76e83a8d3dbe6a3a Mon Sep 17 00:00:00 2001 From: freeebird <1032796097@qq.com> Date: Mon, 12 Nov 2018 15:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90WorkerService=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 --- .../hotel/controller/AdminController.java | 132 ------------- .../hotel/controller/HotelController.java | 114 ----------- .../hotel/controller/RoomController.java | 179 ----------------- .../hotel/controller/RoomTypeController.java | 101 ---------- .../hotel/controller/UserController.java | 98 --------- .../hotel/controller/WorkerController.java | 101 ---------- .../java/cn/mafangui/hotel/entity/Admin.java | 66 ------- .../java/cn/mafangui/hotel/entity/User.java | 14 -- .../java/cn/mafangui/hotel/entity/Worker.java | 18 ++ .../cn/mafangui/hotel/mapper/AdminMapper.java | 21 -- .../cn/mafangui/hotel/mapper/UserMapper.java | 11 -- .../mafangui/hotel/mapper/WorkerMapper.java | 11 ++ .../mafangui/hotel/service/AdminService.java | 14 -- .../mafangui/hotel/service/UserService.java | 10 +- .../mafangui/hotel/service/WorkerService.java | 16 +- .../hotel/service/impl/AdminServiceImpl.java | 90 --------- .../hotel/service/impl/HotelServiceImpl.java | 45 ----- .../hotel/service/impl/RoomServiceImpl.java | 60 ------ .../service/impl/RoomTypeServiceImpl.java | 50 ----- .../hotel/service/impl/UserServiceImpl.java | 54 ----- .../hotel/service/impl/WorkerServiceImpl.java | 26 +-- .../cn/mafangui/hotel/utils/StaticString.java | 5 + src/main/resources/application.yml | 2 +- src/main/resources/generatorConfig.xml | 2 +- src/main/resources/mapper/CheckInMapper.xml | 153 -------------- src/main/resources/mapper/HotelMapper.xml | 141 ------------- src/main/resources/mapper/OrderMapper.xml | 164 --------------- src/main/resources/mapper/RoomMapper.xml | 153 -------------- src/main/resources/mapper/RoomTypeMapper.xml | 164 --------------- src/main/resources/mapper/UserMapper.xml | 160 --------------- src/main/resources/mapper/WorkerMapper.xml | 177 ----------------- .../resources/mybatis/mapper/AdminMapper.xml | 106 ---------- .../mybatis/mapper/CheckInMapper.xml | 68 +++---- .../{ => mybatis}/mapper/DepartmentMapper.xml | 0 .../resources/mybatis/mapper/HotelMapper.xml | 25 ++- .../resources/mybatis/mapper/OrderMapper.xml | 102 +++++----- .../{ => mybatis}/mapper/OrderTypeMapper.xml | 0 .../resources/mybatis/mapper/RoomMapper.xml | 159 +++++++-------- .../mybatis/mapper/RoomTypeMapper.xml | 187 +++++++++++------- .../resources/mybatis/mapper/UserMapper.xml | 121 +++++------- .../resources/mybatis/mapper/WorkerMapper.xml | 157 ++++++++------- .../mafangui/hotel/HotelApplicationTests.java | 16 -- .../hotel/controller/AdminControllerTest.java | 57 ------ .../hotel/controller/RoomControllerTest.java | 54 ----- .../controller/RoomTypeControllerTest.java | 42 ---- .../controller/WorkerControllerTest.java | 66 ------- .../mafangui/hotel/mapper/UserMapperTest.java | 25 +++ .../service/impl/WorkerServiceImplTest.java | 100 ++++++++++ 48 files changed, 598 insertions(+), 3039 deletions(-) delete mode 100644 src/main/java/cn/mafangui/hotel/controller/AdminController.java delete mode 100644 src/main/java/cn/mafangui/hotel/controller/HotelController.java delete mode 100644 src/main/java/cn/mafangui/hotel/controller/RoomController.java delete mode 100644 src/main/java/cn/mafangui/hotel/controller/RoomTypeController.java delete mode 100644 src/main/java/cn/mafangui/hotel/controller/UserController.java delete mode 100644 src/main/java/cn/mafangui/hotel/controller/WorkerController.java delete mode 100644 src/main/java/cn/mafangui/hotel/entity/Admin.java delete mode 100644 src/main/java/cn/mafangui/hotel/mapper/AdminMapper.java delete mode 100644 src/main/java/cn/mafangui/hotel/service/AdminService.java delete mode 100644 src/main/java/cn/mafangui/hotel/service/impl/AdminServiceImpl.java delete mode 100644 src/main/java/cn/mafangui/hotel/service/impl/HotelServiceImpl.java delete mode 100644 src/main/java/cn/mafangui/hotel/service/impl/RoomServiceImpl.java delete mode 100644 src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java delete mode 100644 src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java delete mode 100644 src/main/resources/mapper/CheckInMapper.xml delete mode 100644 src/main/resources/mapper/HotelMapper.xml delete mode 100644 src/main/resources/mapper/OrderMapper.xml delete mode 100644 src/main/resources/mapper/RoomMapper.xml delete mode 100644 src/main/resources/mapper/RoomTypeMapper.xml delete mode 100644 src/main/resources/mapper/UserMapper.xml delete mode 100644 src/main/resources/mapper/WorkerMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/AdminMapper.xml rename src/main/resources/{ => mybatis}/mapper/DepartmentMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapper/OrderTypeMapper.xml (100%) delete mode 100644 src/test/java/cn/mafangui/hotel/HotelApplicationTests.java delete mode 100644 src/test/java/cn/mafangui/hotel/controller/AdminControllerTest.java delete mode 100644 src/test/java/cn/mafangui/hotel/controller/RoomControllerTest.java delete mode 100644 src/test/java/cn/mafangui/hotel/controller/RoomTypeControllerTest.java delete mode 100644 src/test/java/cn/mafangui/hotel/controller/WorkerControllerTest.java create mode 100644 src/test/java/cn/mafangui/hotel/mapper/UserMapperTest.java create mode 100644 src/test/java/cn/mafangui/hotel/service/impl/WorkerServiceImplTest.java diff --git a/src/main/java/cn/mafangui/hotel/controller/AdminController.java b/src/main/java/cn/mafangui/hotel/controller/AdminController.java deleted file mode 100644 index 41af644..0000000 --- a/src/main/java/cn/mafangui/hotel/controller/AdminController.java +++ /dev/null @@ -1,132 +0,0 @@ -package cn.mafangui.hotel.controller; - -import cn.mafangui.hotel.entity.Admin; -import cn.mafangui.hotel.service.AdminService; -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; - -import java.util.HashMap; - -@RestController -@RequestMapping(value = "/admin") -public class AdminController { - @Autowired - private AdminService adminService; - - /** - * 管理员登录 - * @param username - * @param password - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/login") - public HashMap login(String username, String password){ - HashMap result = new HashMap(); - Admin admin = new Admin(); - admin.setUserName(username); - admin.setPassword(password); - System.out.println(admin); - if (adminService.selectByUserName(username) == null){ - result.put("data","用户名不存在!"); - }else if (adminService.login(admin) == null){ - result.put("data","用户名或密码不正确!"); - }else { - result.put("data","登录成功!"); - } - result.put("code",20000); - result.put("token","admin"); - return result; - } - - @RequestMapping(value = "/logout") - public HashMap logout(String token) { - HashMap result = new HashMap(); - result.put("code",20000); - result.put("data",token); - return result; - } - - @RequestMapping(value = "/info") - public HashMap info(String token, String username) { - HashMap result = new HashMap(); - HashMap data = new HashMap(); - Admin admin = adminService.selectByUserName(username); - if (admin == null){ - data.put("data","用户名不存在!"); - }else { - data.put("data",admin); - } - result.put("code",20000); - String[] roles = {"admin"}; - data.put("roles",roles); - result.put("data",data); - return result; - } - - /** - * 管理员注册 - * @param userName - * @param password - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/register") - public int register(String userName, String password){ - Admin admin = new Admin(); - admin.setUserName(userName); - admin.setPassword(password); - return adminService.register(admin); - } - - /** - * 更新资料 - * @param userName - * @param password - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/updateProfile") - public int updateProfile(String userName, String password){ - Admin admin = new Admin(); - admin.setUserName(userName); - admin.setPassword(password); - return adminService.updateProfile(admin); - } - - /** - * 更改密码 - * @param userName - * @param password - * @param newPassword - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/updatePassword") - public int updatePassword(String userName, String password,String newPassword){ - Admin admin = new Admin(); - admin.setUserName(userName); - admin.setPassword(password); - return adminService.updatePassword(admin,newPassword); - } - - /** - * 查找管理员 - * @param userName - * @return - */ - @RequestMapping(value = "/getAdmin") - public Admin getAdmin(String userName){ - return adminService.selectByUserName(userName); - } - - /** - * 查找所有管理员 - * @return - */ - @RequestMapping(value = "/getAllAdmin") - public HashMap getAllAdmin(){ - HashMap result = new HashMap(); - result.put("code",1); - result.put("data",adminService.findAll()); - return result; - } -} diff --git a/src/main/java/cn/mafangui/hotel/controller/HotelController.java b/src/main/java/cn/mafangui/hotel/controller/HotelController.java deleted file mode 100644 index 7016bd6..0000000 --- a/src/main/java/cn/mafangui/hotel/controller/HotelController.java +++ /dev/null @@ -1,114 +0,0 @@ -package cn.mafangui.hotel.controller; - - -import cn.mafangui.hotel.entity.Hotel; -import cn.mafangui.hotel.service.HotelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping(value = "/hotelInfo") -public class HotelController { - @Autowired - private HotelService hotelService; - /** - * 添加酒店信息 - * @param hotelName - * @param phone - * @param telephone - * @param email - * @param address - * @param website - * @return - */ - @RequestMapping(value = "/add") - public int addHotel(String hotelName,String phone,String telephone,String email,String address,String website){ - int result = 0; - Hotel hotel = new Hotel(hotelName,phone,telephone,email,address,website); - try { - result = hotelService.addHotel(hotel); - }catch (Exception e){ - result = -1; - } - return result; - } - - /** - * 删除酒店信息 - * @param hotelId - * @return - */ - @RequestMapping(value = "/delete") - public int deleteHotel(int hotelId){ - int result = 0; - try { - result = hotelService.deleteHotel(hotelId); - }catch (Exception e){ - result = -1; - } - return result; - } - - /** - * 更改酒店信息 - * @param hotelName - * @param phone - * @param telephone - * @param email - * @param address - * @param website - * @return - */ - @RequestMapping(value = "/update") - public int updateHotel(int hotelId,String hotelName,String phone,String telephone,String email,String address,String website){ - int result = 0; - Hotel hotel = new Hotel(hotelName,phone,telephone,email,address,website); - hotel.setHotelId(hotelId); - try{ - result = hotelService.updateHotel(hotel); - }catch (Exception e){ - result = -1; - } - return result; - } - - /** - * 根据id查询 - * @param hotelId - * @return - */ - @RequestMapping(value = "/withId") - public Hotel selectHotel(int hotelId){ - try { - return hotelService.selectHotelById(hotelId); - }catch (Exception e){ - return null; - } - } - - /** - * 根据酒店名查询 - * @param hotelName - * @return - */ - @RequestMapping(value = "/withName") - public Hotel selectHotel(String hotelName){ - try { - return hotelService.selectHotelByName(hotelName); - }catch (Exception e){ - return null; - } - } - - /** - * 所有酒店信息 - * @return - */ - @RequestMapping(value = "/all") - public List allHotel(){ - return hotelService.findAllHotel(); - } -} diff --git a/src/main/java/cn/mafangui/hotel/controller/RoomController.java b/src/main/java/cn/mafangui/hotel/controller/RoomController.java deleted file mode 100644 index 30dbeef..0000000 --- a/src/main/java/cn/mafangui/hotel/controller/RoomController.java +++ /dev/null @@ -1,179 +0,0 @@ -package cn.mafangui.hotel.controller; - - -import cn.mafangui.hotel.entity.Room; -import cn.mafangui.hotel.service.RoomService; -import cn.mafangui.hotel.utils.StaticString; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; - -@RestController -@RequestMapping(value = "/roomInfo") -public class RoomController { - @Autowired - private RoomService roomService; - - /** - * 增加房间 - * @param roomNumber - * @param roomFloor - * @param typeName - * @param roomPrice - * @param roomDiscount - * @param roomStatus - * @param remark - * @return - */ - @RequestMapping(value = "/add") - public HashMap addRoom(String roomNumber, int roomFloor, String typeName, - double roomPrice,double roomDiscount,String roomStatus,String remark){ - HashMap result = new HashMap(); - int data = 0; - Room room = new Room(roomNumber,roomFloor,typeName,roomPrice,roomDiscount,roomStatus,remark); - try { - data = roomService.addRoom(room); - }catch (Exception e){ - data = -1; - } - result.put(StaticString.CODE,20000); - result.put(StaticString.DATA,data); - return result; - } - - /** - * 根据房间id或者房间号码删除房间 - * @param roomId - * @param roomNumber - * @return - */ - @RequestMapping(value = "/delete") - public HashMap deleteRoom(int roomId,String roomNumber){ - HashMap result = new HashMap(); - int data = 0; - try { - if (roomNumber == null || "".equals(roomNumber)){ - data = roomService.deleteRoom(roomId); - }else { - data = roomService.deleteRoom(roomNumber); - } - }catch (Exception e){ - data = -1; - } - result.put(StaticString.CODE,20000); - result.put(StaticString.DATA,data); - return result; - } - - /** - * 更改房间信息 - * @param roomId - * @param roomNumber - * @param roomFloor - * @param typeName - * @param roomPrice - * @param roomDiscount - * @param roomStatus - * @param remark - * @return - */ - @RequestMapping(value = "/update") - public HashMap updateRoom(int roomId,String roomNumber, int roomFloor, String typeName, - double roomPrice,double roomDiscount,String roomStatus,String remark){ - HashMap result = new HashMap(); - int data = 0; - Room room = new Room(roomNumber,roomFloor,typeName,roomPrice,roomDiscount,roomStatus,remark); - room.setRoomId(roomId); - try { - data = roomService.updateRoom(room); - }catch (Exception e){ - data = -1; - } - result.put(StaticString.CODE,20000); - result.put(StaticString.DATA,data); - return result; - } - - /** - * 查询所有房间 - * @return - */ - @RequestMapping(value = "/all") - public HashMap allRoom(){ - HashMap result = new HashMap(); - result.put(StaticString.DATA,roomService.findAll()); - result.put(StaticString.CODE,20000); - return result; - } - - /** - * 根据id - * 查询房间信息 - * @param roomId - * @return - */ - @RequestMapping(value = "/withId") - public HashMap findRoomById(int roomId){ - HashMap result = new HashMap(); - result.put(StaticString.CODE,20000); - try{ - result.put(StaticString.DATA,roomService.findById(roomId)); - }catch (Exception e){ - result.put(StaticString.DATA,-1); - } - return result; - } - - /** - * 根据房号查询房间信息 - * @param roomNumber - * @return - */ - @RequestMapping(value = "/withRoomNumber") - public HashMap findRoomByNumber(String roomNumber){ - HashMap result = new HashMap(); - result.put(StaticString.CODE,20000); - try{ - result.put(StaticString.DATA,roomService.findByNumber(roomNumber)); - }catch (Exception e){ - result.put(StaticString.DATA,-1); - } - return result; - } - - /** - * 根据状态查询房间信息 - * @param roomStatus - * @return - */ - @RequestMapping(value = "/withStatus") - public HashMap findRoomByStatus(String roomStatus){ - HashMap result = new HashMap(); - result.put(StaticString.CODE,20000); - try{ - result.put(StaticString.DATA,roomService.findByStatus(roomStatus)); - }catch (Exception e){ - result.put(StaticString.DATA,-1); - } - return result; - } - - /** - * 根据类型查询房间信息 - * @param typeName - * @return - */ - @RequestMapping(value = "/withType") - public HashMap findRoomByType(String typeName){ - HashMap result = new HashMap(); - result.put(StaticString.CODE,20000); - try{ - result.put(StaticString.DATA,roomService.findByType(typeName)); - }catch (Exception e){ - result.put(StaticString.DATA,-1); - } - return result; - } -} diff --git a/src/main/java/cn/mafangui/hotel/controller/RoomTypeController.java b/src/main/java/cn/mafangui/hotel/controller/RoomTypeController.java deleted file mode 100644 index 60c45b4..0000000 --- a/src/main/java/cn/mafangui/hotel/controller/RoomTypeController.java +++ /dev/null @@ -1,101 +0,0 @@ -package cn.mafangui.hotel.controller; - -import cn.mafangui.hotel.entity.RoomType; -import cn.mafangui.hotel.service.RoomTypeService; -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; - -import java.util.HashMap; - -@RestController -@RequestMapping(value = "/roomType") -public class RoomTypeController { - private final String CODE = "code"; - private final String DATA = "data"; - - @Autowired - private RoomTypeService roomTypeService; - - /** - * 添加房间类型 - * @param roomType - * @param typeName - * @param bookingPrice - * @param bookingDiscount - * @param remark - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/add") - public HashMap addNewType(int roomType,String typeName,double bookingPrice,double bookingDiscount,String remark){ - HashMap result = new HashMap(); - result.put(CODE,20000); - RoomType rt = new RoomType(roomType,typeName,bookingPrice,bookingDiscount,remark); - result.put(DATA,roomTypeService.addRoomType(rt)); - return result; - } - - /** - * 根据id - * 删除房间类型 - * @param typeId - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/del") - public HashMap delType(int typeId){ - HashMap result = new HashMap(); - result.put(CODE,20000); - result.put(DATA,roomTypeService.delById(typeId)); - return result; - } - - public HashMap massDeletion(int[] typeId){ - HashMap result = new HashMap(); - result.put(CODE,20000); - return result; - } - - /** - * 更改房间类型 - * @param roomType - * @param typeName - * @param bookingPrice - * @param bookingDiscount - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/update") - public HashMap updateType(int typeId,int roomType,String typeName,double bookingPrice,double bookingDiscount,String remark){ - HashMap result = new HashMap(); - result.put(CODE,20000); - RoomType rt = new RoomType(roomType,typeName,bookingPrice,bookingDiscount,remark); - rt.setTypeId(typeId); - result.put(DATA,roomTypeService.updateRoomType(rt)); - return result; - } - - /** - * 查询房间类型 - * @param typeId - * @return - */ - @RequestMapping(value = "/withId") - public HashMap findByRoomType(int typeId){ - HashMap result = new HashMap(); - result.put(CODE,20000); - result.put(DATA, roomTypeService.selectById(typeId)); - return result; - } - - /** - * 查询所有房间类型 - * @return - */ - @RequestMapping(value = "/all") - public HashMap findAllRoomType(){ - HashMap result = new HashMap(); - result.put("code",20000); - result.put("data",roomTypeService.findAllType()); - return result; - } -} diff --git a/src/main/java/cn/mafangui/hotel/controller/UserController.java b/src/main/java/cn/mafangui/hotel/controller/UserController.java deleted file mode 100644 index 4b6c310..0000000 --- a/src/main/java/cn/mafangui/hotel/controller/UserController.java +++ /dev/null @@ -1,98 +0,0 @@ -package cn.mafangui.hotel.controller; - - -import cn.mafangui.hotel.entity.User; -import cn.mafangui.hotel.service.UserService; -import cn.mafangui.hotel.utils.StaticString; -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; - -import java.util.HashMap; -import java.util.List; - -@RestController -@RequestMapping(value = "/user") -public class UserController { - - @Autowired - private UserService userService; - /** - * 更新资料 - * @param username - * @param password - * @param name - * @param phone - * @param email - * @param address - * @param idcard - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/updateProfile") - public int updateProfile(String username, String password, String name,String gender, - String phone, String email, String address, String idcard){ - User user = new User(username,password,name,gender,phone,email,address,idcard); - return userService.updateProfile(user); - } - - - public HashMap updatePassword(String username, String oldPassword, String newPassword){ - HashMap response = new HashMap(); - if (userService.login(username,oldPassword) == null){ - response.put(StaticString.CODE,200); - response.put(StaticString.STATUS,"密码错误"); - }else { - User user = new User(); - user.setPassword(newPassword); - int result = userService.updateProfile(user); - response.put(StaticString.DATA,result); - } - return response; - } - - /** - * - * @param username - * @param password - * @param name - * @param gender - * @param phone - * @param email - * @param address - * @param idcard - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/register") - public HashMap userRegister(String username, String password, String name,String gender, - String phone, String email, String address, String idcard){ - HashMap response = new HashMap(); - User user = new User(username,password,name,phone,gender,email,address,idcard); - response.put(StaticString.CODE,200); - response.put(StaticString.DATA,userService.register(user)); - return response; - } - /** - * 登录 - * @param username - * @param password - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/login") - public HashMap userLogin(String username, String password){ - HashMap response = new HashMap(); - response.put(StaticString.CODE,200); - response.put(StaticString.DATA,userService.login(username,password)); - return response; - } - /** - * 查看用户资料 - * @param userName - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = "/getProfile") - public User getProfile(String userName){ - return userService.selectByUserName(userName); - } - -} diff --git a/src/main/java/cn/mafangui/hotel/controller/WorkerController.java b/src/main/java/cn/mafangui/hotel/controller/WorkerController.java deleted file mode 100644 index 519d637..0000000 --- a/src/main/java/cn/mafangui/hotel/controller/WorkerController.java +++ /dev/null @@ -1,101 +0,0 @@ -package cn.mafangui.hotel.controller; - -import cn.mafangui.hotel.entity.Worker; -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; - -import java.util.HashMap; -import java.util.List; - -@RestController -@RequestMapping(value = "/worker") -public class WorkerController { - private final String CODE = "code"; - private final String DATA = "data"; - @Autowired - private WorkerService workerService; - - /** - * 操作员登录 - * @param userName - * @param password - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/login") - public int login(String userName,String password){ - Worker worker = new Worker(userName,password); - if (workerService.login(worker) !=null ){ - return 1; - }else { - return 0; - } - } - - /** - * 添加操作员 - * @param userName - * @param password - * @param workerName - * @param phone - * @param email - * @param address - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/add") - public int addWorker(String userName,String password,String workerName,String phone,String email,String address){ - Worker worker = new Worker(userName,password,workerName,phone,email,address); - return workerService.addWorker(worker); - } - - /** - * 删除操作员 - * @param userName - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/del") - public int delWorker(String userName){ - return workerService.delWorker(userName); - } - - /** - * 更改操作员信息 - * @param userName - * @param password - * @param workerName - * @param phone - * @param email - * @param address - * @return - */ - @RequestMapping(method = RequestMethod.POST,value = "/update") - public int updateWorker(String userName,String password,String workerName,String phone,String email,String address){ - Worker worker = new Worker(userName,password,workerName,phone,email,address); - return workerService.updateWorker(worker); - } - - /** - * 查找操作员 - * @param userName - * @return - */ - @RequestMapping(value = "/query") - public Worker queryWorker(String userName){ - return workerService.selectWorker(userName); - } - - /** - * 查找所有操作员 - * @return - */ - @RequestMapping(value = "/all") - public HashMap findAllWorkers(){ - HashMap result = new HashMap(); - result.put(CODE,20000); - result.put(DATA,workerService.findAllWorker()); - return result; - } - -} diff --git a/src/main/java/cn/mafangui/hotel/entity/Admin.java b/src/main/java/cn/mafangui/hotel/entity/Admin.java deleted file mode 100644 index 587d699..0000000 --- a/src/main/java/cn/mafangui/hotel/entity/Admin.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.mafangui.hotel.entity; - -import java.util.Date; - -public class Admin { - private Integer adminId; - - private String userName; - - private String password; - - private Date createTime; - - private Date updateTime; - - public Integer getAdminId() { - return adminId; - } - - public void setAdminId(Integer adminId) { - this.adminId = adminId; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName == null ? null : userName.trim(); - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password == null ? null : password.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "Admin{" + - "adminId=" + adminId + - ", userName='" + userName + '\'' + - ", password='" + password + '\'' + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/entity/User.java b/src/main/java/cn/mafangui/hotel/entity/User.java index 7179b16..2a53359 100644 --- a/src/main/java/cn/mafangui/hotel/entity/User.java +++ b/src/main/java/cn/mafangui/hotel/entity/User.java @@ -25,20 +25,6 @@ public class User { private Date updateTime; - public User() { - } - - public User(String username, String password, String name, String gender, String phone, String email, String address, String idcard) { - this.username = username; - this.password = password; - this.name = name; - this.gender = gender; - this.phone = phone; - this.email = email; - this.address = address; - this.idcard = idcard; - } - public Integer getUserId() { return userId; } diff --git a/src/main/java/cn/mafangui/hotel/entity/Worker.java b/src/main/java/cn/mafangui/hotel/entity/Worker.java index 20dbedd..e296561 100644 --- a/src/main/java/cn/mafangui/hotel/entity/Worker.java +++ b/src/main/java/cn/mafangui/hotel/entity/Worker.java @@ -122,4 +122,22 @@ public class Worker { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + @Override + public String toString() { + return "Worker{" + + "workerId=" + workerId + + ", role='" + role + '\'' + + ", username='" + username + '\'' + + ", password='" + password + '\'' + + ", name='" + name + '\'' + + ", gender='" + gender + '\'' + + ", phone='" + phone + '\'' + + ", department=" + department + + ", email='" + email + '\'' + + ", address='" + address + '\'' + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + '}'; + } } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/mapper/AdminMapper.java b/src/main/java/cn/mafangui/hotel/mapper/AdminMapper.java deleted file mode 100644 index 825edb6..0000000 --- a/src/main/java/cn/mafangui/hotel/mapper/AdminMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.mafangui.hotel.mapper; - -import cn.mafangui.hotel.entity.Admin; -import jdk.internal.dynalink.linker.LinkerServices; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -public interface AdminMapper { - int deleteByPrimaryKey(Integer adminId); - int insert(Admin record); - int insertSelective(Admin record); - Admin selectByPrimaryKey(Integer adminId); - int updateByPrimaryKeySelective(Admin record); - int updateByPrimaryKey(Admin record); - Admin selectByUserName(String userName); - Admin selectByUserNameAndPassword(Admin record); - int updateByUserNameSelective(Admin record); - List findAll(); -} \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/mapper/UserMapper.java b/src/main/java/cn/mafangui/hotel/mapper/UserMapper.java index 6dc5491..88253b4 100644 --- a/src/main/java/cn/mafangui/hotel/mapper/UserMapper.java +++ b/src/main/java/cn/mafangui/hotel/mapper/UserMapper.java @@ -1,11 +1,8 @@ package cn.mafangui.hotel.mapper; import cn.mafangui.hotel.entity.User; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; -import java.util.List; - @Component public interface UserMapper { int deleteByPrimaryKey(Integer userId); @@ -19,12 +16,4 @@ public interface UserMapper { int updateByPrimaryKeySelective(User record); int updateByPrimaryKey(User record); - - int count(); - - List selectAll(); - - User selectByUsernameAndPassword(@Param("username") String username, @Param("password") String password); - - } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java b/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java index 33013ec..7a91008 100644 --- a/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java +++ b/src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java @@ -1,7 +1,12 @@ package cn.mafangui.hotel.mapper; import cn.mafangui.hotel.entity.Worker; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; +import java.util.List; + +@Component public interface WorkerMapper { int deleteByPrimaryKey(Integer workerId); @@ -14,4 +19,10 @@ public interface WorkerMapper { int updateByPrimaryKeySelective(Worker record); int updateByPrimaryKey(Worker record); + + Worker selectByUsernameAndPassword(@Param("username") String username, @Param("password") String password); + + List selectByRole(String role); + + List selectAll(); } \ No newline at end of file diff --git a/src/main/java/cn/mafangui/hotel/service/AdminService.java b/src/main/java/cn/mafangui/hotel/service/AdminService.java deleted file mode 100644 index 97ebc70..0000000 --- a/src/main/java/cn/mafangui/hotel/service/AdminService.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.mafangui.hotel.service; - -import cn.mafangui.hotel.entity.Admin; - -import java.util.List; - -public interface AdminService { - Admin login(Admin admin); - int register(Admin admin); - Admin selectByUserName(String userName); - int updateProfile(Admin admin); - int updatePassword(Admin admin,String newPassword); - List findAll(); -} diff --git a/src/main/java/cn/mafangui/hotel/service/UserService.java b/src/main/java/cn/mafangui/hotel/service/UserService.java index da9430d..f7359c1 100644 --- a/src/main/java/cn/mafangui/hotel/service/UserService.java +++ b/src/main/java/cn/mafangui/hotel/service/UserService.java @@ -15,10 +15,10 @@ public interface UserService { User selectByUserName(String userName); - int count(); - - List findAll(); - - int updateProfile(User user); +// int count(); +// +// List findAll(); +// +// int updateProfile(User user); } diff --git a/src/main/java/cn/mafangui/hotel/service/WorkerService.java b/src/main/java/cn/mafangui/hotel/service/WorkerService.java index 79ad25d..e708683 100644 --- a/src/main/java/cn/mafangui/hotel/service/WorkerService.java +++ b/src/main/java/cn/mafangui/hotel/service/WorkerService.java @@ -5,13 +5,11 @@ import cn.mafangui.hotel.entity.Worker; import java.util.List; public interface WorkerService { - - int addWorker(Worker worker); - int delWorker(String userName); - int updateWorker(Worker worker); - Worker selectWorker(String userName); - List findAllWorker(); - Worker login(Worker worker); - int logout(Worker worker); - + int insert(Worker worker); + int delete(int workerId); + int updateById(Worker worker); + Worker selectById(int workerId); + List findAll(); + List selectByRole(String role); + Worker login(String username,String password); } diff --git a/src/main/java/cn/mafangui/hotel/service/impl/AdminServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/AdminServiceImpl.java deleted file mode 100644 index 72ab984..0000000 --- a/src/main/java/cn/mafangui/hotel/service/impl/AdminServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.mafangui.hotel.service.impl; - -import cn.mafangui.hotel.entity.Admin; -import cn.mafangui.hotel.mapper.AdminMapper; -import cn.mafangui.hotel.service.AdminService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class AdminServiceImpl implements AdminService { - @Autowired - private AdminMapper adminMapper; - - /** - * 登录 - * @param admin - * @return - */ - @Override - public Admin login(Admin admin) { - return adminMapper.selectByUserNameAndPassword(admin); - } - - /** - * 注册 - * @param admin - * @return - */ - @Override - public int register(Admin admin) { - return adminMapper.insertSelective(admin); - } - - /** - * 根据username查找 - * @param userName - * @return - */ - @Override - public Admin selectByUserName(String userName) { - Admin result = adminMapper.selectByUserName(userName); - if (result != null){ - result.setPassword(null); - } - return result; - } - - /** - * 更新信息 - * @param admin - * @return - */ - @Override - public int updateProfile(Admin admin) { - return adminMapper.updateByUserNameSelective(admin); - } - - /** - * 更改密码 - * @param admin - * @param newPassword - * @return - */ - @Override - public int updatePassword(Admin admin, String newPassword) { - int result = 0; - if(adminMapper.selectByUserNameAndPassword(admin) != null){ - admin.setPassword(newPassword); - result = adminMapper.updateByUserNameSelective(admin); - } - return result; - } - - - /** - * 列出所有管理员 - * @return - */ - @Override - public List findAll() { - List result; - result = adminMapper.findAll(); - for (Admin admin : result) { - admin.setPassword(null); - } - return result; - } -} diff --git a/src/main/java/cn/mafangui/hotel/service/impl/HotelServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/HotelServiceImpl.java deleted file mode 100644 index 9dda12f..0000000 --- a/src/main/java/cn/mafangui/hotel/service/impl/HotelServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.mafangui.hotel.service.impl; - -import cn.mafangui.hotel.entity.Hotel; -import cn.mafangui.hotel.mapper.HotelMapper; -import cn.mafangui.hotel.service.HotelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class HotelServiceImpl implements HotelService { - @Autowired - private HotelMapper hotelMapper; - - @Override - public int addHotel(Hotel hotel) { - return hotelMapper.insertSelective(hotel); - } - - @Override - public int deleteHotel(int hotelId) { - return hotelMapper.deleteByPrimaryKey(hotelId); - } - - @Override - public int updateHotel(Hotel hotel) { - return hotelMapper.updateByPrimaryKeySelective(hotel); - } - - @Override - public Hotel selectHotelByName(String hotelName) { - return hotelMapper.selectByName(hotelName); - } - - @Override - public Hotel selectHotelById(int hotelId) { - return hotelMapper.selectByPrimaryKey(hotelId); - } - - @Override - public List findAllHotel() { - return hotelMapper.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 deleted file mode 100644 index c911b2a..0000000 --- a/src/main/java/cn/mafangui/hotel/service/impl/RoomServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -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 addRoom(Room room) { - return roomMapper.insert(room); - } - - @Override - public int deleteRoom(int roomId) { - return roomMapper.deleteByPrimaryKey(roomId); - } - - @Override - public int deleteRoom(String roomNumber) { - return roomMapper.deleteByRoomNumber(roomNumber); - } - - @Override - public int updateRoom(Room room) { - return roomMapper.updateByPrimaryKeySelective(room); - } - - @Override - public Room findById(int roomId) { - return roomMapper.selectByPrimaryKey(roomId); - } - - @Override - public Room findByNumber(String roomNumber) { - return roomMapper.selectByRoomNumber(roomNumber); - } - - @Override - public List findByStatus(String status) { - return roomMapper.selectByStatus(status); - } - - @Override - public List findByType(String typeName) { - return roomMapper.selectByType(typeName); - } - - @Override - public List findAll() { - return roomMapper.selectAllRoom(); - } -} diff --git a/src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java deleted file mode 100644 index 9dfa266..0000000 --- a/src/main/java/cn/mafangui/hotel/service/impl/RoomTypeServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -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 addRoomType(RoomType roomType) { - return roomTypeMapper.insertSelective(roomType); - } - - @Override - public int delRoomType(RoomType roomType) { - return roomTypeMapper.deleteByRoomType(roomType); - } - - @Override - public int delById(int typeId) { - return roomTypeMapper.deleteByPrimaryKey(typeId); - } - - @Override - public int updateRoomType(RoomType roomType) { - return roomTypeMapper.updateByPrimaryKeySelective(roomType); - } - - @Override - public RoomType selectByName(RoomType roomType) { - return roomTypeMapper.selectByRoomType(roomType); - } - - @Override - public RoomType selectById(int typeId) { - return roomTypeMapper.selectByPrimaryKey(typeId); - } - - @Override - public List findAllType() { - return roomTypeMapper.findAll(); - } -} diff --git a/src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java deleted file mode 100644 index 57feea2..0000000 --- a/src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.mafangui.hotel.service.impl; - -import cn.mafangui.hotel.entity.User; - -import cn.mafangui.hotel.mapper.UserMapper; -import cn.mafangui.hotel.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class UserServiceImpl implements UserService { - - @Autowired - private UserMapper userMapper; - - @Override - public User selectById(int id) { - return userMapper.selectByPrimaryKey(id); - } - - @Override - public int register(User user) { - return userMapper.insertSelective(user); - } - - @Override - public User login(String username, String password) { - return userMapper.selectByUsernameAndPassword(username,password); - } - - @Override - public User selectByUserName(String userName) { - return null; - } - - @Override - public int count() { - return userMapper.count(); - } - - @Override - public List findAll() { - return userMapper.selectAll(); - } - - @Override - public int updateProfile(User user) { - return userMapper.updateByPrimaryKeySelective(user); - } - - -} 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 df5083e..4bb79dd 100644 --- a/src/main/java/cn/mafangui/hotel/service/impl/WorkerServiceImpl.java +++ b/src/main/java/cn/mafangui/hotel/service/impl/WorkerServiceImpl.java @@ -15,37 +15,37 @@ public class WorkerServiceImpl implements WorkerService { private WorkerMapper workerMapper; @Override - public int addWorker(Worker worker) { + public int insert(Worker worker) { return workerMapper.insertSelective(worker); } @Override - public int delWorker(String userName) { - return workerMapper.deleteByUserName(userName); + public int delete(int workerId) { + return workerMapper.deleteByPrimaryKey(workerId); } @Override - public int updateWorker(Worker worker) { - return workerMapper.updateByUserNameSelective(worker); + public int updateById(Worker worker) { + return workerMapper.updateByPrimaryKeySelective(worker); } @Override - public Worker selectWorker(String userName) { - return workerMapper.selectByUserName(userName); + public Worker selectById(int workerId) { + return workerMapper.selectByPrimaryKey(workerId); } @Override - public List findAllWorker() { - return workerMapper.findAll(); + public List findAll() { + return workerMapper.selectAll(); } @Override - public Worker login(Worker worker) { - return workerMapper.selectByUserNameAndPassword(worker); + public List selectByRole(String role) { + return workerMapper.selectByRole(role); } @Override - public int logout(Worker worker) { - return 0; + public Worker login(String username, String password) { + return workerMapper.selectByUsernameAndPassword(username,password); } } diff --git a/src/main/java/cn/mafangui/hotel/utils/StaticString.java b/src/main/java/cn/mafangui/hotel/utils/StaticString.java index eb50b55..38bb68d 100644 --- a/src/main/java/cn/mafangui/hotel/utils/StaticString.java +++ b/src/main/java/cn/mafangui/hotel/utils/StaticString.java @@ -5,4 +5,9 @@ public class StaticString { public static final String STATUS = "status"; public static final String DATA = "data"; + /** + * 工作人员角色 + */ + public static final String ADMIN = "admin"; + public static final String OPERATOR = "operator"; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b9a40cc..279269c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,5 +10,5 @@ spring: url: jdbc:mysql://127.0.0.1:3306/hotel?useUnicode=true&characterEncoding=UTF-8 mybatis: type-aliases-package: classpath*:cn.mafangui.hotel.entity - mapper-locations: classpath*:mapper/*.xml + mapper-locations: classpath*:mybatis/mapper/*.xml diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml index 7589e12..2448982 100644 --- a/src/main/resources/generatorConfig.xml +++ b/src/main/resources/generatorConfig.xml @@ -44,7 +44,7 @@ - + diff --git a/src/main/resources/mapper/CheckInMapper.xml b/src/main/resources/mapper/CheckInMapper.xml deleted file mode 100644 index 724a15e..0000000 --- a/src/main/resources/mapper/CheckInMapper.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - check_in_id, order_id, room_number, room_type, peo_count, persons, ids, check_in_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, - 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}, - #{ids,jdbcType=VARCHAR}, #{checkInTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - insert into check_in - - - check_in_id, - - - order_id, - - - room_number, - - - room_type, - - - peo_count, - - - persons, - - - ids, - - - check_in_time, - - - create_time, - - - update_time, - - - - - #{checkInId,jdbcType=INTEGER}, - - - #{orderId,jdbcType=INTEGER}, - - - #{roomNumber,jdbcType=VARCHAR}, - - - #{roomType,jdbcType=VARCHAR}, - - - #{peoCount,jdbcType=INTEGER}, - - - #{persons,jdbcType=VARCHAR}, - - - #{ids,jdbcType=VARCHAR}, - - - #{checkInTime,jdbcType=TIMESTAMP}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update check_in - - - 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}, - - - where check_in_id = #{checkInId,jdbcType=INTEGER} - - - 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} - where check_in_id = #{checkInId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml deleted file mode 100644 index 9682084..0000000 --- a/src/main/resources/mapper/HotelMapper.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - hotel_id, hotel_name, phone, telephone, email, address, website, create_time, update_time - - - - delete from hotel_info - where hotel_id = #{hotelId,jdbcType=INTEGER} - - - insert into hotel_info (hotel_id, hotel_name, phone, - telephone, email, address, - website, create_time, update_time - ) - values (#{hotelId,jdbcType=INTEGER}, #{hotelName,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - #{telephone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, - #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into hotel_info - - - hotel_id, - - - hotel_name, - - - phone, - - - telephone, - - - email, - - - address, - - - website, - - - create_time, - - - update_time, - - - - - #{hotelId,jdbcType=INTEGER}, - - - #{hotelName,jdbcType=VARCHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{telephone,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - #{address,jdbcType=VARCHAR}, - - - #{website,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update hotel_info - - - hotel_name = #{hotelName,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - telephone = #{telephone,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - - website = #{website,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where hotel_id = #{hotelId,jdbcType=INTEGER} - - - update hotel_info - set hotel_name = #{hotelName,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - telephone = #{telephone,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR}, - address = #{address,jdbcType=VARCHAR}, - website = #{website,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where hotel_id = #{hotelId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml deleted file mode 100644 index 1f859df..0000000 --- a/src/main/resources/mapper/OrderMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - order_id, order_type, phone, room_type, num_of_room, order_date, order_days, order_status, - order_cost, create_time, update_time - - - - delete from order_info - where order_id = #{orderId,jdbcType=INTEGER} - - - insert into order_info (order_id, order_type, phone, - room_type, num_of_room, order_date, - order_days, order_status, order_cost, - create_time, update_time) - values (#{orderId,jdbcType=INTEGER}, #{orderType,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, - #{roomType,jdbcType=VARCHAR}, #{numOfRoom,jdbcType=INTEGER}, #{orderDate,jdbcType=DATE}, - #{orderDays,jdbcType=INTEGER}, #{orderStatus,jdbcType=INTEGER}, #{orderCost,jdbcType=DOUBLE}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into order_info - - - order_id, - - - order_type, - - - phone, - - - room_type, - - - num_of_room, - - - order_date, - - - order_days, - - - order_status, - - - order_cost, - - - create_time, - - - update_time, - - - - - #{orderId,jdbcType=INTEGER}, - - - #{orderType,jdbcType=VARCHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{roomType,jdbcType=VARCHAR}, - - - #{numOfRoom,jdbcType=INTEGER}, - - - #{orderDate,jdbcType=DATE}, - - - #{orderDays,jdbcType=INTEGER}, - - - #{orderStatus,jdbcType=INTEGER}, - - - #{orderCost,jdbcType=DOUBLE}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update order_info - - - order_type = #{orderType,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - room_type = #{roomType,jdbcType=VARCHAR}, - - - num_of_room = #{numOfRoom,jdbcType=INTEGER}, - - - order_date = #{orderDate,jdbcType=DATE}, - - - order_days = #{orderDays,jdbcType=INTEGER}, - - - order_status = #{orderStatus,jdbcType=INTEGER}, - - - order_cost = #{orderCost,jdbcType=DOUBLE}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where order_id = #{orderId,jdbcType=INTEGER} - - - update order_info - set order_type = #{orderType,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - room_type = #{roomType,jdbcType=VARCHAR}, - num_of_room = #{numOfRoom,jdbcType=INTEGER}, - order_date = #{orderDate,jdbcType=DATE}, - order_days = #{orderDays,jdbcType=INTEGER}, - order_status = #{orderStatus,jdbcType=INTEGER}, - order_cost = #{orderCost,jdbcType=DOUBLE}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where order_id = #{orderId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/RoomMapper.xml b/src/main/resources/mapper/RoomMapper.xml deleted file mode 100644 index 5aa86f3..0000000 --- a/src/main/resources/mapper/RoomMapper.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - room_id, room_number, type_id, room_type, room_price, room_discount, room_status, - remark, create_time, update_time - - - - delete from room_info - where room_id = #{roomId,jdbcType=INTEGER} - - - insert into room_info (room_id, room_number, type_id, - room_type, room_price, room_discount, - room_status, remark, create_time, - 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}) - - - insert into room_info - - - room_id, - - - room_number, - - - type_id, - - - room_type, - - - room_price, - - - room_discount, - - - room_status, - - - remark, - - - create_time, - - - update_time, - - - - - #{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}, - - - - - update room_info - - - room_number = #{roomNumber,jdbcType=VARCHAR}, - - - type_id = #{typeId,jdbcType=INTEGER}, - - - room_type = #{roomType,jdbcType=VARCHAR}, - - - room_price = #{roomPrice,jdbcType=DOUBLE}, - - - room_discount = #{roomDiscount,jdbcType=DOUBLE}, - - - room_status = #{roomStatus,jdbcType=INTEGER}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where room_id = #{roomId,jdbcType=INTEGER} - - - update room_info - set room_number = #{roomNumber,jdbcType=VARCHAR}, - type_id = #{typeId,jdbcType=INTEGER}, - room_type = #{roomType,jdbcType=VARCHAR}, - room_price = #{roomPrice,jdbcType=DOUBLE}, - room_discount = #{roomDiscount,jdbcType=DOUBLE}, - room_status = #{roomStatus,jdbcType=INTEGER}, - remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where room_id = #{roomId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/RoomTypeMapper.xml b/src/main/resources/mapper/RoomTypeMapper.xml deleted file mode 100644 index 95e4bc3..0000000 --- a/src/main/resources/mapper/RoomTypeMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - type_id, room_type, remark, price, discount, area, bed_num, bed_size, window, create_time, - update_time - - - - delete from room_type - where type_id = #{typeId,jdbcType=BIGINT} - - - 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}, - #{price,jdbcType=DOUBLE}, #{discount,jdbcType=DOUBLE}, #{area,jdbcType=INTEGER}, - #{bedNum,jdbcType=INTEGER}, #{bedSize,jdbcType=VARCHAR}, #{window,jdbcType=INTEGER}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into room_type - - - type_id, - - - room_type, - - - remark, - - - price, - - - discount, - - - area, - - - bed_num, - - - bed_size, - - - window, - - - create_time, - - - update_time, - - - - - #{typeId,jdbcType=BIGINT}, - - - #{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}, - - - - - update room_type - - - room_type = #{roomType,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - price = #{price,jdbcType=DOUBLE}, - - - discount = #{discount,jdbcType=DOUBLE}, - - - area = #{area,jdbcType=INTEGER}, - - - 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 room_type - set room_type = #{roomType,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - price = #{price,jdbcType=DOUBLE}, - discount = #{discount,jdbcType=DOUBLE}, - area = #{area,jdbcType=INTEGER}, - 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} - - \ No newline at end of file diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml deleted file mode 100644 index 23ac0e3..0000000 --- a/src/main/resources/mapper/UserMapper.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - user_id, username, password, name, gender, phone, email, address, idcard, create_time, - update_time - - - - delete from user_info - where user_id = #{userId,jdbcType=INTEGER} - - - insert into user_info (user_id, username, password, - name, gender, phone, email, - address, idcard, create_time, - update_time) - values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, - #{address,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},now(), - now()) - - - insert into user_info - - - user_id, - - - username, - - - password, - - - name, - - - gender, - - - phone, - - - email, - - - address, - - - idcard, - - create_time, - update_time, - - - - #{userId,jdbcType=INTEGER}, - - - #{username,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{gender,jdbcType=CHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - #{address,jdbcType=VARCHAR}, - - - #{idcard,jdbcType=VARCHAR}, - - now(), - now(), - - - - update user_info - - - username = #{username,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - name = #{name,jdbcType=VARCHAR}, - - - gender = #{gender,jdbcType=CHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - - idcard = #{idcard,jdbcType=VARCHAR}, - - update_time = now(), - - where user_id = #{userId,jdbcType=INTEGER} - - - update user_info - set username = #{username,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - gender = #{gender,jdbcType=CHAR}, - phone = #{phone,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR}, - address = #{address,jdbcType=VARCHAR}, - idcard = #{idcard,jdbcType=VARCHAR}, - update_time = now() - where user_id = #{userId,jdbcType=INTEGER} - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/WorkerMapper.xml b/src/main/resources/mapper/WorkerMapper.xml deleted file mode 100644 index a7d2419..0000000 --- a/src/main/resources/mapper/WorkerMapper.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - worker_id, role, username, password, name, gender, phone, department, email, address, - create_time, update_time - - - - delete from worker_info - where worker_id = #{workerId,jdbcType=INTEGER} - - - insert into worker_info (worker_id, role, username, - password, name, gender, - phone, department, email, - address, create_time, update_time - ) - values (#{workerId,jdbcType=INTEGER}, #{role,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, - #{password,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, - #{phone,jdbcType=VARCHAR}, #{department,jdbcType=INTEGER}, #{email,jdbcType=VARCHAR}, - #{address,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into worker_info - - - worker_id, - - - role, - - - username, - - - password, - - - name, - - - gender, - - - phone, - - - department, - - - email, - - - address, - - - create_time, - - - update_time, - - - - - #{workerId,jdbcType=INTEGER}, - - - #{role,jdbcType=VARCHAR}, - - - #{username,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{gender,jdbcType=CHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{department,jdbcType=INTEGER}, - - - #{email,jdbcType=VARCHAR}, - - - #{address,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update worker_info - - - role = #{role,jdbcType=VARCHAR}, - - - username = #{username,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - name = #{name,jdbcType=VARCHAR}, - - - gender = #{gender,jdbcType=CHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - department = #{department,jdbcType=INTEGER}, - - - email = #{email,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where worker_id = #{workerId,jdbcType=INTEGER} - - - update worker_info - set role = #{role,jdbcType=VARCHAR}, - username = #{username,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - gender = #{gender,jdbcType=CHAR}, - phone = #{phone,jdbcType=VARCHAR}, - department = #{department,jdbcType=INTEGER}, - email = #{email,jdbcType=VARCHAR}, - address = #{address,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where worker_id = #{workerId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/AdminMapper.xml b/src/main/resources/mybatis/mapper/AdminMapper.xml deleted file mode 100644 index 2640434..0000000 --- a/src/main/resources/mybatis/mapper/AdminMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - admin_id, user_name, password, create_time, update_time - - - - delete from admin - where admin_id = #{adminId,jdbcType=INTEGER} - - - insert into admin (admin_id, user_name, password, - create_time, update_time) - values (#{adminId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into admin - - - admin_id, - - - user_name, - - - password, - - create_time, - update_time, - - - - #{adminId,jdbcType=INTEGER}, - - - #{userName,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - now(), - now() - - - - update admin - - - user_name = #{userName,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where admin_id = #{adminId,jdbcType=INTEGER} - - - update admin - set user_name = #{userName,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where admin_id = #{adminId,jdbcType=INTEGER} - - - - - - update admin - - - password = #{password,jdbcType=VARCHAR}, - - update_time = now(), - - where user_name = #{userName,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/CheckInMapper.xml b/src/main/resources/mybatis/mapper/CheckInMapper.xml index 5d297dd..724a15e 100644 --- a/src/main/resources/mybatis/mapper/CheckInMapper.xml +++ b/src/main/resources/mybatis/mapper/CheckInMapper.xml @@ -5,17 +5,17 @@ - - - - + + + + - check_in_id, order_id, room_number, room_type, person_num, person_name, id_numbers, - check_in_time, create_time, update_time + check_in_id, order_id, room_number, room_type, peo_count, persons, ids, check_in_time, + create_time, update_time - select - - from hotel_info - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/OrderMapper.xml b/src/main/resources/mybatis/mapper/OrderMapper.xml index 8ac5974..1f859df 100644 --- a/src/main/resources/mybatis/mapper/OrderMapper.xml +++ b/src/main/resources/mybatis/mapper/OrderMapper.xml @@ -3,20 +3,20 @@ - + - - - - + + + + - + - order_id, booking_type, phone, room_number, room_type, booking_date, booking_days, - order_status, order_cost, create_time, update_time + order_id, order_type, phone, room_type, num_of_room, order_date, order_days, order_status, + order_cost, create_time, update_time select @@ -27,7 +27,16 @@ delete from room_info where room_id = #{roomId,jdbcType=INTEGER} - + + insert into room_info (room_id, room_number, type_id, + room_type, room_price, room_discount, + room_status, remark, create_time, + 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}) + insert into room_info @@ -37,8 +46,8 @@ room_number, - - room_floor, + + type_id, room_type, @@ -52,6 +61,9 @@ room_status, + + remark, + create_time, @@ -66,20 +78,23 @@ #{roomNumber,jdbcType=VARCHAR}, - - #{roomFloor,jdbcType=INTEGER}, + + #{typeId,jdbcType=INTEGER}, - #{roomType,jdbcType=INTEGER}, + #{roomType,jdbcType=VARCHAR}, - #{roomPrice,jdbcType=DECIMAL}, + #{roomPrice,jdbcType=DOUBLE}, - #{roomDiscount,jdbcType=REAL}, + #{roomDiscount,jdbcType=DOUBLE}, - #{roomStatus,jdbcType=VARCHAR}, + #{roomStatus,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, @@ -89,82 +104,50 @@ - + + update room_info + + + room_number = #{roomNumber,jdbcType=VARCHAR}, + + + type_id = #{typeId,jdbcType=INTEGER}, + + + room_type = #{roomType,jdbcType=VARCHAR}, + + + room_price = #{roomPrice,jdbcType=DOUBLE}, + + + room_discount = #{roomDiscount,jdbcType=DOUBLE}, + + + room_status = #{roomStatus,jdbcType=INTEGER}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where room_id = #{roomId,jdbcType=INTEGER} + update room_info set room_number = #{roomNumber,jdbcType=VARCHAR}, - room_floor = #{roomFloor,jdbcType=INTEGER}, - room_type = #{roomType,jdbcType=INTEGER}, - room_price = #{roomPrice,jdbcType=DECIMAL}, - room_discount = #{roomDiscount,jdbcType=REAL}, - room_status = #{roomStatus,jdbcType=VARCHAR}, + type_id = #{typeId,jdbcType=INTEGER}, + room_type = #{roomType,jdbcType=VARCHAR}, + room_price = #{roomPrice,jdbcType=DOUBLE}, + room_discount = #{roomDiscount,jdbcType=DOUBLE}, + room_status = #{roomStatus,jdbcType=INTEGER}, + remark = #{remark,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP} where room_id = #{roomId,jdbcType=INTEGER} - - - insert into room_info ( room_number, room_floor, - room_type, type_name, room_price, room_discount, - room_status, create_time, update_time - ) - values (#{roomNumber,jdbcType=VARCHAR}, #{roomFloor,jdbcType=INTEGER}, - #{roomType,jdbcType=INTEGER}, #{typeName,jdbcType=VARCHAR}, #{roomPrice,jdbcType=DECIMAL}, #{roomDiscount,jdbcType=REAL}, - #{roomStatus,jdbcType=VARCHAR}, now(), now() - ) - - - delete from room_info where room_number = #{roomNumber,jdbcType=VARCHAR} - - - update room_info - - - room_number = #{roomNumber,jdbcType=VARCHAR}, - - - room_floor = #{roomFloor,jdbcType=INTEGER}, - - - room_type = #{roomType,jdbcType=INTEGER}, - - - type_name = #{typeName,jdbcType=VARCHAR}, - - - room_price = #{roomPrice,jdbcType=DECIMAL}, - - - room_discount = #{roomDiscount,jdbcType=REAL}, - - - room_status = #{roomStatus,jdbcType=VARCHAR}, - - update_time = now(), - - where room_id = #{roomId,jdbcType=INTEGER} - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/RoomTypeMapper.xml b/src/main/resources/mybatis/mapper/RoomTypeMapper.xml index 2025c39..95e4bc3 100644 --- a/src/main/resources/mybatis/mapper/RoomTypeMapper.xml +++ b/src/main/resources/mybatis/mapper/RoomTypeMapper.xml @@ -2,126 +2,163 @@ - - - - - + + + + + + + + + - + - type_id, room_type, type_name, booking_price, booking_discount, create_time, update_time + 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=INTEGER} + where type_id = #{typeId,jdbcType=BIGINT} - - - + delete from room_type - where type_id = #{typeId,jdbcType=INTEGER} + where type_id = #{typeId,jdbcType=BIGINT} - insert into room_type (type_id, room_type, type_name, - booking_price, booking_discount, create_time, - update_time) - values (#{typeId,jdbcType=INTEGER}, #{roomType,jdbcType=INTEGER}, #{typeName,jdbcType=VARCHAR}, - #{bookingPrice,jdbcType=DOUBLE}, #{bookingDiscount,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) + 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}, + #{price,jdbcType=DOUBLE}, #{discount,jdbcType=DOUBLE}, #{area,jdbcType=INTEGER}, + #{bedNum,jdbcType=INTEGER}, #{bedSize,jdbcType=VARCHAR}, #{window,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) insert into room_type + + type_id, + room_type, - - type_name, + + remark, - - booking_price, + + price, - - booking_discount, + + discount, + + area, + + + bed_num, + + + bed_size, + + + window, + + create_time, + + update_time, + + + #{typeId,jdbcType=BIGINT}, + - #{roomType,jdbcType=INTEGER}, + #{roomType,jdbcType=VARCHAR}, - - #{typeName,jdbcType=VARCHAR}, + + #{remark,jdbcType=VARCHAR}, - - #{bookingPrice,jdbcType=DOUBLE}, + + #{price,jdbcType=DOUBLE}, - - #{bookingDiscount,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() update room_type - room_type = #{roomType,jdbcType=INTEGER}, + room_type = #{roomType,jdbcType=VARCHAR}, - - type_name = #{typeName,jdbcType=VARCHAR}, + + remark = #{remark,jdbcType=VARCHAR}, - - booking_price = #{bookingPrice,jdbcType=DECIMAL}, + + price = #{price,jdbcType=DOUBLE}, - - booking_discount = #{bookingDiscount,jdbcType=REAL}, + + discount = #{discount,jdbcType=DOUBLE}, + + + area = #{area,jdbcType=INTEGER}, + + + bed_num = #{bedNum,jdbcType=INTEGER}, + + + bed_size = #{bedSize,jdbcType=VARCHAR}, + + + window = #{window,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, - update_time = now(), - where type_id = #{typeId,jdbcType=INTEGER} + where type_id = #{typeId,jdbcType=BIGINT} update room_type - set room_type = #{roomType,jdbcType=INTEGER}, - type_name = #{typeName,jdbcType=VARCHAR}, - booking_price = #{bookingPrice,jdbcType=DECIMAL}, - booking_discount = #{bookingDiscount,jdbcType=REAL}, + set room_type = #{roomType,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + price = #{price,jdbcType=DOUBLE}, + discount = #{discount,jdbcType=DOUBLE}, + area = #{area,jdbcType=INTEGER}, + 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=INTEGER} - - - delete from room_type - where room_type = #{roomType,jdbcType=INTEGER} - - - update room_type - - - type_name = #{typeName,jdbcType=VARCHAR}, - - - booking_price = #{bookingPrice,jdbcType=DOUBLE}, - - - booking_discount = #{bookingDiscount,jdbcType=DOUBLE}, - - update_time = now(), - - where room_type = #{roomType,jdbcType=INTEGER} + where type_id = #{typeId,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/UserMapper.xml b/src/main/resources/mybatis/mapper/UserMapper.xml index 937a383..7be733a 100644 --- a/src/main/resources/mybatis/mapper/UserMapper.xml +++ b/src/main/resources/mybatis/mapper/UserMapper.xml @@ -3,48 +3,49 @@ - + + - + - user_id, user_name, password, name, phone, email, address, id_number, create_time, + user_id, username, password, name, gender, phone, email, address, idcard, create_time, update_time - delete from user + delete from user_info where user_id = #{userId,jdbcType=INTEGER} - insert into user (user_name, password, - name, phone, email, - address, id_number, create_time, + insert into user_info (user_id, username, password, + name, gender, phone, email, + address, idcard, create_time, update_time) - values (#{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, - #{address,jdbcType=VARCHAR}, #{idNumber,jdbcType=VARCHAR}, now(), - now()) + values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, + #{address,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}) - insert into user + insert into user_info user_id, - - user_name, + + username, password, @@ -52,6 +53,9 @@ name, + + gender, + phone, @@ -61,18 +65,22 @@ address, - - id_number, + + idcard, + create_time, + + update_time, + #{userId,jdbcType=INTEGER}, - - #{userName,jdbcType=VARCHAR}, + + #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, @@ -80,6 +88,9 @@ #{name,jdbcType=VARCHAR}, + + #{gender,jdbcType=CHAR}, + #{phone,jdbcType=VARCHAR}, @@ -89,18 +100,22 @@ #{address,jdbcType=VARCHAR}, - - #{idNumber,jdbcType=VARCHAR}, + + #{idcard,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, - now(), - now(), - update user + update user_info - - user_name = #{userName,jdbcType=VARCHAR}, + + username = #{username,jdbcType=VARCHAR}, password = #{password,jdbcType=VARCHAR}, @@ -108,6 +123,9 @@ name = #{name,jdbcType=VARCHAR}, + + gender = #{gender,jdbcType=CHAR}, + phone = #{phone,jdbcType=VARCHAR}, @@ -117,8 +135,8 @@ address = #{address,jdbcType=VARCHAR}, - - id_number = #{idNumber,jdbcType=VARCHAR}, + + idcard = #{idcard,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -130,56 +148,17 @@ where user_id = #{userId,jdbcType=INTEGER} - update user - set user_name = #{userName,jdbcType=VARCHAR}, + update user_info + set username = #{username,jdbcType=VARCHAR}, password = #{password,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR}, + gender = #{gender,jdbcType=CHAR}, phone = #{phone,jdbcType=VARCHAR}, email = #{email,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR}, - id_number = #{idNumber,jdbcType=VARCHAR}, + idcard = #{idcard,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP} where user_id = #{userId,jdbcType=INTEGER} - - - - update user - - - user_name = #{userName,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - name = #{name,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - - id_number = #{idNumber,jdbcType=VARCHAR}, - - update_time = now(), - - where user_name = #{userName,jdbcType=INTEGER} - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/WorkerMapper.xml b/src/main/resources/mybatis/mapper/WorkerMapper.xml index 2e6a73d..925af31 100644 --- a/src/main/resources/mybatis/mapper/WorkerMapper.xml +++ b/src/main/resources/mybatis/mapper/WorkerMapper.xml @@ -3,54 +3,82 @@ - + + - + + + - worker_id, user_name, password, worker_name, phone, email, address, create_time, - update_time + worker_id, role, username, password, name, gender, phone, department, email, address, + create_time, update_time + + + - delete from worker + delete from worker_info where worker_id = #{workerId,jdbcType=INTEGER} - insert into worker (worker_id, user_name, password, - worker_name, phone, email, + insert into worker_info (worker_id, role, username, + password, name, gender, + phone, department, email, address, create_time, update_time ) - values (#{workerId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - #{workerName,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, - #{address,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + values (#{workerId,jdbcType=INTEGER}, #{role,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, + #{password,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, + #{phone,jdbcType=VARCHAR}, #{department,jdbcType=INTEGER}, #{email,jdbcType=VARCHAR}, + #{address,jdbcType=VARCHAR}, now(),now() ) - insert into worker + insert into worker_info - - user_name, + + worker_id, + + + role, + + + username, password, - - worker_name, + + name, + + + gender, phone, + + department, + email, @@ -61,104 +89,85 @@ update_time, - - #{userName,jdbcType=VARCHAR}, + + #{workerId,jdbcType=INTEGER}, + + + #{role,jdbcType=VARCHAR}, + + + #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - - #{workerName,jdbcType=VARCHAR}, + + #{name,jdbcType=VARCHAR}, + + + #{gender,jdbcType=CHAR}, #{phone,jdbcType=VARCHAR}, + + #{department,jdbcType=INTEGER}, + #{email,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, - now(), - now(), + now(), + now(), - update worker + update worker_info - - user_name = #{userName,jdbcType=VARCHAR}, + + role = #{role,jdbcType=VARCHAR}, + + + username = #{username,jdbcType=VARCHAR}, password = #{password,jdbcType=VARCHAR}, - - worker_name = #{workerName,jdbcType=VARCHAR}, + + name = #{name,jdbcType=VARCHAR}, + + + gender = #{gender,jdbcType=CHAR}, phone = #{phone,jdbcType=VARCHAR}, + + department = #{department,jdbcType=INTEGER}, + email = #{email,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR}, - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - where worker_id = #{workerId,jdbcType=INTEGER} - update worker - set user_name = #{userName,jdbcType=VARCHAR}, + update worker_info + set role = #{role,jdbcType=VARCHAR}, + username = #{username,jdbcType=VARCHAR}, password = #{password,jdbcType=VARCHAR}, - worker_name = #{workerName,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, + gender = #{gender,jdbcType=CHAR}, phone = #{phone,jdbcType=VARCHAR}, + department = #{department,jdbcType=INTEGER}, email = #{email,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} where worker_id = #{workerId,jdbcType=INTEGER} - - delete from worker - where user_name = #{userName,jdbcType=VARCHAR} - - - update worker - set - - password = #{password,jdbcType=VARCHAR}, - - - worker_name = #{workerName,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - update_time = now() - where user_name = #{userName,jdbcType=VARCHAR} - - - - + \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/HotelApplicationTests.java b/src/test/java/cn/mafangui/hotel/HotelApplicationTests.java deleted file mode 100644 index e3b88b5..0000000 --- a/src/test/java/cn/mafangui/hotel/HotelApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.mafangui.hotel; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class HotelApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/src/test/java/cn/mafangui/hotel/controller/AdminControllerTest.java b/src/test/java/cn/mafangui/hotel/controller/AdminControllerTest.java deleted file mode 100644 index 02ab11c..0000000 --- a/src/test/java/cn/mafangui/hotel/controller/AdminControllerTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.mafangui.hotel.controller; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -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.*; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class AdminControllerTest { - @Autowired - private AdminController adminController; - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void login() { - String userName = "admin"; - Assert.assertEquals(0, adminController.login(userName, userName)); - } - - @Test - public void register() { - String userName = "test"; - Assert.assertEquals(1, adminController.register(userName, userName)); - } - - @Test - public void updateProfile() { - String userName = "test"; - String password = "1234"; - Assert.assertEquals(1, adminController.updateProfile(userName, password)); - } - - @Test - public void getAdmin() { - String userName = "test"; - Assert.assertNotNull(adminController.getAdmin(userName)); - } - - @Test - public void getAllAdmin() { - Assert.assertNotNull(adminController.getAllAdmin()); - } -} \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/controller/RoomControllerTest.java b/src/test/java/cn/mafangui/hotel/controller/RoomControllerTest.java deleted file mode 100644 index 79c20fe..0000000 --- a/src/test/java/cn/mafangui/hotel/controller/RoomControllerTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.mafangui.hotel.controller; - -import cn.mafangui.hotel.entity.Room; -import cn.mafangui.hotel.utils.MyDateTimeFormat; -import org.junit.Before; -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 RoomControllerTest { - @Autowired - private RoomController roomController; - - MyDateTimeFormat df = new MyDateTimeFormat(); - - Room room = new Room(); - @Before - public void setUp() throws Exception { - room.setRoomNumber("502"); - } - - @Test - public void addRoom() { - } - - @Test - public void deleteRoom() { - } - - @Test - public void updateRoom() { - } - - @Test - public void allRoom() { - } - - @Test - public void findRoomByNumber() { - - } - - @Test - public void findRoomByStatus() { - } - - @Test - public void findRoomByType() { - } -} \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/controller/RoomTypeControllerTest.java b/src/test/java/cn/mafangui/hotel/controller/RoomTypeControllerTest.java deleted file mode 100644 index d1cfb76..0000000 --- a/src/test/java/cn/mafangui/hotel/controller/RoomTypeControllerTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.mafangui.hotel.controller; - -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.*; - - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class RoomTypeControllerTest { - - @Autowired - private RoomTypeController roomTypeController; - - @Test - public void addNewType() { - } - - @Test - public void delType() { - } - - @Test - public void updateType() { - } - - @Test - public void findByRoomType() { - int roomType = 101; - Assert.assertNotNull(roomTypeController.findByRoomType(roomType)); - } - - @Test - public void findAllRoomType() { - Assert.assertNotNull(roomTypeController.findAllRoomType()); - } -} \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/controller/WorkerControllerTest.java b/src/test/java/cn/mafangui/hotel/controller/WorkerControllerTest.java deleted file mode 100644 index d6ec114..0000000 --- a/src/test/java/cn/mafangui/hotel/controller/WorkerControllerTest.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.mafangui.hotel.controller; - - -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; - - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class WorkerControllerTest { - - @Autowired - private WorkerController workerController; - - @Test - public void login() { - String userName = "haha"; - String pwd = "123456"; - String password = "11111"; - Assert.assertEquals(1,workerController.login(userName,password)); - } - - @Test - public void addWorker() { - String userName = "haha"; - String password = "123456"; - String workerName = "nidsahao"; - String phone = "9834431"; - String email = "fads@kjd"; - String address = "street101"; - Assert.assertEquals(1, workerController.addWorker(userName,password,workerName,phone,email,address)); - } - - @Test - public void delWorker() { - String userName = "haha"; - Assert.assertEquals(1, workerController.delWorker(userName)); - } - - @Test - public void updateWorker() { - String userName = "haha"; - String password = "11111"; - String workerName = "chenhao"; - String phone = null; - String email = null; - String address = null; - Assert.assertEquals(1, workerController.updateWorker(userName,password,workerName,phone,email,address)); - } - - @Test - public void queryWorker() { - String userName = "haha"; - System.out.println(workerController.queryWorker(userName)); - Assert.assertNotNull(workerController.queryWorker(userName)); - } - - @Test - public void findAllWorkers() { - Assert.assertNotNull(workerController.findAllWorkers()); - } -} \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/mapper/UserMapperTest.java b/src/test/java/cn/mafangui/hotel/mapper/UserMapperTest.java new file mode 100644 index 0000000..18ad6f9 --- /dev/null +++ b/src/test/java/cn/mafangui/hotel/mapper/UserMapperTest.java @@ -0,0 +1,25 @@ +package cn.mafangui.hotel.mapper; + +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 UserMapperTest { + + @Autowired + private UserMapper userMapper; + + @Test + public void testId(){ + int id = 1; + System.out.println(userMapper.selectByPrimaryKey(1)); + Assert.assertNotNull(userMapper.selectByPrimaryKey(1)); + } +} \ No newline at end of file diff --git a/src/test/java/cn/mafangui/hotel/service/impl/WorkerServiceImplTest.java b/src/test/java/cn/mafangui/hotel/service/impl/WorkerServiceImplTest.java new file mode 100644 index 0000000..28354d2 --- /dev/null +++ b/src/test/java/cn/mafangui/hotel/service/impl/WorkerServiceImplTest.java @@ -0,0 +1,100 @@ +package cn.mafangui.hotel.service.impl; + +import cn.mafangui.hotel.entity.Worker; +import org.junit.Assert; +import org.junit.Before; +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 java.util.List; + +import static org.junit.Assert.*; + + +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class) +public class WorkerServiceImplTest { + + @Autowired + WorkerServiceImpl workerService; + + @Before + public void setUp() throws Exception { + } + + @Test + public void insert() { + String role = "operator"; + String username = "abc"; + String password = "abc"; + String name = "fdsa"; + String gender = "女"; + String phone = "242424"; + Worker worker = new Worker(); + worker.setPhone(phone); + worker.setGender(gender); + worker.setName(name); + worker.setPassword(password); + worker.setUsername(username); + worker.setRole(role); + Assert.assertEquals(1,workerService.insert(worker)); + } + + @Test + public void delete() { + int id = 4; + Assert.assertEquals(1,workerService.delete(id)); + } + + @Test + public void updateById() { + int id = 4; + String role = "operator"; + String username = "abc"; + String password = "abc"; + String name = "fdsa"; + String gender = "女"; + String phone = "11111111"; + Worker worker = new Worker(); + worker.setWorkerId(4); + worker.setPhone(phone); + worker.setGender(gender); + worker.setName(name); + worker.setPassword(password); + worker.setUsername(username); + worker.setRole(role); + Assert.assertEquals(1,workerService.updateById(worker)); + } + + @Test + public void selectById() { + int id = 4; + Assert.assertEquals("fdsa",workerService.selectById(id).getName()); + } + + @Test + public void findAll() { + List list = workerService.findAll(); + System.out.println(list); + Assert.assertNotNull(list); + } + + @Test + public void selectByRole() { + String role = "admin"; + List list = workerService.selectByRole(role); + System.out.println(list); + Assert.assertEquals(1,list.size()); + } + + @Test + public void login() { + String username = "admin"; + String password = "admin"; + Worker worker = workerService.login(username,password); + Assert.assertNotNull(worker); + } +} \ No newline at end of file