first commit

src/main/java/com/springboot/demo1/controller/BooksController.java

@@ -3,24 +3,54 @@ package com.springboot.demo1.controller;
 import com.springboot.demo1.entity.Books;
 import com.springboot.demo1.service.BooksService;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
 
-@Controller
+@RestController
 @RequestMapping(value = "/books")
 public class BooksController {
 
     @Resource
     private BooksService booksService;
 
+    //获取图书列表
     @PostMapping(value = "/get")
-    @ResponseBody
     public List<Books> getBooksList(){
         return booksService.getBooksList();
     }
 
+    //根据书本ID查找书籍
+    @PostMapping(value = "/get/{bookId}")
+    public Books getBookById(@PathVariable Integer bookId){
+        return booksService.getBookById(bookId);
+    }
+
+    //添加书籍
+    @PostMapping(value = "/add/{bookName}")
+    public String addBook(@PathVariable String bookName) {
+        if(bookName == null || bookName.length() < 1) {
+            return "书名信息有误";
+        } else {
+            String res = booksService.addBook(bookName);
+            if(res != null) {
+                return res;
+            } else {
+                return "内部错误";
+            }
+        }
+    }
+
+    //根据书本ID删除书籍
+    @PostMapping(value = "/delete/{bookId}")
+    public String deleteBook(@PathVariable Integer bookId) {
+        String res = booksService.deleteBook(bookId);
+        if(res != null) {
+            return res;
+        } else {
+            return "内部错误";
+        }
+    }
+
 }

src/main/java/com/springboot/demo1/controller/BorrowInfoController.java

@@ -3,29 +3,26 @@ package com.springboot.demo1.controller;
 import com.springboot.demo1.entity.BorrowInfo;
 import com.springboot.demo1.service.BorrowInfoService;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
 
-@Controller
+@RestController
 @RequestMapping(value = "/borrowInfo")
 public class BorrowInfoController {
 
     @Resource
     private BorrowInfoService borrowInfoService;
 
+    //获取借阅信息列表
     @PostMapping(value = "/get")
-    @ResponseBody
     public List<BorrowInfo> getBorrowInfoList() {
         return borrowInfoService.getBorrowInfoList();
     }
 
+    //借书还书
     @PostMapping(value = "/update/{userId}/{bookId}/{type}")
-    @ResponseBody
     public String updateBorrowInfo(@PathVariable Integer userId,@PathVariable Integer bookId,@PathVariable Integer type) {
         if(userId == null || bookId == null || type == null) {
             return "error 504";
@@ -40,7 +37,6 @@ public class BorrowInfoController {
             } else {
                 return "内部错误";
             }
-
         }
     }
 

src/main/java/com/springboot/demo1/controller/UserController.java

@@ -2,26 +2,53 @@ package com.springboot.demo1.controller;
 
 import com.springboot.demo1.entity.User;
 import com.springboot.demo1.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
 
-@Controller
+@RestController
 @RequestMapping(value = "/user")
 public class UserController {
 
     @Resource
     private UserService userService;
 
+    //获取用户列表
     @PostMapping(value = "/get")
-    @ResponseBody
     public List<User> getUserList(){
         return userService.getUserList();
     }
 
+    //根据用户ID获取用户
+    @PostMapping(value = "/get/{userId}")
+    public User getUserById(@PathVariable Integer userId){
+        return userService.getUserByUserId(userId);
+    }
+
+    //添加用户
+    /*@PostMapping(value = "/add/{userName}/{passWord}/{email}/{nickName}")
+    public String addUser(@PathVariable String userName,@PathVariable String passWord,@PathVariable String email,
+                          @PathVariable String nickName){*/
+    @PostMapping(value = "/add")
+    public String addUser(String userName, String passWord, String email, String nickName){
+        if(passWord == null || passWord.length() < 6) {
+            return "密码格式有误";
+        } else if(email == null || email.length() < 6) {
+            return "邮箱格式有误";
+        } else {
+            User user = new User();
+            user.setUserName(userName);
+            user.setPassWord(passWord);
+            user.setEmail(email);
+            user.setNickName(nickName);
+            String res = userService.addUser(user);
+            if(res != null) {
+                return res;
+            } else {
+                return "内部错误";
+            }
+        }
+    }
+
 }

src/main/java/com/springboot/demo1/dao/BooksRepository.java

@@ -7,4 +7,6 @@ public interface BooksRepository extends JpaRepository<Books, Integer> {
 
     Books findBooksByBookId(Integer bookId);
 
+    Integer countBooksByBookName(String bookName);
+
 }

src/main/java/com/springboot/demo1/dao/UserRepository.java

@@ -11,4 +11,8 @@ public interface UserRepository extends JpaRepository<User,Integer> {
 
     User getUserByUserId(Integer userId);
 
+    Integer countUserByEmail(String email);
+
+    Integer countUserByUserName(String userName);
+
 }

src/main/java/com/springboot/demo1/entity/Books.java

@@ -9,13 +9,16 @@ import javax.persistence.*;
 @Data
 public class Books {
 
+    //书籍ID
     @Id
     @GeneratedValue(strategy= GenerationType.AUTO)
     private Integer bookId;
 
+    //书名
     @Column(nullable = false, unique = true)
     private String bookName;
 
+    //借阅状态 ==0表示书籍未被借阅 ==1表示书籍已被借阅
     @Column(nullable = false)
     private Integer bookState;
 

src/main/java/com/springboot/demo1/entity/BorrowInfo.java

@@ -8,16 +8,20 @@ import javax.persistence.*;
 @Data
 public class BorrowInfo {
 
+    //借阅信息ID
     @Id
     @GeneratedValue(strategy= GenerationType.AUTO)
     private Integer borrowId;
 
+    //用户ID
     @Column(nullable = false)
     private Integer userId;
 
+    //书籍ID
     @Column(nullable = false)
     private Integer bookId;
 
+    //借阅状态 ==1表示借书 ==0表示还书
     @Column(nullable = false)
     private Integer type;
 

src/main/java/com/springboot/demo1/service/BooksService.java

@@ -14,8 +14,31 @@ public class BooksService implements BooksServiceImpl {
     @Autowired
     private BooksRepository booksRepository;
 
-    public List<Books> getBooksList(){
+    public List<Books> getBooksList() {
         return booksRepository.findAll();
     }
 
+    public Books getBookById(Integer bookId) {
+        return booksRepository.findBooksByBookId(bookId);
+    }
+
+
+    public String addBook(String bookName) {
+        Integer numByBookName = booksRepository.countBooksByBookName(bookName);
+        if(numByBookName > 0) {
+            return "该书籍已经存在";
+        } else {
+            Books books = new Books();
+            books.setBookName(bookName);
+            books.setBookState(0);  //bookState为0表示书籍未被借出
+            booksRepository.save(books);
+            return "书籍上传成功";
+        }
+    }
+
+    public String deleteBook(Integer bookId) {
+        booksRepository.deleteById(bookId);
+        return "书籍删除成功";
+    }
+
 }

src/main/java/com/springboot/demo1/service/UserService.java

@@ -18,5 +18,22 @@ public class UserService implements UserServiceImpl {
         return userRepository.findAll();
     }
 
+    public User getUserByUserId(Integer userId) {
+        return userRepository.getUserByUserId(userId);
+    }
+
+    public String addUser(User user) {
+        Integer numByEmail = userRepository.countUserByEmail(user.getEmail());
+        Integer numByUserName = userRepository.countUserByUserName(user.getUserName());
+        if(numByEmail > 0) {
+            return "该邮箱已被使用";
+        } else if(numByUserName > 0) {
+            return "该用户名已被使用";
+        } else {
+            userRepository.save(user);
+        }
+        return "新建用户成功";
+    }
+
 
 }

src/main/java/com/springboot/demo1/service/impl/BooksServiceImpl.java

@@ -8,4 +8,10 @@ public interface BooksServiceImpl {
 
     public List<Books> getBooksList();
 
+    public Books getBookById(Integer bookId);
+
+    public String addBook(String bookName);
+
+    public String deleteBook(Integer bookId);
+
 }

src/main/java/com/springboot/demo1/service/impl/UserServiceImpl.java

@@ -8,5 +8,7 @@ public interface UserServiceImpl {
 
     public List<User> getUserList();
 
+    public User getUserByUserId(Integer userId);
 
+    public String addUser(User user);
 }