Merge branch 'master' of http://47.100.18.120:3000/LiuQin/HotelDemo

src/main/java/com/example/hotel/bl/admin/AdminService.java

@@ -0,0 +1,15 @@
+package com.example.hotel.bl.admin;
+
+import com.example.hotel.vo.ResponseVO;
+import com.example.hotel.vo.UserForm;
+
+/**
+ * @Author: chenyizong
+ * @Date: 2020-03-04
+ */
+public interface AdminService {
+
+    ResponseVO addManager(UserForm userForm);
+
+
+}

src/main/java/com/example/hotel/bl/user/AccountService.java

@@ -23,9 +23,9 @@ public interface AccountService {
      */
     User login(UserForm userForm);
 
-    User getUserInfo(String email);
+    User getUserInfo(int id);
 
-    ResponseVO updateUserInfo(String email, String password,String username,String phonenumber);
+    ResponseVO updateUserInfo(int id, String password,String username,String phonenumber);
 
 
 }

src/main/java/com/example/hotel/bl/user/ClientService.java

@@ -1,19 +0,0 @@
-package com.example.hotel.bl.user;
-
-import com.example.hotel.vo.OrderVO;
-
-import java.util.List;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-02-29
- */
-public interface ClientService {
-    /**
-     * 预订酒店添加订单
-     * @param orderVO
-     */
-    void addOrder(OrderVO orderVO);
-
-    List<OrderVO> retrieveOrders();
-}

src/main/java/com/example/hotel/blImpl/admin/AdminServiceImpl.java

@@ -0,0 +1,35 @@
+package com.example.hotel.blImpl.admin;
+
+import com.example.hotel.bl.admin.AdminService;
+import com.example.hotel.data.admin.AdminMapper;
+import com.example.hotel.enums.UserType;
+import com.example.hotel.po.User;
+import com.example.hotel.vo.ResponseVO;
+import com.example.hotel.vo.UserForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: chenyizong
+ * @Date: 2020-03-04
+ */
+@Service
+public class AdminServiceImpl implements AdminService {
+    private final static String ACCOUNT_EXIST = "账号已存在";
+    @Autowired
+    AdminMapper adminMapper;
+    @Override
+    public ResponseVO addManager(UserForm userForm) {
+        User user = new User();
+        user.setEmail(userForm.getEmail());
+        user.setPassword(userForm.getPassword());
+        user.setUserType(UserType.HotelManager);
+        try {
+            adminMapper.addManager(user);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            return ResponseVO.buildFailure(ACCOUNT_EXIST);
+        }
+        return ResponseVO.buildSuccess();
+    }
+}

src/main/java/com/example/hotel/blImpl/user/AccountServiceImpl.java

@@ -41,8 +41,8 @@ public class AccountServiceImpl implements AccountService {
     }
 
     @Override
-    public User getUserInfo(String email) {
-        User user = accountMapper.getAccountByName(email);
+    public User getUserInfo(int id) {
+        User user = accountMapper.getAccountById(id);
         if (user == null) {
             return null;
         }
@@ -50,9 +50,9 @@ public class AccountServiceImpl implements AccountService {
     }
 
     @Override
-    public ResponseVO updateUserInfo(String email, String password, String username, String phonenumber) {
+    public ResponseVO updateUserInfo(int id, String password, String username, String phonenumber) {
         try {
-            accountMapper.updateAccount(email, password, username, phonenumber);
+            accountMapper.updateAccount(id, password, username, phonenumber);
         } catch (Exception e) {
             System.out.println(e.getMessage());
             return ResponseVO.buildFailure(UPDATE_ERROR);

src/main/java/com/example/hotel/blImpl/user/ClientServiceImpl.java

@@ -1,42 +0,0 @@
-package com.example.hotel.blImpl.user;
-
-import com.example.hotel.bl.user.ClientService;
-import com.example.hotel.data.user.OrderMapper;
-import com.example.hotel.po.Order;
-import com.example.hotel.vo.OrderVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-02-29
- */
-@Service
-public class ClientServiceImpl implements ClientService {
-    @Autowired
-    OrderMapper orderMapper;
-
-    @Override
-    public void addOrder(OrderVO orderVO) {
-        Order order = new Order();
-        order.setUserId(orderVO.getUserId());
-        order.setHotelId(orderVO.getHotelId());
-        order.setCheckInnDate(orderVO.getCheckInnDate());
-        order.setCheckOutDate(orderVO.getCheckOutDate());
-        order.setRoomType(orderVO.getRoomType());
-        order.setRoomNum(orderVO.getRoomNum());
-        order.setHaveChild(orderVO.isHaveChild());
-        order.setCreateDate(orderVO.getCreateDate());
-
-        orderMapper.insertOrder(order);
-
-
-    }
-
-    @Override
-    public List<OrderVO> retrieveOrders() {
-        return orderMapper.selectAllOrder();
-    }
-}

src/main/java/com/example/hotel/config/WebConfiguration.java

@@ -1,61 +1,61 @@
-package com.example.hotel.config;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-03-03
- */
-import com.example.hotel.interceptor.TokenInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
-import org.springframework.web.servlet.config.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-
-/**
- * 跨域请求支持/token拦截
- * tip:只能写在一个配置类里
- */
-@Configuration
-public class WebConfiguration implements WebMvcConfigurer {
-
-    private TokenInterceptor tokenInterceptor;
-
-    //构造方法
-    public WebConfiguration(TokenInterceptor tokenInterceptor){
-        this.tokenInterceptor = tokenInterceptor;
-    }
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowCredentials(true)
-                .allowedHeaders("*")
-                .allowedMethods("*");
-               // .allowedOrigins("*");
-    }
-
-    @Override
-    public void configureAsyncSupport(AsyncSupportConfigurer configurer){
-        configurer.setTaskExecutor(new ConcurrentTaskExecutor(Executors.newFixedThreadPool(3)));
-        configurer.setDefaultTimeout(30000);
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry){
-        List<String> excludePath = new ArrayList<>();
-        //排除拦截，除了注册登录(此时还没token)，其他都拦截
-        excludePath.add("/api/register");  //登录
-        excludePath.add("/api/login");     //注册
-      //  excludePath.add("/static/**");  //静态资源
-        excludePath.add("/assets/**");  //静态资源
-
-        registry.addInterceptor(tokenInterceptor)
-                .addPathPatterns("/**")
-                .excludePathPatterns(excludePath);
-        WebMvcConfigurer.super.addInterceptors(registry);
-    }
-}
+//package com.example.hotel.config;
+//
+///**
+// * @Author: chenyizong
+// * @Date: 2020-03-03
+// */
+//import com.example.hotel.interceptor.TokenInterceptor;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
+//import org.springframework.web.servlet.config.annotation.*;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.concurrent.Executors;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//
+///**
+// * 跨域请求支持/token拦截
+// * tip:只能写在一个配置类里
+// */
+//@Configuration
+//public class WebConfiguration implements WebMvcConfigurer {
+//
+//    private TokenInterceptor tokenInterceptor;
+//
+//    //构造方法
+//    public WebConfiguration(TokenInterceptor tokenInterceptor){
+//        this.tokenInterceptor = tokenInterceptor;
+//    }
+//
+//    @Override
+//    public void addCorsMappings(CorsRegistry registry) {
+//        registry.addMapping("/**")
+//                .allowCredentials(true)
+//                .allowedHeaders("*")
+//                .allowedMethods("*");
+//                //.allowedOrigins("*");
+//    }
+//
+//    @Override
+//    public void configureAsyncSupport(AsyncSupportConfigurer configurer){
+//        configurer.setTaskExecutor(new ConcurrentTaskExecutor(Executors.newFixedThreadPool(3)));
+//        configurer.setDefaultTimeout(30000);
+//    }
+//
+//    @Override
+//    public void addInterceptors(InterceptorRegistry registry){
+//        List<String> excludePath = new ArrayList<>();
+//        //排除拦截，除了注册登录(此时还没token)，其他都拦截
+//        excludePath.add("/api/user/register");
+//        excludePath.add("/api/user/login");
+//        excludePath.add("/static/**");
+//        excludePath.add("/assets/**");
+//
+//        registry.addInterceptor(tokenInterceptor)
+//                .addPathPatterns("/**")
+//                .excludePathPatterns(excludePath);
+//        WebMvcConfigurer.super.addInterceptors(registry);
+//    }
+//}

src/main/java/com/example/hotel/controller/admin/AdminController.java

@@ -0,0 +1,30 @@
+package com.example.hotel.controller.admin;
+
+import com.example.hotel.bl.admin.AdminService;
+import com.example.hotel.blImpl.admin.AdminServiceImpl;
+import com.example.hotel.vo.ResponseVO;
+import com.example.hotel.vo.UserForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: chenyizong
+ * @Date: 2020-03-04
+ */
+@RestController()
+@RequestMapping("/api/admin")
+public class AdminController {
+    @Autowired
+    AdminServiceImpl adminService;
+
+    @PostMapping("/addManager")
+    public ResponseVO addManager(@RequestBody UserForm userForm){
+        return adminService.addManager(userForm);
+
+
+    }
+
+}

src/main/java/com/example/hotel/controller/hotel/HotelController.java

@@ -4,6 +4,7 @@ import com.example.hotel.bl.hotel.HotelService;
 import com.example.hotel.po.HotelRoom;
 import com.example.hotel.util.Result;
 import com.example.hotel.vo.HotelVO;
+import com.example.hotel.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -16,27 +17,27 @@ public class HotelController {
     private HotelService hotelService;
 
     @PostMapping()
-    public ResponseEntity<?> createHotel(@RequestBody HotelVO hotelVO) {
+    public ResponseVO createHotel(@RequestBody HotelVO hotelVO) {
 
         hotelService.addHotel(hotelVO);
-        return Result.ok();
+        return ResponseVO.buildSuccess();
     }
 
     @GetMapping("/all")
-    public ResponseEntity<?> retrieveAllHotels(){
-        return Result.ok(hotelService.retrieveHotels());
+    public ResponseVO retrieveAllHotels(){
+        return ResponseVO.buildSuccess(hotelService.retrieveHotels());
     }
 
     @PostMapping("/roomInfo")
-    public ResponseEntity<?> addRoomInfo(@RequestBody HotelRoom hotelRoom) {
+    public ResponseVO addRoomInfo(@RequestBody HotelRoom hotelRoom) {
         hotelService.addHotelRoomInfo(hotelRoom);
-        return Result.ok();
+        return ResponseVO.buildSuccess();
     }
 
     @GetMapping("/{hotelId}/detail")
-    public ResponseEntity<?> retrieveHotelDetail(@PathVariable Integer hotelId) {
+    public ResponseVO retrieveHotelDetail(@PathVariable Integer hotelId) {
 
-        return Result.ok(hotelService.retrieveHotelDetails(hotelId));
+        return ResponseVO.buildSuccess(hotelService.retrieveHotelDetails(hotelId));
     }
 
 

src/main/java/com/example/hotel/controller/user/AccountController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.Email;
 
 
 @RestController()
@@ -26,8 +27,8 @@ public class AccountController {
         if (user == null) {
             return ResponseVO.buildFailure(ACCOUNT_INFO_ERROR);
         }
-        String token = TokenUtil.sign(user);
-        return ResponseVO.buildSuccess(token);
+       // String token = TokenUtil.sign(user);
+        return ResponseVO.buildSuccess(user);
 
     }
 
@@ -36,28 +37,23 @@ public class AccountController {
         return accountService.registerAccount(userVO);
     }
 
-//    @PostMapping("/logout")
-//    public String logOut(HttpSession session) {
-//        session.removeAttribute(InterceptorConfiguration.SESSION_KEY);
-//        return "index";
-//    }
 
-    @GetMapping("/userinfo")
-    public ResponseVO getUserInfo(HttpServletRequest httpServletRequest) {
-        String token = httpServletRequest.getHeader("token");
-        String email = TokenUtil.getEmail(token);
-        User user = accountService.getUserInfo(email);
+    @GetMapping("/{id}/getUserInfo")
+    public ResponseVO getUserInfo(@PathVariable int id) {
+//        String token = httpServletRequest.getHeader("Authorization");
+//        String email = TokenUtil.getEmail(token);
+        User user = accountService.getUserInfo(id);
         if(user==null){
             return ResponseVO.buildFailure(ACCOUNT_INFO_ERROR);
         }
         return ResponseVO.buildSuccess(user);
     }
 
-    @PostMapping("/userinfo/update")
-    public ResponseVO updateInfo(@RequestBody UserInfoVO userInfoVO, HttpServletRequest httpServletRequest){
-        String token = httpServletRequest.getHeader("token");
-        String email = TokenUtil.getEmail(token);
-        return accountService.updateUserInfo(email,userInfoVO.getPassword(),userInfoVO.getUserName(),userInfoVO.getPhoneNumber());
+    @PostMapping("/{id}/userinfo/update")
+    public ResponseVO updateInfo(@RequestBody UserInfoVO userInfoVO,@PathVariable int id){
+        //String token = httpServletRequest.getHeader("token");
+       // String email = TokenUtil.getEmail(token);
+        return accountService.updateUserInfo(id,userInfoVO.getPassword(),userInfoVO.getUserName(),userInfoVO.getPhoneNumber());
 
     }
 

src/main/java/com/example/hotel/controller/user/ClientController.java

@@ -1,35 +0,0 @@
-package com.example.hotel.controller.user;
-
-import com.example.hotel.bl.user.ClientService;
-import com.example.hotel.util.Result;
-import com.example.hotel.vo.OrderVO;
-import com.example.hotel.vo.ResponseVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-02-29
- */
-
-
-@RestController()
-@RequestMapping("/api")
-public class ClientController {
-    @Autowired
-    private ClientService clientService;
-
-    @PostMapping("/hotel/reserve")
-    public ResponseVO reserveHotel(@RequestBody OrderVO orderVO){
-        clientService.addOrder(orderVO);
-        return ResponseVO.buildSuccess(orderVO);
-    }
-
-    @GetMapping("/order/all")
-    public ResponseEntity<?> retrieveAllOrders(){
-        return Result.ok(clientService.retrieveOrders());
-    }
-
-
-}

src/main/java/com/example/hotel/data/admin/AdminMapper.java

@@ -0,0 +1,16 @@
+package com.example.hotel.data.admin;
+
+import com.example.hotel.po.User;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: chenyizong
+ * @Date: 2020-03-04
+ */
+@Mapper
+@Repository
+public interface AdminMapper {
+
+    int addManager(User user);
+}

src/main/java/com/example/hotel/data/user/AccountMapper.java

@@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 @Mapper
 @Repository
@@ -24,15 +26,17 @@ public interface AccountMapper {
      */
      User getAccountByName(@Param("email") String email);
 
+     User getAccountById(@Param("id") int id);
+
     /**
      * 更新用户信息
-     * @param email
+     * @param id
      * @param password
      * @param username
      * @param phonenumber
      * @return
      */
-     int updateAccount(@Param("email") String email, @Param("password") String password,@Param("username") String username, @Param("phonenumber") String phonenumber);
+     int updateAccount(@Param("id") int id, @Param("password") String password,@Param("userName") String username, @Param("phoneNumber") String phonenumber);
 
 
 }

src/main/java/com/example/hotel/data/user/OrderMapper.java

@@ -1,21 +0,0 @@
-package com.example.hotel.data.user;
-
-import com.example.hotel.po.Order;
-import com.example.hotel.vo.OrderVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-02-29
- */
-@Mapper
-@Repository
-public interface OrderMapper {
-
-    int insertOrder(Order order);
-
-    List<OrderVO> selectAllOrder();
-}

src/main/java/com/example/hotel/enums/UserType.java

@@ -5,14 +5,17 @@ package com.example.hotel.enums;
  * @Date: 2020-02-29
  */
 public enum UserType {
-    Client(1),
-    HotelManager(2),
-    Manager(3);
-    private int value;
+    Client("1"),
+    HotelManager("2"),
+    Manager("3");
+    private String value;
 
-    UserType(int value) {
+    UserType(String value) {
         this.value = value;
     }
-
+    @Override
+    public String toString() {
+        return value;
+    }
 
 }

src/main/java/com/example/hotel/interceptor/TokenInterceptor.java

@@ -1,48 +1,48 @@
-package com.example.hotel.interceptor;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-03-03
- */
-import com.alibaba.fastjson.JSONObject;
-import com.example.hotel.util.TokenUtil;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Component
-public class TokenInterceptor implements HandlerInterceptor {
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response,Object handler)throws Exception{
-        if(request.getMethod().equals("OPTIONS")){
-            response.setStatus(HttpServletResponse.SC_OK);
-            return true;
-        }
-        response.setCharacterEncoding("utf-8");
-        String token = request.getHeader("token");
-        if(token != null){
-            boolean result = TokenUtil.verify(token);
-            if(result){
-                System.out.println("通过拦截器");
-                return true;
-            }
-        }
-        response.setCharacterEncoding("UTF-8");
-        response.setContentType("application/json; charset=utf-8");
-        try{
-            JSONObject json = new JSONObject();
-            json.put("msg","token verify fail");
-            json.put("code","50000");
-            response.getWriter().append(json.toJSONString());
-            System.out.println("认证失败，未通过拦截器");
-        }catch (Exception e){
-            e.printStackTrace();
-            response.sendError(500);
-            return false;
-        }
-        return false;
-    }
-}
+//package com.example.hotel.interceptor;
+//
+///**
+// * @Author: chenyizong
+// * @Date: 2020-03-03
+// */
+//import com.alibaba.fastjson.JSONObject;
+//import com.example.hotel.util.TokenUtil;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.servlet.HandlerInterceptor;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//@Component
+//public class TokenInterceptor implements HandlerInterceptor {
+//
+//    @Override
+//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response,Object handler)throws Exception{
+//        if(request.getMethod().equals("OPTIONS")){
+//            response.setStatus(HttpServletResponse.SC_OK);
+//            return true;
+//        }
+//        response.setCharacterEncoding("utf-8");
+//        String token = request.getHeader("Authorization");
+//        if(token != null){
+//            boolean result = TokenUtil.verify(token);
+//            if(result){
+//                System.out.println("通过拦截器");
+//                return true;
+//            }
+//        }
+//        response.setCharacterEncoding("UTF-8");
+//        response.setContentType("application/json; charset=utf-8");
+//        try{
+//            JSONObject json = new JSONObject();
+//            json.put("msg","token verify fail");
+//            json.put("code","50000");
+//            response.getWriter().append(json.toJSONString());
+//            System.out.println("认证失败，未通过拦截器");
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            response.sendError(500);
+//            return false;
+//        }
+//        return false;
+//    }
+//}

src/main/java/com/example/hotel/po/Order.java

@@ -1,101 +0,0 @@
-package com.example.hotel.po;
-
-import java.util.Date;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-02-29
- */
-public class Order {
-    private Integer id;
-    private Integer userId;
-    private Integer hotelId;
-    private Date checkInDate;
-    private Date checkOutDate;
-    private String roomType;
-    private Integer roomNum;
-    private Integer peopleNum;
-    private boolean haveChild;
-    private Date createDate;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getHotelId() {
-        return hotelId;
-    }
-
-    public void setHotelId(Integer hotelId) {
-        this.hotelId = hotelId;
-    }
-
-    public Date getCheckInnDate() {
-        return checkInDate;
-    }
-
-    public void setCheckInnDate(Date checkInnDate) {
-        this.checkInDate = checkInnDate;
-    }
-
-    public Date getCheckOutDate() {
-        return checkOutDate;
-    }
-
-    public void setCheckOutDate(Date checkOutDate) {
-        this.checkOutDate = checkOutDate;
-    }
-
-    public String getRoomType() {
-        return roomType;
-    }
-
-    public void setRoomType(String roomType) {
-        this.roomType = roomType;
-    }
-
-    public Integer getRoomNum() {
-        return roomNum;
-    }
-
-    public void setRoomNum(Integer roomNum) {
-        this.roomNum = roomNum;
-    }
-
-    public Integer getPeopleNum() {
-        return peopleNum;
-    }
-
-    public void setPeopleNum(Integer peopleNum) {
-        this.peopleNum = peopleNum;
-    }
-
-    public boolean isHaveChild() {
-        return haveChild;
-    }
-
-    public void setHaveChild(boolean haveChild) {
-        this.haveChild = haveChild;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-}

src/main/java/com/example/hotel/vo/OrderVO.java

@@ -1,101 +0,0 @@
-package com.example.hotel.vo;
-
-import java.util.Date;
-
-/**
- * @Author: chenyizong
- * @Date: 2020-02-29
- */
-public class OrderVO {
-    private Integer id;
-    private Integer userId;
-    private Integer hotelId;
-    private Date checkInDate;
-    private Date checkOutDate;
-    private String roomType;
-    private Integer roomNum;
-    private Integer peopleNum;
-    private boolean haveChild;
-    private Date createDate;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getHotelId() {
-        return hotelId;
-    }
-
-    public void setHotelId(Integer hotelId) {
-        this.hotelId = hotelId;
-    }
-    public Date getCheckInnDate() {
-        return checkInDate;
-    }
-
-    public void setCheckInnDate(Date checkInnDate) {
-        this.checkInDate = checkInnDate;
-    }
-
-    public Date getCheckOutDate() {
-        return checkOutDate;
-    }
-
-    public void setCheckOutDate(Date checkOutDate) {
-        this.checkOutDate = checkOutDate;
-    }
-
-    public String getRoomType() {
-        return roomType;
-    }
-
-    public void setRoomType(String roomType) {
-        this.roomType = roomType;
-    }
-
-    public Integer getRoomNum() {
-        return roomNum;
-    }
-
-    public void setRoomNum(Integer roomNum) {
-        this.roomNum = roomNum;
-    }
-
-    public Integer getPeopleNum() {
-        return peopleNum;
-    }
-
-    public void setPeopleNum(Integer peopleNum) {
-        this.peopleNum = peopleNum;
-    }
-
-    public boolean isHaveChild() {
-        return haveChild;
-    }
-
-    public void setHaveChild(boolean haveChild) {
-        this.haveChild = haveChild;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-
-}

src/main/resources/dataImpl/admin/AdminMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.hotel.data.admin.AdminMapper">
+    <insert id="addManager" parameterType="com.example.hotel.po.User" useGeneratedKeys="true" keyProperty="id">
+        insert into User(email,password,usertype)
+        values(#{email},#{password},#{userType})
+    </insert>
+
+
+    <resultMap id="User" type="com.example.hotel.po.User">
+        <id column="id" property="id"></id>
+        <result column="email" property="email"></result>
+        <result column="password" property="password"></result>
+        <result column="username" property="userName"></result>
+        <result column="phonenumber" property="phoneNumber"></result>
+        <result column="credit" property="credit"></result>
+        <result column="usertype" property="userType"></result>
+    </resultMap>
+</mapper>

src/main/resources/dataImpl/user/AccountMapper.xml

@@ -3,17 +3,27 @@
 <mapper namespace="com.example.hotel.data.user.AccountMapper">
     <insert id="createNewAccount" parameterType="com.example.hotel.po.User" useGeneratedKeys="true" keyProperty="id">
         insert into User(email,password,username,phonenumber,credit,usertype)
-        values(#{email},#{password},#{username},#{phonenumber},#{credit},#{usertype})
+        values(#{email},#{password},#{userName},#{phoneNumber},#{credit},#{userType})
     </insert>
     <select id="getAccountByName" resultMap="User">
         select * from User where email=#{email}
     </select>
+    <select id="getAccountById" resultMap="User">
+        select * from User where id=#{id}
+    </select>
     <update id="updateAccount">
-        update User set password=#{password},username=#username,phonenumber=#phonenumber,credit=#credit
+        update User set password=#{password},username=#{userName},phonenumber=#{phoneNumber}
         where email=#{email}
     </update>
 
 
     <resultMap id="User" type="com.example.hotel.po.User">
+        <id column="id" property="id"></id>
+        <result column="email" property="email"></result>
+        <result column="password" property="password"></result>
+        <result column="username" property="userName"></result>
+        <result column="phonenumber" property="phoneNumber"></result>
+        <result column="credit" property="credit"></result>
+        <result column="usertype" property="userType"></result>
     </resultMap>
 </mapper>

src/main/resources/dataImpl/user/OrderMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.hotel.data.user.OrderMapper">
-
-    <insert id="insertOrder" parameterType="com.example.hotel.po.Order"
-            useGeneratedKeys="true" keyProperty="id">
-        insert into Order(id,userId,hotelId,checkInDate,checkOutDate,roomType,roomNum,peopleNum,haveChild,createDate)
-        values (#{id},#{userId},#{checkInDate},#{checkOutDate},#{roomType},#{roomNum},#{peopleNum},#{haveChild},#{createDate})
-    </insert>
-    <select id="selectAllOrder" resultMap="Order">
-        select * from Order
-    </select>
-
-    <resultMap id="Order" type="com.example.hotel.po.Order">
-    </resultMap>
-</mapper>