diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/UserController.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/UserController.java index 0b4abe7..e6d642e 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/UserController.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/UserController.java @@ -42,8 +42,8 @@ public class UserController { } @RequestMapping("findUserByUserName") - public RequestResult findUserByUserName(String userName){ - return RequestResult.success(userService.findUserByUserName(userName)); + public RequestResult findUserByUserName(String userName, Integer current, Integer size){ + return RequestResult.success(userService.findUserByUserName(userName, current, size)); } @RequestMapping("insertUser") diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/UserMapper.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/UserMapper.java index 8d6dfa1..2c4fae7 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/UserMapper.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/UserMapper.java @@ -14,11 +14,8 @@ public interface UserMapper extends BaseMapper { @SelectProvider(type = UserMapperProvider.class, method = "userLogin") User userLogin(String userAccountNumber, String userPassword); - @SelectProvider(type = UserMapperProvider.class, method = "findUserByUserAccountNumber") - List findUserByUserAccountNumber(String userAccountNumber); - @SelectProvider(type = UserMapperProvider.class, method = "findUserByUserName") - User findUserByUserName(String userName); + List findUserByUserName(String userName); @SelectProvider(type = UserMapperProvider.class, method = "findUserCount") Integer findUserCount(); diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/provider/UserMapperProvider.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/provider/UserMapperProvider.java index e773357..5251475 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/provider/UserMapperProvider.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/provider/UserMapperProvider.java @@ -6,12 +6,8 @@ public class UserMapperProvider { return "select * from user where user_account_number = #{userAccountNumber} and user_password = #{userPassword}"; } - public String findUserByUserAccountNumber(String userAccountNumber){ - return "select * from user where user_name like '%" + userAccountNumber.trim() + "%' limit 10"; - } - public String findUserByUserName(String userName){ - return "select * from user where user_name like CONCAT('%',#{userName},'%')"; + return "select * from user where user_name like '%" + userName.trim() + "%'"; } public String findUserCount(){ diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dao/UserPage.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dao/UserPage.java new file mode 100644 index 0000000..50015c4 --- /dev/null +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dao/UserPage.java @@ -0,0 +1,13 @@ +package com.userinformation.backend.model.dao; + +import lombok.Data; + +import java.util.List; + +@Data +public class UserPage { + private Long current; + private Long size; + private Long total; + private List records; +} diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java index a2c29db..6fca793 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java @@ -6,27 +6,50 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.userinformation.backend.mapper.UserMapper; import com.userinformation.backend.model.dao.User; +import com.userinformation.backend.model.dao.UserPage; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Objects; @Service public class UserService extends ServiceImpl { public User userLogin(String userAccountNumber, String userPassword){return baseMapper.userLogin(userAccountNumber, userPassword);} - public List findUserByUserAccountNumber(String userAccountNumber){return baseMapper.findUserByUserAccountNumber(userAccountNumber);} + public User findUserByUserAccountNumber(String userAccountNumber){return baseMapper.selectById(userAccountNumber);} - public User findUserByUserName(String userName){ - return baseMapper.findUserByUserName(userName); + public UserPage findUserByUserName(String userName, Integer current, Integer size){ + IPage page = new Page<>(current, size); + IPage users; + if (Objects.nonNull(userName) && !"".equals(userName)){ + users = baseMapper.selectPage(page, new QueryWrapper().like("user_name",userName)); + }else { + users = baseMapper.selectPage(page, new QueryWrapper().orderByDesc("user_registration_date")); + } + + UserPage userPage = new UserPage(); + userPage.setCurrent(users.getCurrent()); + userPage.setSize(users.getSize()); + userPage.setTotal(users.getTotal()); + userPage.setRecords(users.getRecords()); + return userPage; } public Integer findUserCount(){ return baseMapper.findUserCount(); } - public List findAllUserPage(Integer current, Integer size){ + public UserPage findAllUserPage(Integer current, Integer size){ IPage page = new Page<>(current, size); - return baseMapper.selectPage(page, new QueryWrapper().orderByDesc("user_registration_date")).getRecords(); + IPage users = baseMapper.selectPage(page, new QueryWrapper().orderByDesc("user_registration_date")); + UserPage userPage = new UserPage(); + userPage.setCurrent(users.getCurrent()); + userPage.setSize(users.getSize()); + userPage.setTotal(users.getTotal()); + userPage.setRecords(users.getRecords()); + return userPage; } public int insertUser(User user){ diff --git a/04.系统编码/Frontend/.idea/workspace.xml b/04.系统编码/Frontend/.idea/workspace.xml index 9d948b5..36f7437 100644 --- a/04.系统编码/Frontend/.idea/workspace.xml +++ b/04.系统编码/Frontend/.idea/workspace.xml @@ -3,8 +3,8 @@ - +