[fix][M]:Bean类重命名

java/src/main/java/com/hzu/bookingsystem/bean/LabBean.java

@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "tb_lab")
-public class Lab {
+public class LabBean {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
     private Integer labId;

java/src/main/java/com/hzu/bookingsystem/bean/LabRecordBean.java

@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "tb_lab_record")
-public class LabRecord {
+public class LabRecordBean {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
     private Integer lrId;

java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java

@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "tb_lab_time")
-public class LabTime {
+public class LabTimeBean {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
     private Integer ltId;

java/src/main/java/com/hzu/bookingsystem/bean/UserBean.java

@@ -14,7 +14,7 @@ import javax.persistence.*;
 @AllArgsConstructor
 @Entity
 @Table(name = "tb_user")
-public class User {
+public class UserBean {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

java/src/main/java/com/hzu/bookingsystem/bean/UserCourseBean.java

@@ -10,7 +10,7 @@ import javax.persistence.*;
 @Data
 @Entity
 @Table(name = "tb_user_course")
-public class UserCourse {
+public class UserCourseBean {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
     private Integer ucId;

java/src/main/java/com/hzu/bookingsystem/controller/UserController.java

@@ -1,22 +1,18 @@
 package com.hzu.bookingsystem.controller;
 
 import com.hzu.bookingsystem.VO.ResultVO;
-import com.hzu.bookingsystem.bean.User;
+import com.hzu.bookingsystem.bean.UserBean;
 import com.hzu.bookingsystem.service.UserService;
 import com.hzu.bookingsystem.utils.CookieUtil;
 import com.hzu.bookingsystem.utils.ResultVOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -32,11 +28,11 @@ public class UserController {
 
     // 登录
     @PostMapping("/login")
-    public ResultVO login(@RequestBody User user,
+    public ResultVO login(@RequestBody UserBean user,
                               HttpServletResponse response) {
         System.out.println(user);
         //1. openid去和数据库里的数据匹配
-        User user1 = userService.findByUnameAndPwd(user.getUsername(),user.getPassword());
+        UserBean user1 = userService.findByUnameAndPwd(user.getUsername(),user.getPassword());
         System.out.println(user1);
         if (user1 == null) {
             return ResultVOUtil.error(-2,"账号或密码不正确");
@@ -71,15 +67,15 @@ public class UserController {
 
     //创建用户
     @PostMapping(value = "/addUser", consumes = "application/json")
-    public ResultVO addUser(@RequestBody User user) {
+    public ResultVO addUser(@RequestBody UserBean user) {
         userService.add(user);
         return ResultVOUtil.success();
     }
 
     //查找用户详情
     @GetMapping(value = "/findById")
-    public ResultVO<Map<String, User>> findById(@RequestParam("uId") Integer uId) {
-        User user = userService.findById(uId);
+    public ResultVO<Map<String, UserBean>> findById(@RequestParam("uId") Integer uId) {
+        UserBean user = userService.findById(uId);
         return ResultVOUtil.success(user);
     }
 
@@ -90,7 +86,7 @@ public class UserController {
      * @return
      */
     @PostMapping(value = "/updateBySelf", consumes = "application/json")
-    public ResultVO updateBySelf(@RequestBody User user,
+    public ResultVO updateBySelf(@RequestBody UserBean user,
                                  HttpServletRequest request){
         Integer uId = getUIdByCookie(request);
         if (uId == null){

java/src/main/java/com/hzu/bookingsystem/repository/UserRepository.java

@@ -1,15 +1,15 @@
 package com.hzu.bookingsystem.repository;
 
 
-import com.hzu.bookingsystem.bean.User;
+import com.hzu.bookingsystem.bean.UserBean;
 import org.springframework.data.jpa.repository.JpaRepository;
 /**
  * author 吴志岳
  */
-public interface UserRepository extends JpaRepository<User,String> {
-    User findByUId(Integer uId);
+public interface UserRepository extends JpaRepository<UserBean,String> {
+    UserBean findByUId(Integer uId);
 
     void deleteByUId(Integer uId);
 
-    User findByUsernameAndPassword(String username,String password);
+    UserBean findByUsernameAndPassword(String username, String password);
 }

java/src/main/java/com/hzu/bookingsystem/service/UserService.java

@@ -1,7 +1,7 @@
 package com.hzu.bookingsystem.service;
 
 
-import com.hzu.bookingsystem.bean.User;
+import com.hzu.bookingsystem.bean.UserBean;
 
 import java.util.List;
 /**
@@ -15,10 +15,10 @@ public interface UserService {
      * @param user
      * @return
      */
-    User add(User user);
+    UserBean add(UserBean user);
 
     // 查找所有用户
-    List<User> findAll();
+    List<UserBean> findAll();
 
     /**
      * 通过u_id查找用户
@@ -26,7 +26,7 @@ public interface UserService {
      * @param uId
      * @return
      */
-    User findById(Integer uId);
+    UserBean findById(Integer uId);
 
     /**
      * 修改用户
@@ -34,7 +34,7 @@ public interface UserService {
      * @param user
      * @return
      */
-    User update(User user);
+    UserBean update(UserBean user);
 
     /**
      * 通过u_id删除用户
@@ -50,5 +50,5 @@ public interface UserService {
      * @param password
      * @return
      */
-    User findByUnameAndPwd(String username, String password);
+    UserBean findByUnameAndPwd(String username, String password);
 }

java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hzu.bookingsystem.service.impl;
 
-import com.hzu.bookingsystem.bean.User;
+import com.hzu.bookingsystem.bean.UserBean;
 import com.hzu.bookingsystem.repository.UserRepository;
 import com.hzu.bookingsystem.service.UserService;
 import org.springframework.stereotype.Service;
@@ -17,23 +17,23 @@ public class UserServiceImpl implements UserService {
     private UserRepository userRepository;
 
     @Override
-    public User add(User user) {
+    public UserBean add(UserBean user) {
         user.setUId(null);
         return userRepository.save(user);
     }
 
     @Override
-    public List<User> findAll() {
+    public List<UserBean> findAll() {
         return userRepository.findAll();
     }
 
     @Override
-    public User findById(Integer uId) {
+    public UserBean findById(Integer uId) {
         return userRepository.findByUId(uId);
     }
 
     @Override
-    public User update(User user) {
+    public UserBean update(UserBean user) {
         return userRepository.save(user);
     }
 
@@ -44,7 +44,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public User findByUnameAndPwd(String username, String password) {
+    public UserBean findByUnameAndPwd(String username, String password) {
         return userRepository.findByUsernameAndPassword(username,password);
     }
 }

java/src/main/java/com/hzu/bookingsystem/utils/CookieUtil.java

@@ -1,10 +1,5 @@
 package com.hzu.bookingsystem.utils;
 
-import com.alibaba.druid.util.StringUtils;
-import com.hzu.bookingsystem.bean.User;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java

@@ -1,14 +1,11 @@
 package com.hzu.bookingsystem;
 
-import com.hzu.bookingsystem.bean.User;
+import com.hzu.bookingsystem.bean.UserBean;
 import com.hzu.bookingsystem.service.UserService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.Resource;
-import javax.transaction.Transactional;
-
 @SpringBootTest
 class BookingsystemApplicationTests {
 
@@ -21,16 +18,15 @@ class BookingsystemApplicationTests {
     @Test
 
     public void test(){
-        User user = new User();
-        user.setUId(1);
+        UserBean user = new UserBean();
         user.setUsername("123456");
         user.setNickname("吴志岳");
         user.setEmail("274129947@qq.com");
         user.setPassword("123456123weqwe");
         user.setOffice("5#101qwe");
 //        System.out.println(userService.findAll());
-//        userService.create(user);
+        userService.add(user);
 //        userService.save(user);
-        userService.deleteById(1);
+//        userService.deleteById(1);
     }
 }