|
...
|
...
|
@@ -28,6 +28,7 @@ import io.swagger.annotations.ApiOperation; |
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
import org.springframework.security.core.context.SecurityContextHolder;
|
|
|
|
import org.springframework.security.core.userdetails.UserDetails;
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
...
|
...
|
@@ -42,6 +43,7 @@ import javax.servlet.http.HttpServletResponse; |
|
|
|
import javax.servlet.http.HttpSession;
|
|
|
|
import java.awt.image.BufferedImage;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Properties;
|
|
...
|
...
|
@@ -68,13 +70,15 @@ public class UserController { |
|
|
|
@GetMapping("/list")
|
|
|
|
public ResultJson<PageInfo> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
|
|
|
|
int pageNum,
|
|
|
|
@RequestParam(value = "pageSize",required = false,defaultValue = "5")
|
|
|
|
@RequestParam(value = "pageSize",required = false,defaultValue = "5")
|
|
|
|
int pageSize,
|
|
|
|
@RequestParam(value = "userName",required = false) String username,
|
|
|
|
@RequestParam(value = "realName",required = false) String realname)
|
|
|
|
@RequestParam(value = "userName",required = false) String username,
|
|
|
|
@RequestParam(value = "realName",required = false) String realname,
|
|
|
|
@RequestParam(value = "updatetime", required = false)
|
|
|
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date updatetime)
|
|
|
|
{
|
|
|
|
|
|
|
|
PageInfo<KakoUser> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username, realname);
|
|
|
|
PageInfo<KakoUser> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username, realname, updatetime);
|
|
|
|
return new ResultJson("200","success",usersPageInfo);
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|