1.添加对房间信息的简单操作

2.新增时间格式化的工具类

src/main/java/cn/mafangui/hotel/controller/AdminController.java

@@ -17,7 +17,7 @@ public class AdminController {
     private AdminService adminService;
 
     /**
-     * 登录
+     * 管理员登录
      * @param userName
      * @param password
      * @return
@@ -34,7 +34,7 @@ public class AdminController {
     }
 
     /**
-     * 注册
+     * 管理员注册
      * @param userName
      * @param password
      * @return

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

@@ -0,0 +1,143 @@
+package cn.mafangui.hotel.controller;
+
+
+import cn.mafangui.hotel.entity.Room;
+import cn.mafangui.hotel.service.RoomService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.awt.print.PrinterException;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "room")
+public class RoomController {
+
+    @Autowired
+    private RoomService roomService;
+
+    /**
+     * 增加房间
+     * @param roomNumber
+     * @param roomFloor
+     * @param roomType
+     * @param typeName
+     * @param roomPrice
+     * @param roomDiscount
+     * @param roomStatus
+     * @return
+     */
+    @RequestMapping(value = "add")
+    public int addRoom(String roomNumber, int roomFloor, int roomType, String typeName, double roomPrice,double roomDiscount,String roomStatus){
+        int result = 0;
+        Room room = new Room(roomNumber,roomFloor,roomType,typeName,roomPrice,roomDiscount,roomStatus);
+        try {
+            result = roomService.addRoom(room);
+        }catch (Exception e){
+            result = -1;
+        }
+        return result;
+    }
+
+    /**
+     * 根据房间id或者房间号码删除房间
+     * @param roomId
+     * @param roomNumber
+     * @return
+     */
+    @RequestMapping(value = "delete")
+    public int deleteRoom(int roomId,String roomNumber){
+        int result = 0;
+        try {
+            if (roomNumber == null || "".equals(roomNumber)){
+                result = roomService.deleteRoom(roomId);
+            }else {
+                result = roomService.deleteRoom(roomNumber);
+            }
+        }catch (Exception e){
+            result = -1;
+        }
+        return result;
+    }
+
+    /**
+     * 更改房间信息
+     * @param roomId
+     * @param roomNumber
+     * @param roomFloor
+     * @param roomType
+     * @param typeName
+     * @param roomPrice
+     * @param roomDiscount
+     * @param roomStatus
+     * @return
+     */
+    @RequestMapping(value = "update")
+    public int updateRoom(int roomId,String roomNumber, int roomFloor, int roomType, String typeName, double roomPrice,double roomDiscount,String roomStatus){
+        int result = 0;
+        Room room = new Room(roomNumber,roomFloor,roomType,typeName,roomPrice,roomDiscount,roomStatus);
+        room.setRoomId(roomId);
+        try {
+            result = roomService.updateRoom(room);
+        }catch (Exception e){
+            result = -1;
+        }
+        return result;
+    }
+
+    /**
+     * 查询所有房间
+     * @return
+     */
+    @RequestMapping(value = "/all")
+    public List<Room> allRoom(){
+        try {
+            return roomService.findAll();
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    /**
+     * 根据状态查询房间信息
+     * @param roomNumber
+     * @return
+     */
+    @RequestMapping(value = "/withRoomNumber")
+    public Room findRoomByNumber(String roomNumber){
+        try{
+            return roomService.findByNumber(roomNumber);
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    /**
+     * 根据状态查询房间信息
+     * @param roomStatus
+     * @return
+     */
+    @RequestMapping(value = "/withStatus")
+    public List<Room> findRoomByStatus(String roomStatus){
+        try{
+            return roomService.findByStatus(roomStatus);
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    /**
+     * 根据类型查询房间信息
+     * @param typeName
+     * @return
+     */
+    @RequestMapping(value = "/withType")
+    public List<Room> findRoomByType(String typeName){
+        try{
+            return roomService.findByType(typeName);
+        }catch (Exception e){
+            return null;
+        }
+    }
+}

src/main/java/cn/mafangui/hotel/controller/RoomTypeController.java

@@ -16,12 +16,26 @@ public class RoomTypeController {
     @Autowired
     private RoomTypeService roomTypeService;
 
+    /**
+     * 添加房间类型
+     * @param roomType
+     * @param typeName
+     * @param bookingPrice
+     * @param bookingDiscount
+     * @return
+     */
     @RequestMapping(method = RequestMethod.POST,value = "/add")
     public int addNewType(int roomType,String typeName,double bookingPrice,double bookingDiscount){
         RoomType rt = new RoomType(roomType,typeName,bookingPrice,bookingDiscount);
         return roomTypeService.addRoomType(rt);
     }
 
+    /**
+     * 删除房间类型
+     * @param roomType
+     * @param typeName
+     * @return
+     */
     @RequestMapping(method = RequestMethod.POST,value = "/del")
     public int delType(int roomType,String typeName){
         RoomType rt = new RoomType();
@@ -30,12 +44,25 @@ public class RoomTypeController {
         return roomTypeService.delRoomType(rt);
     }
 
+    /**
+     * 更改房间类型
+     * @param roomType
+     * @param typeName
+     * @param bookingPrice
+     * @param bookingDiscount
+     * @return
+     */
     @RequestMapping(method = RequestMethod.POST,value = "/update")
     public int updateType(int roomType,String typeName,double bookingPrice,double bookingDiscount){
         RoomType rt = new RoomType(roomType,typeName,bookingPrice,bookingDiscount);
         return roomTypeService.updateRoomType(rt);
     }
 
+    /**
+     * 查询房间类型
+     * @param roomType
+     * @return
+     */
     @RequestMapping(value = "/query")
     public RoomType findByRoomType(int roomType){
         RoomType rt = new RoomType();
@@ -43,6 +70,10 @@ public class RoomTypeController {
         return roomTypeService.selectByName(rt);
     }
 
+    /**
+     * 查询所有房间类型
+     * @return
+     */
     @RequestMapping(value = "/all")
     public List<RoomType> findAllRoomType(){
         return roomTypeService.findAllType();

src/main/java/cn/mafangui/hotel/controller/WorkerController.java

@@ -14,6 +14,12 @@ 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){
         Worker worker = new Worker(userName,password);
@@ -24,28 +30,62 @@ public class WorkerController {
         }
     }
 
+    /**
+     * 添加操作员
+     * @param userName
+     * @param password
+     * @param workerName
+     * @param phone
+     * @param email
+     * @param address
+     * @return
+     */
     @RequestMapping(method = RequestMethod.POST,value = "/add")
     public int addWorker(String userName,String password,String workerName,String phone,String email,String address){
         Worker worker = new Worker(userName,password,workerName,phone,email,address);
         return workerService.addWorker(worker);
     }
 
+    /**
+     * 删除操作员
+     * @param userName
+     * @return
+     */
     @RequestMapping(method = RequestMethod.POST,value = "/del")
     public int delWorker(String userName){
         return workerService.delWorker(userName);
     }
 
+    /**
+     * 更改操作员信息
+     * @param userName
+     * @param password
+     * @param workerName
+     * @param phone
+     * @param email
+     * @param address
+     * @return
+     */
     @RequestMapping(method = RequestMethod.POST,value = "/update")
     public int updateWorker(String userName,String password,String workerName,String phone,String email,String address){
         Worker worker = new Worker(userName,password,workerName,phone,email,address);
         return workerService.updateWorker(worker);
     }
 
+    /**
+     * 查找操作员
+     * @param userName
+     * @return
+     */
     @RequestMapping(value = "/query")
     public Worker queryWorker(String userName){
         return workerService.selectWorker(userName);
     }
 
+    /**
+     * 查找所有操作员
+     * @return
+     */
     @RequestMapping(value = "/all")
     public List<Worker> findAllWorkers(){
         return workerService.findAllWorker();