更新部分接口

src/main/java/cn/mafangui/hotel/controller/worker/CheckInController.java

@@ -10,19 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping(value = "/admin/checkIn")
+@RequestMapping(value = "/op/check-in")
 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();
@@ -33,12 +26,6 @@ public class CheckInController {
         return ResponseTool.success(checkInService.checkIn(checkIn));
     }
 
-    /**
-     * 退房登记
-     *
-     * @param roomNumber
-     * @return
-     */
     @RequestMapping(value = "/out")
     public AjaxResult checkOut(String roomNumber) {
         if(checkInService.checkOut(roomNumber)<0)

src/main/java/cn/mafangui/hotel/controller/worker/HotelInfoController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping(value = "/admin/hotel")
+@RequestMapping(value = "/op/hotel")
 public class HotelInfoController {
 
     @Autowired

src/main/java/cn/mafangui/hotel/controller/worker/OpUserController.java

@@ -6,6 +6,7 @@ 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.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,45 +15,30 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 @RestController
-@RequestMapping(value = "/worker/user")
+@RequestMapping(value = "/op/user")
-public class WorkerUserController {
+public class OpUserController {
     @Autowired
     private UserService userService;
 
 
+    @RequestMapping(value = "")
+    public AjaxResult getAllUser(){
+        return ResponseTool.success(userService.selectAllUser());
+    }
+
+    @RequestMapping(value = "/count")
+    public AjaxResult getUserCount(){
+        return ResponseTool.success(userService.getUserCount());
+    }
 
-    /**
-     * 用户添加
-     * @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,
+    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)){
@@ -71,13 +57,7 @@ public class WorkerUserController {
         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);
@@ -90,51 +70,23 @@ public class WorkerUserController {
         return ResponseTool.failed("修改失败");
     }
 
-    /**
+
-     *  获取个人资料
+    @RequestMapping(value = "/{userId}")
-     * @param request
+    public AjaxResult getProfile(@PathVariable Integer userId){
-     * @return
+        User user = userService.selectById(userId);
-     */
-    @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);
     }
 
 
-    /**
+    @RequestMapping(value = "/username/{username}")
-     * 根据username查找用户
+    public AjaxResult getByUsername(@PathVariable String 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("注销成功");
-    }
 
 
 }

src/main/java/cn/mafangui/hotel/controller/worker/OrderController.java

@@ -1,12 +1,14 @@
-package cn.mafangui.hotel.controller;
+package cn.mafangui.hotel.controller.worker;
 
 import cn.mafangui.hotel.entity.Order;
 import cn.mafangui.hotel.enums.OrderStatus;
 import cn.mafangui.hotel.response.AjaxResult;
+import cn.mafangui.hotel.response.MsgType;
 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;
+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;
@@ -18,7 +20,7 @@ import java.util.List;
  * 订单接口
  */
 @RestController
-@RequestMapping(value = "/order")
+@RequestMapping(value = "/op/order")
 public class OrderController {
     @Autowired
     private OrderService orderService;
@@ -26,68 +28,34 @@ public class OrderController {
     /**
      * 添加预订
      * 订单状态默认为未付款状态
-     * @param orderTypeId
-     * @param orderType
-     * @param userId
-     * @param name
-     * @param phone
-     * @param roomTypeId
-     * @param roomType
-     * @param orderDate
-     * @param orderDays
-     * @param orderCost
-     * @return
      */
     @RequestMapping(value = "/add")
-    public int addOrder(int orderTypeId,String orderType, int userId,String name, String phone,int roomTypeId, String roomType,
+    public AjaxResult addOrder(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.addOrder(order);
+        int re = orderService.addOrder(order);
+        if(re!=1) return ResponseTool.failed(MsgType.FAILED);
+        return ResponseTool.success("添加成功.");
     }
 
-    /**
+
-     * 删除订单
-     * @param orderId
-     * @return
-     */
     @RequestMapping(value = "/delete")
-    public int deleteOrder(int orderId){
+    public AjaxResult deleteOrder(int orderId){
-        return orderService.delete(orderId);
+        int re = orderService.delete(orderId);
+        if(re!=1) return ResponseTool.failed(MsgType.FAILED);
+        return ResponseTool.success("删除成功.");
     }
 
-    /**
-     * 客户删除订单
-     * @param orderId
-     * @return
-     */
-    @RequestMapping(value = "/deleteByUser")
-    public int deleteOrderByUser(int orderId){
-        Order order = new Order(orderId,OrderStatus.WAS_DELETED.getCode());
-        return orderService.update(order);
-    }
 
-    /**
-     * 修改订单
-     * @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,
+    public AjaxResult 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);
+        int re =  orderService.update(order);
+        if(re!=1) return ResponseTool.failed(MsgType.FAILED);
+        return ResponseTool.success("修改成功.");
     }
 
     /**
@@ -96,8 +64,10 @@ public class OrderController {
      * @return
      */
     @RequestMapping(method = RequestMethod.POST,value = "/pay")
-    public int payOrder(int orderId){
+    public AjaxResult payOrder(int orderId){
-        return orderService.payOrder(orderId);
+        int re = orderService.payOrder(orderId);
+        if(re!=1) return ResponseTool.failed(MsgType.FAILED);
+        return ResponseTool.success("支付成功.");
     }
 
     /**
@@ -106,8 +76,10 @@ public class OrderController {
      * @return
      */
     @RequestMapping(value = "/cancel")
-    public int cancelOrder(int orderId){
+    public AjaxResult cancelOrder(int orderId){
-        return orderService.cancelOrder(orderId);
+        int re= orderService.cancelOrder(orderId);
+        if(re!=1) return ResponseTool.failed(MsgType.FAILED);
+        return ResponseTool.success("取消成功.");
     }
 
     /**
@@ -122,13 +94,14 @@ public class OrderController {
     }
 
 
-    /**
+    @RequestMapping(value = "")
-     * 所有订单
+    public AjaxResult getAllOrder(){
-     * @return
+        return ResponseTool.success(orderService.AllOrders());
-     */
+    }
-    @RequestMapping(value = "/all")
+
-    public List<Order> getAllOrder(){
+    @RequestMapping(value = "/count")
-        return orderService.AllOrders();
+    public AjaxResult getOrderCount(){
+        return ResponseTool.success(orderService.getOrderCount());
     }
 
     /**
@@ -136,29 +109,20 @@ public class OrderController {
      * @param userId
      * @return
      */
-    @RequestMapping(value = "/withUserId")
+    @RequestMapping(value = "/user/{userId}")
-    public List<Order> getByUser(int userId){
+    public AjaxResult getByUser(@PathVariable  int userId){
-        return orderService.selectByUserId(userId);
+        return ResponseTool.success(orderService.selectByUserId(userId));
     }
 
-    /**
-     * 客户查询个人所有订单（不包括被自己删除的）
-     * @param userId
-     * @return
-     */
-    @RequestMapping(value = "/userOrder")
-    public AjaxResult getAllByUser(int userId){
-        return ResponseTool.success(orderService.UsersAllOrders(userId));
-    }
 
     /**
      * 根据订单号查询订单
      * @param orderId
      * @return
      */
-    @RequestMapping(value = "/withId")
+    @RequestMapping(value = "/{orderId}")
-    public Order getById(int orderId){
+    public AjaxResult getById(@PathVariable Integer orderId){
-        return orderService.selectById(orderId);
+        return ResponseTool.success(orderService.selectById(orderId));
     }
 
     /**
@@ -169,7 +133,8 @@ public class OrderController {
      * @return
      */
     @RequestMapping(value = "/withNameAndPhone")
-    public Order getByNameAndPhone(String name,String phone){
+    public AjaxResult getByNameAndPhone(String name,String phone){
-        return orderService.selectByNameAndPhone(name,phone);
+        return ResponseTool.success(orderService.selectByNameAndPhone(name,phone));
     }
+
 }

src/main/java/cn/mafangui/hotel/controller/worker/OrderTypeController.java

@@ -1,15 +1,18 @@
 package cn.mafangui.hotel.controller.worker;
 
 import cn.mafangui.hotel.entity.OrderType;
+import cn.mafangui.hotel.response.AjaxResult;
+import cn.mafangui.hotel.response.ResponseTool;
 import cn.mafangui.hotel.service.OrderTypeService;
 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 = "/orderType")
+@RequestMapping(value = "/op/order-type")
 public class OrderTypeController {
     @Autowired
     private OrderTypeService orderTypeService;
@@ -21,25 +24,25 @@ public class OrderTypeController {
     }
 
     @RequestMapping(value = "/delete")
-    public int deleteOrderType(int typeId){
+    public int deleteOrderType(Integer typeId){
         return orderTypeService.deleteOrderType(typeId);
     }
 
     @RequestMapping(value = "/update")
-    public int updateOrderType(int typeId,String type,String remark){
+    public int updateOrderType(Integer typeId,String type,String remark){
         OrderType orderType = new OrderType(type,remark);
         orderType.setTypeId(typeId);
         return orderTypeService.updateOrderType(orderType);
     }
 
-    @RequestMapping(value = "/withId")
+    @RequestMapping(value = "/{typeId}")
-    public OrderType getById(int typeId){
+    public AjaxResult getById(@PathVariable Integer typeId){
-        return orderTypeService.selectById(typeId);
+        return ResponseTool.success(orderTypeService.selectById(typeId));
     }
 
-    @RequestMapping(value = "all")
+    @RequestMapping(value = "")
-    public List<OrderType> getAllType(){
+    public AjaxResult getAllType(){
-        return orderTypeService.selectAll();
+        return ResponseTool.success(orderTypeService.selectAll());
     }
 
 }

src/main/java/cn/mafangui/hotel/controller/worker/RoomController.java

@@ -12,7 +12,7 @@ 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")
+@RequestMapping(value = "/op/room")
 public class RoomController {
 
     @Autowired

src/main/java/cn/mafangui/hotel/mapper/CheckInMapper.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 @Component
 public interface CheckInMapper {
+    Integer getCount();
     int deleteByPrimaryKey(Integer checkInId);
 
     int insert(CheckIn record);

src/main/java/cn/mafangui/hotel/mapper/OrderMapper.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 @Component
 public interface OrderMapper {
+
     int deleteByPrimaryKey(Integer orderId);
 
     int insert(Order record);
@@ -22,6 +23,8 @@ public interface OrderMapper {
 
     int updateByPrimaryKey(Order record);
 
+    Integer getOrderCount();
+
     List<Order> selectAll();
 
     List<Order> selectByUserId(Integer userId);

src/main/java/cn/mafangui/hotel/mapper/OrderTypeMapper.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 @Component
 public interface OrderTypeMapper {
+    Integer getCount();
     int deleteByPrimaryKey(Integer typeId);
 
     int insert(OrderType record);

src/main/java/cn/mafangui/hotel/mapper/RoomMapper.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 @Component
 public interface RoomMapper {
+    Integer getCount();
     int deleteByPrimaryKey(Integer roomId);
 
     int insert(Room record);

src/main/java/cn/mafangui/hotel/mapper/RoomTypeMapper.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 @Component
 public interface RoomTypeMapper {
+    Integer getCount();
     int deleteByPrimaryKey(Integer typeId);
 
     int insert(RoomType record);

src/main/java/cn/mafangui/hotel/mapper/UserMapper.java

@@ -20,6 +20,8 @@ public interface UserMapper {
 
     int updateByPrimaryKey(User record);
 
+    Integer getUserCount();
+
     User selectByUsernameAndPassword(@Param("username") String username,@Param("password") String password);
 
     User selectByUsername(String username);

src/main/java/cn/mafangui/hotel/mapper/WorkerMapper.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 @Component
 public interface WorkerMapper {
+    Integer getCount();
     int deleteByPrimaryKey(Integer workerId);
 
     int insert(Worker record);

src/main/java/cn/mafangui/hotel/service/OrderService.java

@@ -22,6 +22,8 @@ public interface OrderService {
 
     int cancelOrder(int orderId);
 
+    Integer getOrderCount();
+
     List<Order> selectByUserId(int userId);
 
     List<Order> AllOrders();

src/main/java/cn/mafangui/hotel/service/UserService.java

@@ -17,6 +17,8 @@ public interface UserService {
 
     int updateUser(User user);
 
+    Integer getUserCount();
+
     User selectByUsernameAndPassword(String username, String password);
 
     User selectByUsername(String username);

src/main/java/cn/mafangui/hotel/service/impl/OrderServiceImpl.java

@@ -106,6 +106,11 @@ public class OrderServiceImpl implements OrderService {
         return orderMapper.updateByPrimaryKeySelective(order);
     }
 
+    @Override
+    public Integer getOrderCount() {
+        return orderMapper.getOrderCount();
+    }
+
     @Override
     public List<Order> selectByUserId(int userId) {
         return orderMapper.selectByUserId(userId);

src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java

@@ -41,6 +41,11 @@ public class UserServiceImpl implements UserService {
         return userMapper.updateByPrimaryKeySelective(user);
     }
 
+    @Override
+    public Integer getUserCount() {
+        return userMapper.getUserCount();
+    }
+
     @Override
     public User selectByUsernameAndPassword(String username, String password) {
         String pass = MD5Utils.MD5Encode(password);

src/main/java/cn/mafangui/hotel/tool/SessionInterceptor.java

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

src/main/resources/mybatis/mapper/CheckInMapper.xml

@@ -17,6 +17,9 @@
     check_in_id, order_id, room_number,peo_count, persons, ids, check_in_time, check_out_time,
     create_time, update_time
   </sql>
+  <select id="getCount" resultType="java.lang.Integer">
+    select count(check_in_id) from check_in
+  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

src/main/resources/mybatis/mapper/OrderMapper.xml

@@ -32,6 +32,10 @@
     <include refid="Base_Column_List" />
     from order_info
   </select>
+  <select id="getOrderCount"  resultType="java.lang.Integer">
+    select count(order_id)
+    from order_info
+  </select>
   <select id="selectByNameAndPhone" parameterType="cn.mafangui.hotel.entity.Order" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

src/main/resources/mybatis/mapper/OrderTypeMapper.xml

@@ -11,6 +11,9 @@
   <sql id="Base_Column_List">
     type_id, type, remark, create_time, update_time
   </sql>
+  <select id="getCount" resultType="java.lang.Integer">
+    select count(type_id) from order_type
+  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />

src/main/resources/mybatis/mapper/RoomMapper.xml

@@ -17,6 +17,9 @@
     room_id, room_number, type_id, room_type, room_price, room_discount, room_status,
     remark, create_time, update_time
   </sql>
+  <select id="getCount" resultType="java.lang.Integer">
+    select count(room_id) from room_info
+  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

src/main/resources/mybatis/mapper/RoomTypeMapper.xml

@@ -19,6 +19,9 @@
     type_id, room_type, remark, price, discount, area, bed_num, bed_size, window, rest,create_time,
     update_time
   </sql>
+  <select id="getCount" resultType="java.lang.Integer">
+    select count(type_id) from room_type
+  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

src/main/resources/mybatis/mapper/UserMapper.xml

@@ -28,6 +28,9 @@
     select * from user_info
     where username != ''
   </select>
+  <select id="getUserCount" resultType="java.lang.Integer">
+    select count(user_id) from user_info
+  </select>
   <select id="selectAll" resultMap="BaseResultMap">
     select * from user_info
   </select>

src/main/resources/mybatis/mapper/WorkerMapper.xml

@@ -18,6 +18,9 @@
     worker_id, role, username, password, name, gender, phone, email, address,
     create_time, update_time
   </sql>
+  <select id="getCount" resultType="java.lang.Integer">
+    select count(worker_id) from worker_info
+  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />