From 0cf66b34fb2aa0488a5a1b8155cacdb781824220 Mon Sep 17 00:00:00 2001 From: Romesum Date: Wed, 6 May 2020 13:39:58 +0800 Subject: [PATCH] =?UTF-8?q?[fix][M]:Bean=E7=B1=BB=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/{Lab.java => LabBean.java} | 2 +- .../{LabRecord.java => LabRecordBean.java} | 2 +- .../bean/{LabTime.java => LabTimeBean.java} | 2 +- .../bean/{User.java => UserBean.java} | 2 +- .../{UserCourse.java => UserCourseBean.java} | 2 +- .../controller/UserController.java | 18 +++++++----------- .../repository/UserRepository.java | 8 ++++---- .../hzu/bookingsystem/service/UserService.java | 12 ++++++------ .../service/impl/UserServiceImpl.java | 12 ++++++------ .../hzu/bookingsystem/utils/CookieUtil.java | 5 ----- .../BookingsystemApplicationTests.java | 12 ++++-------- 11 files changed, 32 insertions(+), 45 deletions(-) rename java/src/main/java/com/hzu/bookingsystem/bean/{Lab.java => LabBean.java} (96%) rename java/src/main/java/com/hzu/bookingsystem/bean/{LabRecord.java => LabRecordBean.java} (95%) rename java/src/main/java/com/hzu/bookingsystem/bean/{LabTime.java => LabTimeBean.java} (96%) rename java/src/main/java/com/hzu/bookingsystem/bean/{User.java => UserBean.java} (96%) rename java/src/main/java/com/hzu/bookingsystem/bean/{UserCourse.java => UserCourseBean.java} (96%) diff --git a/java/src/main/java/com/hzu/bookingsystem/bean/Lab.java b/java/src/main/java/com/hzu/bookingsystem/bean/LabBean.java similarity index 96% rename from java/src/main/java/com/hzu/bookingsystem/bean/Lab.java rename to java/src/main/java/com/hzu/bookingsystem/bean/LabBean.java index 5b15ed7..6aaab74 100644 --- a/java/src/main/java/com/hzu/bookingsystem/bean/Lab.java +++ b/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; diff --git a/java/src/main/java/com/hzu/bookingsystem/bean/LabRecord.java b/java/src/main/java/com/hzu/bookingsystem/bean/LabRecordBean.java similarity index 95% rename from java/src/main/java/com/hzu/bookingsystem/bean/LabRecord.java rename to java/src/main/java/com/hzu/bookingsystem/bean/LabRecordBean.java index 1cd1a9d..cd7d8ee 100644 --- a/java/src/main/java/com/hzu/bookingsystem/bean/LabRecord.java +++ b/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; diff --git a/java/src/main/java/com/hzu/bookingsystem/bean/LabTime.java b/java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java similarity index 96% rename from java/src/main/java/com/hzu/bookingsystem/bean/LabTime.java rename to java/src/main/java/com/hzu/bookingsystem/bean/LabTimeBean.java index d76bdfb..b01f60e 100644 --- a/java/src/main/java/com/hzu/bookingsystem/bean/LabTime.java +++ b/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; diff --git a/java/src/main/java/com/hzu/bookingsystem/bean/User.java b/java/src/main/java/com/hzu/bookingsystem/bean/UserBean.java similarity index 96% rename from java/src/main/java/com/hzu/bookingsystem/bean/User.java rename to java/src/main/java/com/hzu/bookingsystem/bean/UserBean.java index a972d27..19ec800 100644 --- a/java/src/main/java/com/hzu/bookingsystem/bean/User.java +++ b/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) diff --git a/java/src/main/java/com/hzu/bookingsystem/bean/UserCourse.java b/java/src/main/java/com/hzu/bookingsystem/bean/UserCourseBean.java similarity index 96% rename from java/src/main/java/com/hzu/bookingsystem/bean/UserCourse.java rename to java/src/main/java/com/hzu/bookingsystem/bean/UserCourseBean.java index 8f026ec..26a57f3 100644 --- a/java/src/main/java/com/hzu/bookingsystem/bean/UserCourse.java +++ b/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; diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java b/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java index 735e28a..668d24e 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java +++ b/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> findById(@RequestParam("uId") Integer uId) { - User user = userService.findById(uId); + public ResultVO> 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){ diff --git a/java/src/main/java/com/hzu/bookingsystem/repository/UserRepository.java b/java/src/main/java/com/hzu/bookingsystem/repository/UserRepository.java index bdbc3bd..42fe31c 100644 --- a/java/src/main/java/com/hzu/bookingsystem/repository/UserRepository.java +++ b/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 findByUId(Integer uId); +public interface UserRepository extends JpaRepository { + UserBean findByUId(Integer uId); void deleteByUId(Integer uId); - User findByUsernameAndPassword(String username,String password); + UserBean findByUsernameAndPassword(String username, String password); } diff --git a/java/src/main/java/com/hzu/bookingsystem/service/UserService.java b/java/src/main/java/com/hzu/bookingsystem/service/UserService.java index ff7bf09..84e5fa7 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/UserService.java +++ b/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 findAll(); + List 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); } diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java index 2c20f32..58fb3dc 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java +++ b/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 findAll() { + public List 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); } } diff --git a/java/src/main/java/com/hzu/bookingsystem/utils/CookieUtil.java b/java/src/main/java/com/hzu/bookingsystem/utils/CookieUtil.java index b0d7e47..ff6eec2 100644 --- a/java/src/main/java/com/hzu/bookingsystem/utils/CookieUtil.java +++ b/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; diff --git a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java b/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java index b500bc6..73ea293 100644 --- a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java +++ b/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); } }