From 7cb53b48d37bcc6f491e4de1513bf92b99ca2e5a Mon Sep 17 00:00:00 2001 From: markma <750975972@qq.com> Date: Mon, 21 Mar 2022 23:24:27 +0800 Subject: [PATCH] =?UTF-8?q?12=20=E5=90=8E=E7=AB=AF=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommentHandler.java | 5 +++ .../controller/OutDetailHandler.java | 7 ++++ .../controller/UserDetailHandler.java | 35 +++++++++++++++++-- .../entity/UserAllDetail.java | 21 +++++++++++ 4 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/markma/leave_manager_spb/entity/UserAllDetail.java diff --git a/src/main/java/com/markma/leave_manager_spb/controller/CommentHandler.java b/src/main/java/com/markma/leave_manager_spb/controller/CommentHandler.java index f0f7304..b8a0167 100644 --- a/src/main/java/com/markma/leave_manager_spb/controller/CommentHandler.java +++ b/src/main/java/com/markma/leave_manager_spb/controller/CommentHandler.java @@ -15,6 +15,11 @@ public class CommentHandler { @Autowired private CommentRepository commentRepository; + @GetMapping("/findAll") + public List findAll() { + return commentRepository.findAll(); + } + @GetMapping("/findAllPaged/{page}/{size}") public List findAllPaged(@PathVariable("page") int page, @PathVariable("size") int size) { List Cs = commentRepository.findAll(); diff --git a/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java b/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java index da8824a..b3573de 100644 --- a/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java +++ b/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java @@ -36,6 +36,7 @@ public class OutDetailHandler { return outDetailRepository.findAll(); } + @GetMapping("findAndReturnOLDs/{page}/{size}") public List findAndReturnOLD(@PathVariable("page") int page, @PathVariable("size") int size) { List result = outDetailRepository.findAll(); @@ -98,6 +99,12 @@ public class OutDetailHandler { return OLDs; } + @GetMapping("/findAllOLDs") + public List findAllOLDs() { + Integer OLD_num = outDetailRepository.findAll().size(); + return findAndReturnOLD(1, OLD_num); + } + @GetMapping("findAndReturnOLDsNum/{page}/{size}") public Integer findAndReturnOLDsNum(@PathVariable("page") int page, @PathVariable("size") int size) { List result = outDetailRepository.findAll(); diff --git a/src/main/java/com/markma/leave_manager_spb/controller/UserDetailHandler.java b/src/main/java/com/markma/leave_manager_spb/controller/UserDetailHandler.java index b4f0cb2..d5c407b 100644 --- a/src/main/java/com/markma/leave_manager_spb/controller/UserDetailHandler.java +++ b/src/main/java/com/markma/leave_manager_spb/controller/UserDetailHandler.java @@ -1,10 +1,17 @@ package com.markma.leave_manager_spb.controller; -import com.markma.leave_manager_spb.repository.UserDetailRepository; +import com.markma.leave_manager_spb.entity.User; +import com.markma.leave_manager_spb.entity.UserAllDetail; import com.markma.leave_manager_spb.entity.UserDetail; +import com.markma.leave_manager_spb.repository.UserDetailRepository; +import com.markma.leave_manager_spb.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; @RestController @@ -12,6 +19,8 @@ import java.util.List; public class UserDetailHandler { @Autowired private UserDetailRepository userDetailRepository; + @Autowired + private UserRepository userRepository; @GetMapping("/hello") public String hello() { @@ -22,10 +31,30 @@ public class UserDetailHandler { public List findAll() { return userDetailRepository.findAll(); } + @GetMapping("/findById/{id}") - public UserDetail findById(@PathVariable("id") Integer id){ + public UserDetail findById(@PathVariable("id") Integer id) { return userDetailRepository.findById(id).get(); } + @GetMapping("/findAllUser") + public List findAllUser() { + List UADs = new ArrayList(); + List UDs = userDetailRepository.findAll(); + List Users = userRepository.findAll(); + for (int i = 0; i < Users.size(); i++) { + UserAllDetail UAD = new UserAllDetail(); + UserDetail UD = UDs.get(i); + User user = Users.get(i); + UAD.setId(i + 1); + UAD.setUsername(user.getUsername()); + UAD.setPassword(user.getPassword()); + UAD.setType(user.getType()); + UAD.setName(UD.getName()); + UAD.setSchool_id(UD.getSchool_id()); + UADs.add(UAD); + } + return UADs; + } } diff --git a/src/main/java/com/markma/leave_manager_spb/entity/UserAllDetail.java b/src/main/java/com/markma/leave_manager_spb/entity/UserAllDetail.java new file mode 100644 index 0000000..8797333 --- /dev/null +++ b/src/main/java/com/markma/leave_manager_spb/entity/UserAllDetail.java @@ -0,0 +1,21 @@ +package com.markma.leave_manager_spb.entity; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +@Data +public class UserAllDetail { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + private String username; + private String password; + private String type; + private String school_id; + private String name; +}