统一返回体结构

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/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/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

@@ -38,22 +38,22 @@ public class AccountController {
     }
 
 
-    @GetMapping("/{email}/getUserInfo")
-    public ResponseVO getUserInfo(@PathVariable String email) {
+    @GetMapping("/{id}/getUserInfo")
+    public ResponseVO getUserInfo(@PathVariable int id) {
 //        String token = httpServletRequest.getHeader("Authorization");
 //        String email = TokenUtil.getEmail(token);
-        User user = accountService.getUserInfo(email);
+        User user = accountService.getUserInfo(id);
         if(user==null){
             return ResponseVO.buildFailure(ACCOUNT_INFO_ERROR);
         }
         return ResponseVO.buildSuccess(user);
     }
 
-    @PostMapping("/{email}/userinfo/update")
-    public ResponseVO updateInfo(@RequestBody UserInfoVO userInfoVO,@PathVariable String email){
+    @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(email,userInfoVO.getPassword(),userInfoVO.getUserName(),userInfoVO.getPhoneNumber());
+        return accountService.updateUserInfo(id,userInfoVO.getPassword(),userInfoVO.getUserName(),userInfoVO.getPhoneNumber());
 
     }
 

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

@@ -26,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/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

@@ -8,6 +8,9 @@
     <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}
         where email=#{email}