kaku/FreeeBird-hotel
1
0
Fork 0
mirror of https://github.com/FreeeBird/hotel.git synced 2025-05-06 19:49:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新部分接口

Browse Source
This commit is contained in:
freeebied 2019-11-26 20:19:14 +08:00 committed by FreeeBird
parent ff7797da9b
commit f88d6c6f06
26 changed files with 515 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/main/java/cn/mafangui/hotel/controller/AdminController.java
View File

@ -1,65 +0,0 @@
package cn.mafangui.hotel.controller;
import cn.mafangui.hotel.entity.Worker;
import cn.mafangui.hotel.enums.Role;
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 = "/admin")
public class AdminController {
@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, Role.ADMIN.getValue()) != null)
return 1;
else return 0;
}
/**
* 管理员注册
* @param username
* @param password
* @param name
* @param gender
* @param phone
* @param email
* @param address
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/register")
public int register(String username,String password,String name,String gender,String phone,String email,String address){
Worker worker = new Worker(username,password,name,gender,phone,email,address);
worker.setRole(Role.ADMIN.getValue());
return workerService.insert(worker);
}
/**
* 根据 username查找
* @param username
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/withUsername")
public Worker getByUsername(String username) {
Worker res = workerService.selectByUsername(username);
res.setPassword(null);
return res;
}
}

83
src/main/java/cn/mafangui/hotel/controller/CheckInController.java
View File

@ -1,83 +0,0 @@
package cn.mafangui.hotel.controller;
import cn.mafangui.hotel.entity.CheckIn;
import cn.mafangui.hotel.service.CheckInService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@RestController
@RequestMapping(value = "/checkIn")
public class CheckInController {
private final CheckInService checkInService;
@Autowired
public CheckInController(CheckInService checkInService) {
this.checkInService = checkInService;
}
/**
* 入住登记
* @param peoCount
* @param persons
* @param ids
* @return
*/
@RequestMapping(value = "/in")
public HashMap addCheckIn(int orderId, int peoCount, String persons, String ids){
CheckIn checkIn = new CheckIn();
checkIn.setOrderId(orderId);
checkIn.setPeoCount(peoCount);
checkIn.setPersons(persons);
checkIn.setIds(ids);
return checkInService.checkIn(checkIn);
}
/**
* 退房登记
*
* @param roomNumber
* @return
*/
@RequestMapping(value = "/out")
public int checkOut(String roomNumber) {
try {
return checkInService.checkOut(roomNumber);
} catch (Exception e) {
e.printStackTrace();
return -1;
}
}
@RequestMapping(value = "/delete")
public int deleteCheckIn(int checkId){
return checkInService.delete(checkId);
}
@RequestMapping(value = "/update")
public int update(int checkId,String roomNumber){
CheckIn checkIn = new CheckIn();
checkIn.setCheckInId(checkId);
checkIn.setRoomNumber(roomNumber);
return checkInService.update(checkIn);
}
@RequestMapping(value = "/withId")
public CheckIn getById(int checkId){
return checkInService.selectById(checkId);
}
@RequestMapping(value = "/all")
public List<CheckIn> getAll(){
return checkInService.selectAll();
}
}

51
src/main/java/cn/mafangui/hotel/controller/HotelController.java
View File

@ -1,51 +0,0 @@
package cn.mafangui.hotel.controller;
import cn.mafangui.hotel.entity.Hotel;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseUtil;
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 = "/hotel")
public class HotelController {
@Autowired
private HotelService hotelService;
@RequestMapping(value = "/add")
public int addHotel(String hotelName,String phone,String telephone,String email,String address,String website){
Hotel hotel = new Hotel(hotelName,phone,telephone,email,address,website);
return hotelService.insert(hotel);
}
@RequestMapping(value = "/delete")
public int deleteHotel(int hotelId){
return hotelService.delete(hotelId);
}
@RequestMapping(value = "/update")
public int updateHotel(int hotelId,String hotelName,String phone,String telephone,String email,String address,String website){
Hotel hotel = new Hotel(hotelName,phone,telephone,email,address,website);
hotel.setHotelId(hotelId);
return hotelService.update(hotel);
}
@RequestMapping(value = "/withId")
public Hotel getById(int hotelId){
return hotelService.selectById(hotelId);
}
@RequestMapping(value = "/withName")
public Hotel getById(String hotelName){
return hotelService.selectByName(hotelName);
}
@RequestMapping(value = "")
public AjaxResult getAllHotel(){
return ResponseUtil.success(hotelService.selectAll());
}
}

6
src/main/java/cn/mafangui/hotel/controller/OperatorController.java
View File

@ -16,12 +16,6 @@ public class OperatorController {
@Autowired
private WorkerService workerService;
@RequestMapping(method = RequestMethod.POST,value = "/login")
public int login(String username,String password){
if(workerService.login(username,password, Role.OPERATOR.getValue()) != null)
return 1;
else return 0;
}
@RequestMapping(method = RequestMethod.POST,value = "/delete")
public int deleteOperator(int workerId){

4
src/main/java/cn/mafangui/hotel/controller/OrderController.java
View File

@ -3,7 +3,7 @@ package cn.mafangui.hotel.controller;
import cn.mafangui.hotel.entity.Order;
import cn.mafangui.hotel.enums.OrderStatus;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.OrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
@ -148,7 +148,7 @@ public class OrderController {
*/
@RequestMapping(value = "/userOrder")
public AjaxResult getAllByUser(int userId){
return ResponseUtil.success(orderService.UsersAllOrders(userId));
return ResponseTool.success(orderService.UsersAllOrders(userId));
}
/**

72
src/main/java/cn/mafangui/hotel/controller/RoomController.java
View File

@ -1,72 +0,0 @@
package cn.mafangui.hotel.controller;
import cn.mafangui.hotel.entity.Room;
import cn.mafangui.hotel.entity.RoomType;
import cn.mafangui.hotel.service.RoomService;
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.List;
@RestController
@RequestMapping(value = "/room")
public class RoomController {
@Autowired
private RoomService roomService;
@Autowired
private RoomTypeService roomTypeService;
@RequestMapping(value = "/add")
public int addRoom(String roomNumber,int typeId,String roomType,double roomPrice,double roomDiscount,int roomStatus,String remark){
Room room = new Room(roomNumber,typeId,roomType,roomPrice,roomDiscount,roomStatus,remark);
RoomType rt = new RoomType();
if (roomService.insert(room) == 1){
rt.setTypeId(typeId);
rt.setRest(roomTypeService.selectById(typeId).getRest() + 1);
return roomTypeService.update(rt);
}else return 0;
}
@RequestMapping(method = RequestMethod.POST,value = "/delete")
public int deleteRoom(int roomId){
return roomService.delete(roomId);
}
@RequestMapping(value = "/update")
public int updateRoom(int roomId,String roomNumber,int typeId,
String roomType,double roomPrice,double roomDiscount,int roomStatus,String remark){
Room room = new Room(roomNumber,typeId,roomType,roomPrice,roomDiscount,roomStatus,remark);
room.setRoomId(roomId);
return roomService.update(room);
}
@RequestMapping(value = "/withId")
public Room getById(int roomId){
return roomService.selectById(roomId);
}
@RequestMapping(value = "/withType")
public List<Room> getByType(int typeId){
return roomService.selectByType(typeId);
}
@RequestMapping(value = "/withStatus")
public List<Room> getByStatus(int roomStatus){
return roomService.selectByStatus(roomStatus);
}
@RequestMapping(value = "/all")
public List<Room> getAll(){
return roomService.selectAll();
}
@RequestMapping(value = "/typeRest")
public int countTypeRest(){
return 0;
}
}

27
src/main/java/cn/mafangui/hotel/controller/WorkerController.java
View File

@ -1,27 +0,0 @@
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;
}
}

21
src/main/java/cn/mafangui/hotel/controller/common/HotelController.java Normal file
View File

@ -0,0 +1,21 @@
package cn.mafangui.hotel.controller.common;
import cn.mafangui.hotel.entity.Hotel;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseTool;
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;
@RestController
@RequestMapping(value = "/hotel")
public class HotelController {
@Autowired
private HotelService hotelService;
@RequestMapping(value = "")
public AjaxResult getAllHotel(){
return ResponseTool.success(hotelService.selectAll());
}
}

22
src/main/java/cn/mafangui/hotel/controller/LoginController.java → src/main/java/cn/mafangui/hotel/controller/common/LoginController.java
View File

@ -1,9 +1,9 @@
package cn.mafangui.hotel.controller;
package cn.mafangui.hotel.controller.common;
import cn.mafangui.hotel.entity.User;
import cn.mafangui.hotel.entity.Worker;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.UserService;
import cn.mafangui.hotel.service.WorkerService;
import org.springframework.beans.factory.annotation.Autowired;
@ -28,13 +28,13 @@ public class LoginController {
public AjaxResult userLogin(String username, String password,
HttpServletRequest request) {
if(StringUtils.isEmpty(username)){
return ResponseUtil.failed("用户名不能为空");
return ResponseTool.failed("用户名不能为空");
}else if(StringUtils.isEmpty(password)) {
return ResponseUtil.failed("密码不能为空");
return ResponseTool.failed("密码不能为空");
}
User user = userService.selectByUsernameAndPassword(username,password);
if(user==null){
return ResponseUtil.failed("用户名或密码不正确");
return ResponseTool.failed("用户名或密码不正确");
}
HttpSession session = request.getSession();
session.setAttribute("userId",user.getUserId());
@ -42,20 +42,20 @@ public class LoginController {
HashMap map = new HashMap<>();
map.put("sessionId",session.getId());
map.put("userId",user.getUserId());
return ResponseUtil.success(map);
return ResponseTool.success(map);
}
@RequestMapping(value = "/worker",method = RequestMethod.POST)
@RequestMapping(value = "/admin",method = RequestMethod.POST)
public AjaxResult workerLogin(String username, String password,
HttpServletRequest request){
if(StringUtils.isEmpty(username)){
return ResponseUtil.failed("用户名不能为空");
return ResponseTool.failed("用户名不能为空");
}else if(StringUtils.isEmpty(password)) {
return ResponseUtil.failed("密码不能为空");
return ResponseTool.failed("密码不能为空");
}
Worker worker = workerService.login(username,password);
if(worker==null){
return ResponseUtil.failed("用户名或密码不正确");
return ResponseTool.failed("用户名或密码不正确");
}
HttpSession session = request.getSession();
session.setAttribute("userId",worker.getWorkerId());
@ -63,7 +63,7 @@ public class LoginController {
HashMap<String, String> map = new HashMap<>();
map.put("sessionId",session.getId());
map.put("role",worker.getRole());
return ResponseUtil.success(map);
return ResponseTool.success(map);
}
}

16
src/main/java/cn/mafangui/hotel/controller/RegisterController.java → src/main/java/cn/mafangui/hotel/controller/common/RegisterController.java
View File

@ -1,10 +1,10 @@
package cn.mafangui.hotel.controller;
package cn.mafangui.hotel.controller.common;
import cn.mafangui.hotel.entity.User;
import cn.mafangui.hotel.entity.Worker;
import cn.mafangui.hotel.enums.Role;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.UserService;
import cn.mafangui.hotel.service.WorkerService;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,9 +26,9 @@ public class RegisterController {
User user = new User(username,password,name,gender,phone,email,address,idcard);
int result = userService.insertUser(user);
if(result==1){
return ResponseUtil.success(result);
return ResponseTool.success(result);
}
else return ResponseUtil.failed("注册失败,请稍后再试");
else return ResponseTool.failed("注册失败,请稍后再试");
}
@RequestMapping(method = RequestMethod.POST,value = "/admin")
@ -37,9 +37,9 @@ public class RegisterController {
worker.setRole(Role.ADMIN.getValue());
int result = workerService.insert(worker);
if(result==1){
return ResponseUtil.success(result);
return ResponseTool.success(result);
}
else return ResponseUtil.failed("注册失败,请稍后再试");
else return ResponseTool.failed("注册失败,请稍后再试");
}
@RequestMapping(method = RequestMethod.POST,value = "/operator")
@ -48,9 +48,9 @@ public class RegisterController {
worker.setRole(Role.OPERATOR.getValue());
int result = workerService.insert(worker);
if(result==1){
return ResponseUtil.success(result);
return ResponseTool.success(result);
}
else return ResponseUtil.failed("注册失败,请稍后再试");
else return ResponseTool.failed("注册失败,请稍后再试");
}
}

60
src/main/java/cn/mafangui/hotel/controller/user/UserController.java
View File

@ -3,18 +3,15 @@ package cn.mafangui.hotel.controller.user;
import cn.mafangui.hotel.entity.User;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.MsgType;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.List;
@RestController
@RequestMapping(value = "/user")
@ -22,27 +19,6 @@ public class UserController {
@Autowired
private UserService userService;
/**
* 用户添加
* @param username
* @param password
* @param name
* @param gender
* @param phone
* @param email
* @param address
* @param idcard
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/add")
public int userAdd(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.addUser(user);
}
/**
* 更新用户信息
* @param userId
@ -55,11 +31,11 @@ public class UserController {
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/update")
public AjaxResult userUpdate(int userId, String name, String gender, String phone,
public AjaxResult userUpdate(Integer userId, String name, String gender, String phone,
String email, String address, String idcard, HttpServletRequest request){
HttpSession session = request.getSession();
if (!session.getAttribute("userId").equals(userId)){
return ResponseUtil.failed(MsgType.PERMISSION_DENIED);
return ResponseTool.failed(MsgType.PERMISSION_DENIED);
}
User user = new User();
user.setUserId(userId);
@ -70,8 +46,8 @@ public class UserController {
user.setAddress(address);
user.setIdcard(idcard);
if(userService.updateUser(user)==1)
return ResponseUtil.success("修改成功");
return ResponseUtil.success("修改失败，请检查或稍后再试");
return ResponseTool.success("修改成功");
return ResponseTool.success("修改失败，请检查或稍后再试");
}
/**
@ -85,12 +61,12 @@ public class UserController {
public AjaxResult updatePassword(String username,String oldPassword,String newPassword){
User user = userService.selectByUsernameAndPassword(username,oldPassword);
if (user == null){
return ResponseUtil.failed("密码不对");
return ResponseTool.failed("密码不对");
}
user.setPassword(newPassword);
if(userService.updateUser(user)==1)
return ResponseUtil.success("修改成功");
return ResponseUtil.failed("修改失败");
return ResponseTool.success("修改成功");
return ResponseTool.failed("修改失败");
}
/**
@ -102,29 +78,15 @@ public class UserController {
public AjaxResult getProfile(HttpServletRequest request){
String username = (String) request.getSession().getAttribute("username");
User user = userService.selectByUsername(username);
if(user==null) return ResponseUtil.failed("未知错误");
if(user==null) return ResponseTool.failed("未知错误");
user.setPassword(null);
StringBuilder sb = new StringBuilder(user.getIdcard());
sb.replace(5,12,"********");
user.setIdcard(sb.toString());
return ResponseUtil.success(user);
return ResponseTool.success(user);
}
/**
* 根据username查找用户
* @param username
* @return
*/
@RequestMapping(value = "/withUsername")
public AjaxResult getByUsername(String username, HttpServletRequest request){
if(!request.getSession().getAttribute("username").equals(username)){
return ResponseUtil.failed(MsgType.PERMISSION_DENIED);
}
User user = userService.selectByUsername(username);
user.setPassword(null);
return ResponseUtil.success(user);
}
/**
* 注销
@ -136,7 +98,7 @@ public class UserController {
HttpSession session = request.getSession();
session.removeAttribute("userId");
session.removeAttribute("username");
return ResponseUtil.success("注销成功");
return ResponseTool.success("注销成功");
}

117
src/main/java/cn/mafangui/hotel/controller/user/UserOrderController.java
View File

@ -1,18 +1,20 @@
package cn.mafangui.hotel.controller.user;
import cn.mafangui.hotel.entity.Order;
import cn.mafangui.hotel.entity.User;
import cn.mafangui.hotel.enums.OrderStatus;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.MsgType;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.OrderService;
import cn.mafangui.hotel.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.Date;
import java.util.List;
@ -24,6 +26,8 @@ import java.util.List;
public class UserOrderController {
@Autowired
private OrderService orderService;
@Autowired
private UserService userService;
/**
* 添加预订
@ -45,46 +49,25 @@ public class UserOrderController {
@DateTimeFormat(pattern = "yyyy-MM-dd") Date orderDate, Integer orderDays, Double orderCost){
Order order = new Order(orderTypeId,orderType,userId,name,phone,roomTypeId,
roomType,orderDate,orderDays, OrderStatus.UNPAID.getCode(),orderCost);
if(orderService.addOrder(order)!=1)
return ResponseUtil.failed("创建订单失败");
return ResponseUtil.success("预订成功");
int re = orderService.addOrder(order);
if(re!=1) ResponseTool.failed(MsgType.FAILED);
return ResponseTool.success(MsgType.SUCCESS);
}
/**
* 客户删除订单
* 删除订单
* @param orderId
* @return
*/
@RequestMapping(value = "/deleteByUser")
@RequestMapping(value = "/delete")
public AjaxResult deleteOrderByUser(int orderId){
Order order = new Order(orderId,OrderStatus.WAS_DELETED.getCode());
if(orderService.update(order)!=1)
return ResponseUtil.failed("删除失败");
return ResponseUtil.success("删除成功");
int re = orderService.update(order);
if(re!=1) ResponseTool.failed(MsgType.FAILED);
return ResponseTool.success(MsgType.SUCCESS);
}
/**
* 修改订单
* @param orderId
* @param orderTypeId
* @param orderType
* @param userId
* @param name
* @param phone
* @param roomTypeId
* @param roomType
* @param orderDate
* @param orderDays
* @param orderCost
* @return
*/
@RequestMapping(value = "/update")
public int updateOrder(int orderId,int orderTypeId,String orderType, int userId,String name, String phone,int roomTypeId, String roomType,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date orderDate, Integer orderDays, Double orderCost){
Order order = new Order(orderTypeId,orderType,userId,name,phone,roomTypeId,
roomType,orderDate,orderDays, OrderStatus.UNPAID.getCode(),orderCost);
return orderService.update(order);
}
/**
* 订单支付
@ -92,8 +75,12 @@ public class UserOrderController {
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/pay")
public int payOrder(int orderId){
return orderService.payOrder(orderId);
public AjaxResult payOrder(Integer orderId,String username,String password){
User user = userService.selectByUsernameAndPassword(username,password);
if(user==null) return ResponseTool.failed("密码错误");
int re = orderService.payOrder(orderId);
if(re!=1) ResponseTool.failed(MsgType.FAILED);
return ResponseTool.success(MsgType.SUCCESS);
}
/**
@ -102,50 +89,21 @@ public class UserOrderController {
* @return
*/
@RequestMapping(value = "/cancel")
public int cancelOrder(int orderId){
return orderService.cancelOrder(orderId);
public AjaxResult cancelOrder(int orderId){
int re = orderService.cancelOrder(orderId);
if(re!=1) ResponseTool.failed(MsgType.FAILED);
return ResponseTool.success(MsgType.SUCCESS);
}
/**
* 订单超时
* @param orderId
* @return
*/
@RequestMapping(value = "/overtime")
public int orderOver(int orderId){
Order order = new Order(orderId,OrderStatus.OVERTIME.getCode());
return orderService.update(order);
}
/**
* 所有订单
* @return
*/
@RequestMapping(value = "/all")
public List<Order> getAllOrder(){
return orderService.AllOrders();
}
/**
* 根据userID查询所有订单
* @param userId
* @return
*/
@RequestMapping(value = "/withUserId")
public List<Order> getByUser(int userId){
return orderService.selectByUserId(userId);
}
/**
* 客户查询个人所有订单（不包括被自己删除的）
* @param userId
* @return
*/
@RequestMapping(value = "")
public AjaxResult getAllByUser(HttpServletRequest request){
HttpSession session = request.getSession();
Integer userId = (Integer) session.getAttribute("userId");
return ResponseUtil.success(orderService.UsersAllOrders(userId));
public AjaxResult getAllByUser(int userId){
return ResponseTool.success(orderService.UsersAllOrders(userId));
}
/**
@ -153,20 +111,9 @@ public class UserOrderController {
* @param orderId
* @return
*/
@RequestMapping(value = "/withId")
public Order getById(int orderId){
return orderService.selectById(orderId);
@RequestMapping(value = "/{orderId}")
public AjaxResult getById(@PathVariable int orderId){
return ResponseTool.success(orderService.selectById(orderId));
}
/**
* 根据姓名、预留手机号查找订单
* 主要用于客户入住
* @param name
* @param phone
* @return
*/
@RequestMapping(value = "/withNameAndPhone")
public Order getByNameAndPhone(String name,String phone){
return orderService.selectByNameAndPhone(name,phone);
}
}

51
src/main/java/cn/mafangui/hotel/controller/user/UserRoomController.java Normal file
View File

@ -0,0 +1,51 @@
package cn.mafangui.hotel.controller.user;
import cn.mafangui.hotel.entity.RoomType;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.RoomTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping(value = "/hotel/room")
public class UserRoomController {
@Autowired
private RoomTypeService roomTypeService;
/**
* 所有房型
* @return
*/
@RequestMapping(value = "")
public AjaxResult getAllRoomType(){
List<RoomType> rooms = roomTypeService.findAllType();
return ResponseTool.success(rooms);
}
/**
* 查找有余量的房型
* @return
*/
@RequestMapping(value = "/rest")
public AjaxResult findAllRestRoomType(){
return ResponseTool.success(roomTypeService.findAllRestType());
}
/**
* 根据id查找房型
* @param typeId
* @return
*/
@RequestMapping(value = "/{typeId}")
public AjaxResult getById(@PathVariable int typeId){
return ResponseTool.success(roomTypeService.selectById(typeId));
}
}

10
src/main/java/cn/mafangui/hotel/controller/worker/AdminController.java Normal file
View File

@ -0,0 +1,10 @@
package cn.mafangui.hotel.controller.worker;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(value = "/admin")
public class AdminController {
}

79
src/main/java/cn/mafangui/hotel/controller/worker/CheckInController.java Normal file
View File

@ -0,0 +1,79 @@
package cn.mafangui.hotel.controller.worker;
import cn.mafangui.hotel.entity.CheckIn;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.CheckInService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(value = "/admin/checkIn")
public class CheckInController {
@Autowired
private CheckInService checkInService;
/**
* 入住登记
* @param peoCount
* @param persons
* @param ids
* @return
*/
@RequestMapping(value = "/in")
public AjaxResult addCheckIn(int orderId, int peoCount, String persons, String ids){
CheckIn checkIn = new CheckIn();
checkIn.setOrderId(orderId);
checkIn.setPeoCount(peoCount);
checkIn.setPersons(persons);
checkIn.setIds(ids);
return ResponseTool.success(checkInService.checkIn(checkIn));
}
/**
* 退房登记
*
* @param roomNumber
* @return
*/
@RequestMapping(value = "/out")
public AjaxResult checkOut(String roomNumber) {
if(checkInService.checkOut(roomNumber)<0)
return ResponseTool.failed("退房失败");
return ResponseTool.success("退房成功");
}
@RequestMapping(value = "/delete")
public AjaxResult deleteCheckIn(int checkId){
if(checkInService.delete(checkId)!=1)
return ResponseTool.failed("删除失败");
return ResponseTool.success("删除成功");
}
@RequestMapping(value = "/update")
public AjaxResult update(int checkId,String roomNumber){
CheckIn checkIn = new CheckIn();
checkIn.setCheckInId(checkId);
checkIn.setRoomNumber(roomNumber);
if(checkInService.update(checkIn)!=1)
return ResponseTool.failed("更新失败");
return ResponseTool.success("更新成功");
}
@RequestMapping(value = "/{checkId}")
public AjaxResult getById(@PathVariable int checkId){
return ResponseTool.success(checkInService.selectById(checkId));
}
@RequestMapping(value = "")
public AjaxResult getAll(){
return ResponseTool.success(checkInService.selectAll());
}
}

26
src/main/java/cn/mafangui/hotel/controller/worker/HotelInfoController.java Normal file
View File

@ -0,0 +1,26 @@
package cn.mafangui.hotel.controller.worker;
import cn.mafangui.hotel.entity.Hotel;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseTool;
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;
@RestController
@RequestMapping(value = "/admin/hotel")
public class HotelInfoController {
@Autowired
private HotelService hotelService;
@RequestMapping(value = "/update")
public AjaxResult updateHotel(int hotelId, String hotelName, String phone, String telephone, String email, String address, String website){
Hotel hotel = new Hotel(hotelName,phone,telephone,email,address,website);
hotel.setHotelId(hotelId);
hotelService.update(hotel);
return ResponseTool.success("修改成功");
}
}

2
src/main/java/cn/mafangui/hotel/controller/OrderTypeController.java → src/main/java/cn/mafangui/hotel/controller/worker/OrderTypeController.java
View File

@ -1,4 +1,4 @@
package cn.mafangui.hotel.controller;
package cn.mafangui.hotel.controller.worker;
import cn.mafangui.hotel.entity.OrderType;
import cn.mafangui.hotel.service.OrderTypeService;

70
src/main/java/cn/mafangui/hotel/controller/worker/RoomController.java Normal file
View File

@ -0,0 +1,70 @@
package cn.mafangui.hotel.controller.worker;
import cn.mafangui.hotel.entity.Room;
import cn.mafangui.hotel.entity.RoomType;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.RoomService;
import cn.mafangui.hotel.service.RoomTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(value = "/admin/room")
public class RoomController {
@Autowired
private RoomService roomService;
@Autowired
private RoomTypeService roomTypeService;
@RequestMapping(value = "/add")
public AjaxResult addRoom(String roomNumber, int typeId, String roomType, double roomPrice, double roomDiscount, int roomStatus, String remark){
Room room = new Room(roomNumber,typeId,roomType,roomPrice,roomDiscount,roomStatus,remark);
RoomType rt = new RoomType();
if (roomService.insert(room) == 1){
rt.setTypeId(typeId);
rt.setRest(roomTypeService.selectById(typeId).getRest() + 1);
if(roomTypeService.update(rt)!=1) return ResponseTool.failed("添加失败");
}else return ResponseTool.failed("添加失败");
return ResponseTool.success("添加成功");
}
@RequestMapping(method = RequestMethod.POST,value = "/delete")
public AjaxResult deleteRoom(int roomId){
if(roomService.delete(roomId)!=1) return ResponseTool.failed("删除失败");
return ResponseTool.success("删除成功");
}
@RequestMapping(value = "/update")
public AjaxResult updateRoom(int roomId,String roomNumber,int typeId,
String roomType,double roomPrice,double roomDiscount,int roomStatus,String remark){
Room room = new Room(roomNumber,typeId,roomType,roomPrice,roomDiscount,roomStatus,remark);
room.setRoomId(roomId);
if(roomService.update(room)!=1) return ResponseTool.failed("更新失败");
return ResponseTool.success("更新成功");
}
@RequestMapping(value = "/{id}")
public AjaxResult getById(@PathVariable int id){
return ResponseTool.success(roomService.selectById(id));
}
@RequestMapping(value = "/type/{typeId}")
public AjaxResult getByType(@PathVariable int typeId){
return ResponseTool.success(roomService.selectByType(typeId));
}
@RequestMapping(value = "/status/{statusId}")
public AjaxResult getByStatus(@PathVariable int statusId){
return ResponseTool.success(roomService.selectByStatus(statusId));
}
@RequestMapping(value = "")
public AjaxResult getAll(){
return ResponseTool.success(roomService.selectAll());
}
}

63
src/main/java/cn/mafangui/hotel/controller/RoomTypeController.java → src/main/java/cn/mafangui/hotel/controller/worker/WorkerRoomTypeController.java
View File

@ -1,10 +1,11 @@
package cn.mafangui.hotel.controller;
package cn.mafangui.hotel.controller.worker;
import cn.mafangui.hotel.entity.RoomType;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.RoomTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@ -12,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping(value = "/roomType")
public class RoomTypeController {
@RequestMapping(value = "/admin/room_type")
public class WorkerRoomTypeController {
@Autowired
private RoomTypeService roomTypeService;
@ -26,7 +27,16 @@ public class RoomTypeController {
@RequestMapping(value = "")
public AjaxResult getAllRoomType(){
List<RoomType> rooms = roomTypeService.findAllType();
return ResponseUtil.success(rooms);
return ResponseTool.success(rooms);
}
/**
* 查找有余量的房型
* @return
*/
@RequestMapping(value = "/rest")
public AjaxResult findAllRestRoomType(){
return ResponseTool.success(roomTypeService.findAllRestType());
}
/**
@ -34,9 +44,9 @@ public class RoomTypeController {
* @param typeId
* @return
*/
@RequestMapping(value = "/withId")
public RoomType getById(int typeId){
return roomTypeService.selectById(typeId);
@RequestMapping(value = "/{typeId}")
public AjaxResult getById(@PathVariable int typeId){
return ResponseTool.success(roomTypeService.selectById(typeId));
}
@ -53,13 +63,13 @@ public class RoomTypeController {
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/add")
public int addRoomType(String roomType,Double price,Double discount,int area,
int bedNum,String bedSize,int window,String remark){
public AjaxResult addRoomType(String roomType,Double price,Double discount,int area,
int bedNum,String bedSize,int window,String remark,int rest){
RoomType rt = new RoomType(roomType,remark,price,discount,area,bedNum,bedSize,window);
rt.setRest(0);
int result = 0;
result = roomTypeService.insert(rt);
return result;
rt.setRest(rest);
int result = roomTypeService.insert(rt);
if(result!=1) return ResponseTool.failed("添加失败");
return ResponseTool.success("添加成功");
}
/**
@ -77,14 +87,14 @@ public class RoomTypeController {
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/update")
public int updateRoomType(int typeId,String roomType,Double price,Double discount,int area,
public AjaxResult updateRoomType(int typeId,String roomType,Double price,Double discount,int area,
int bedNum,String bedSize,int window,int rest,String remark){
RoomType rt = new RoomType(roomType,remark,price,discount,area,bedNum,bedSize,window);
rt.setTypeId(typeId);
rt.setRest(rest);
int result = 0;
result = roomTypeService.update(rt);
return result;
int result = roomTypeService.update(rt);
if(result!=1) return ResponseTool.failed("修改失败");
return ResponseTool.success("修改成功");
}
/**
@ -93,19 +103,12 @@ public class RoomTypeController {
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/delete")
public int deleteRoomType(int typeId){
int result = 0;
result = roomTypeService.delete(typeId);
return result;
public AjaxResult deleteRoomType(int typeId){
int result = roomTypeService.delete(typeId);
if(result!=1) return ResponseTool.failed("删除失败");
return ResponseTool.success("删除成功");
}
/**
* 查找有余量的房型
* @return
*/
@RequestMapping(value = "/restAll")
public List<RoomType> findAllRestRoomType(){
return roomTypeService.findAllRestType();
}
}

140
src/main/java/cn/mafangui/hotel/controller/worker/WorkerUserController.java Normal file
View File

@ -0,0 +1,140 @@
package cn.mafangui.hotel.controller.worker;
import cn.mafangui.hotel.entity.User;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.MsgType;
import cn.mafangui.hotel.response.ResponseTool;
import cn.mafangui.hotel.service.UserService;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@RestController
@RequestMapping(value = "/worker/user")
public class WorkerUserController {
@Autowired
private UserService userService;
/**
* 用户添加
* @param username
* @param password
* @param name
* @param gender
* @param phone
* @param email
* @param address
* @param idcard
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/add")
public int userAdd(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.addUser(user);
}
/**
* 更新用户信息
* @param userId
* @param name
* @param gender
* @param phone
* @param email
* @param address
* @param idcard
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/update")
public AjaxResult userUpdate(int userId, String name, String gender, String phone,
String email, String address, String idcard, HttpServletRequest request){
HttpSession session = request.getSession();
if (!session.getAttribute("userId").equals(userId)){
return ResponseTool.failed(MsgType.PERMISSION_DENIED);
}
User user = new User();
user.setUserId(userId);
user.setName(name);
user.setGender(gender);
user.setPhone(phone);
user.setEmail(email);
user.setAddress(address);
user.setIdcard(idcard);
if(userService.updateUser(user)==1)
return ResponseTool.success("修改成功");
return ResponseTool.success("修改失败，请检查或稍后再试");
}
/**
* 更改密码
* @param username
* @param oldPassword
* @param newPassword
* @return
*/
@RequestMapping(method = RequestMethod.POST,value = "/updatePassword")
public AjaxResult updatePassword(String username,String oldPassword,String newPassword){
User user = userService.selectByUsernameAndPassword(username,oldPassword);
if (user == null){
return ResponseTool.failed("密码不对");
}
user.setPassword(newPassword);
if(userService.updateUser(user)==1)
return ResponseTool.success("修改成功");
return ResponseTool.failed("修改失败");
}
/**
* 获取个人资料
* @param request
* @return
*/
@RequestMapping(value = "/profile")
public AjaxResult getProfile(HttpServletRequest request){
String username = (String) request.getSession().getAttribute("username");
User user = userService.selectByUsername(username);
if(user==null) return ResponseTool.failed("未知错误");
user.setPassword(null);
StringBuilder sb = new StringBuilder(user.getIdcard());
sb.replace(5,12,"********");
user.setIdcard(sb.toString());
return ResponseTool.success(user);
}
/**
* 根据username查找用户
* @param username
* @return
*/
@RequestMapping(value = "/withUsername")
public AjaxResult getByUsername(String username, HttpServletRequest request){
if(!request.getSession().getAttribute("username").equals(username)){
return ResponseTool.failed(MsgType.PERMISSION_DENIED);
}
User user = userService.selectByUsername(username);
user.setPassword(null);
return ResponseTool.success(user);
}
/**
* 注销
* @param request
* @return
*/
@RequestMapping(value = "/logout",method = RequestMethod.POST)
public AjaxResult logout(HttpServletRequest request){
HttpSession session = request.getSession();
session.removeAttribute("userId");
session.removeAttribute("username");
return ResponseTool.success("注销成功");
}
}

2
src/main/java/cn/mafangui/hotel/response/MsgType.java
View File

@ -6,7 +6,7 @@ package cn.mafangui.hotel.response;
*/
public enum MsgType {
SUCCESS(1000,"success"),
FAILED(1001,"Failure"),
FAILED(1001,"failure"),
PARAM_IS_INVALID(1001,"参数非法"),
PERMISSION_DENIED(1002,"权限不足"),

6
src/main/java/cn/mafangui/hotel/response/ResponseUtil.java → src/main/java/cn/mafangui/hotel/response/ResponseTool.java
View File

@ -8,7 +8,7 @@ import cn.mafangui.hotel.response.MsgType;
* 成功则调用success
* 失败则调用failed
*/
public class ResponseUtil {
public class ResponseTool {
/**
* 请求成功
@ -31,4 +31,8 @@ public class ResponseUtil {
public static AjaxResult failed(String msg){
return new AjaxResult(MsgType.FAILED.getCode(),msg);
}
public static AjaxResult failed(){
return new AjaxResult(MsgType.FAILED.getCode(),"操作失败");
}
}

5
src/main/java/cn/mafangui/hotel/service/CheckInService.java
View File

@ -1,6 +1,7 @@
package cn.mafangui.hotel.service;
import cn.mafangui.hotel.entity.CheckIn;
import cn.mafangui.hotel.entity.Room;
import java.util.HashMap;
import java.util.List;
@ -9,13 +10,13 @@ public interface CheckInService {
int insert(CheckIn checkIn);
HashMap checkIn(CheckIn checkIn);
Room checkIn(CheckIn checkIn);
int delete(int checkInId);
int update(CheckIn checkIn);
int checkOut(String roomNumber) throws Exception;
int checkOut(String roomNumber);
int updateByRoomNumber(String roomNumber);

17
src/main/java/cn/mafangui/hotel/service/impl/CheckInServiceImpl.java
View File

@ -44,22 +44,17 @@ public class CheckInServiceImpl implements CheckInService {
*/
@Override
@Transactional
public HashMap checkIn(CheckIn checkIn) {
HashMap resultMap = new HashMap();
int code = 0;
public Room checkIn(CheckIn checkIn) {
Order order = orderService.selectById(checkIn.getOrderId());
RoomType rt = roomTypeService.selectById(order.getRoomTypeId());
Room r = roomService.selectById(roomService.inRoom(order.getRoomTypeId()));
if (r == null) code = -3;
checkIn.setRoomId(r.getRoomId());
checkIn.setRoomNumber(r.getRoomNumber());
if (roomTypeService.updateRest(rt.getTypeId(),-1) <= 0) code = -2;
roomTypeService.updateRest(rt.getTypeId(),-1);
order.setOrderStatus(OrderStatus.CHECK_IN.getCode());
if (orderService.update(order) <=0 ) code = -1;
code = checkInMapper.insert(checkIn);
resultMap.put("code",code);
resultMap.put("room",r);
return resultMap;
orderService.update(order);
checkInMapper.insert(checkIn);
return r;
}
/**
@ -71,7 +66,7 @@ public class CheckInServiceImpl implements CheckInService {
* @return
*/
@Override
public int checkOut(String roomNumber) throws Exception{
public int checkOut(String roomNumber){
Room r = roomService.selectByNumber(roomNumber);
RoomType ty = roomTypeService.selectById(r.getTypeId());
CheckIn checkIn = checkInMapper.selectLatestByRoomNumber(roomNumber);

4
src/main/java/cn/mafangui/hotel/tool/SessionInterceptor.java
View File

@ -1,7 +1,7 @@
package cn.mafangui.hotel.tool;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.ResponseTool;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
@ -21,7 +21,7 @@ public class SessionInterceptor implements HandlerInterceptor {
}else {
setCorsMappings(request, response);
PrintWriter writer = response.getWriter();
AjaxResult result = ResponseUtil.failed("Not Login");
AjaxResult result = ResponseTool.failed("Not Login");
ObjectMapper mapper = new ObjectMapper();
writer.write(mapper.writeValueAsString(result));
return false;

4
src/main/java/cn/mafangui/hotel/tool/UserInterceptor.java
View File

@ -2,7 +2,7 @@ package cn.mafangui.hotel.tool;
import cn.mafangui.hotel.response.AjaxResult;
import cn.mafangui.hotel.response.MsgType;
import cn.mafangui.hotel.response.ResponseUtil;
import cn.mafangui.hotel.response.ResponseTool;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.web.servlet.HandlerInterceptor;
@ -20,7 +20,7 @@ public class UserInterceptor implements HandlerInterceptor {
return true;
}else {
PrintWriter writer = response.getWriter();
AjaxResult result = ResponseUtil.failed(MsgType.PERMISSION_DENIED);
AjaxResult result = ResponseTool.failed(MsgType.PERMISSION_DENIED);
ObjectMapper mapper = new ObjectMapper();
writer.write(mapper.writeValueAsString(result));
return false;