Compare commits
2 Commits
2b34113ab2
...
2049f5f87d
| Author | SHA1 | Date | |
|---|---|---|---|
| 2049f5f87d | |||
| 5b83c56f58 |
@ -33,18 +33,12 @@ public class NewsController {
|
|||||||
public ResponseEntity<GetNewsListResponse> getNewsByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) {
|
public ResponseEntity<GetNewsListResponse> getNewsByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) {
|
||||||
String username = JwtUtil.extractUsername(token);
|
String username = JwtUtil.extractUsername(token);
|
||||||
UserHS user = userService.getUserByUsername(username);
|
UserHS user = userService.getUserByUsername(username);
|
||||||
// TODO:完善用户权限
|
|
||||||
if (user.getSuperAdmin()) {
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (start >= end) {
|
if (start >= end) {
|
||||||
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
|
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
|
||||||
}
|
}
|
||||||
long newsCount = newsService.getNewsCount();
|
List<News> newsList = newsService.getNewsByRange(start, end, user);
|
||||||
return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsService.getNewsByRange(start, end, user)), HttpStatus.OK);
|
long newsCount = newsList.size();
|
||||||
|
return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsList), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/search")
|
@PostMapping("/search")
|
||||||
|
|||||||
@ -107,7 +107,7 @@ public class UserManagementController {
|
|||||||
@PostMapping("/delete")
|
@PostMapping("/delete")
|
||||||
@Transactional
|
@Transactional
|
||||||
public void delete(@RequestBody User user) {
|
public void delete(@RequestBody User user) {
|
||||||
UserHS userHS = userService.getUserByUsername(user.getName());
|
UserHS userHS = userService.getUserByUsername(user.getAccount());
|
||||||
if (userHS != null) {
|
if (userHS != null) {
|
||||||
//根据用户名删除用户
|
//根据用户名删除用户
|
||||||
userService.deleteUser(userHS.getUsername());
|
userService.deleteUser(userHS.getUsername());
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import java.util.List;
|
|||||||
public interface UserRepository extends JpaRepository<UserHS, Long> {
|
public interface UserRepository extends JpaRepository<UserHS, Long> {
|
||||||
UserHS findByUsername(String username);
|
UserHS findByUsername(String username);
|
||||||
|
|
||||||
boolean deleteByUsername(String username);
|
Integer deleteByUsername(String username);
|
||||||
|
|
||||||
List<UserHS> findByTenant(String tenant);
|
List<UserHS> findByTenant(String tenant);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -94,7 +94,7 @@ public class UserService {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean deleteUser(String username){
|
public Integer deleteUser(String username){
|
||||||
return userRepository.deleteByUsername(username);
|
return userRepository.deleteByUsername(username);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user