代码提交分页
This commit is contained in:
@@ -42,8 +42,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{
|
||||
"/css/**",
|
||||
"/js/**",
|
||||
"/images/**",
|
||||
"/static/**",
|
||||
"/index/**"
|
||||
"/static/**"
|
||||
);
|
||||
}
|
||||
/**
|
||||
@@ -69,7 +68,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{
|
||||
.loginProcessingUrl("/login") //登录POST请求路径
|
||||
.usernameParameter("username") //登录用户名参数
|
||||
.passwordParameter("password") //登录密码参数
|
||||
.defaultSuccessUrl("/main") //默认登录成功页面
|
||||
.defaultSuccessUrl("/index") //默认登录成功页面
|
||||
.and()
|
||||
.exceptionHandling()
|
||||
.accessDeniedHandler(customAccessDeniedHandler) //无权限处理器
|
||||
|
||||
@@ -5,7 +5,9 @@ import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.yaoyuan.jiscuss.entity.Posts;
|
||||
import com.yaoyuan.jiscuss.entity.UserInfo;
|
||||
import com.yaoyuan.jiscuss.service.IPostsService;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -39,8 +41,9 @@ public class UserPostController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private ITagsService tagsService;
|
||||
|
||||
|
||||
@Autowired
|
||||
private IPostsService postsService;
|
||||
|
||||
//首页查看主题列表(各种条件筛选,最热最新标签等)
|
||||
|
||||
@@ -92,6 +95,28 @@ public class UserPostController extends BaseController {
|
||||
//删除主题
|
||||
|
||||
//新建评论
|
||||
@PostMapping(value = "/newpost")
|
||||
@ResponseBody
|
||||
public String newPosts(@RequestBody Posts posts) {
|
||||
logger.info(">>> newpost"+posts);
|
||||
|
||||
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
|
||||
HttpServletRequest request = servletRequestAttributes.getRequest();
|
||||
|
||||
UserInfo user = getUserInfo(request);
|
||||
if(user != null){
|
||||
posts.setCreate_id( user.getId());
|
||||
}
|
||||
posts.setCreate_time(new Date());
|
||||
|
||||
Posts savePost = postsService.insert(posts);
|
||||
JSONObject resultobj = new JSONObject();
|
||||
|
||||
logger.info(">>>{}",savePost );
|
||||
resultobj.put("msg", "添加成功");
|
||||
resultobj.put("flag", true);
|
||||
return resultobj.toString(); //
|
||||
}
|
||||
|
||||
//删除评论
|
||||
|
||||
|
||||
@@ -39,17 +39,23 @@ public class UserSystemController extends BaseController {
|
||||
private ITagsService tagsService;
|
||||
|
||||
//首页
|
||||
@RequestMapping("/")
|
||||
public String home(HttpServletRequest request, ModelMap map) {
|
||||
@RequestMapping({"/","/main","/index"})
|
||||
public String home(@RequestParam(defaultValue = "all") String tag, @RequestParam(defaultValue = "all") String type,@RequestParam(defaultValue = "1") Integer
|
||||
pageNum, HttpServletRequest request, ModelMap map) {
|
||||
logger.info(">>> index");
|
||||
logger.info(">>> tag:" + tag);
|
||||
logger.info(">>> pageNum:" + pageNum);
|
||||
List<Users> userall = usersService.getAllList();
|
||||
logger.info(">>> 第一遍的全部用户:"+userall);
|
||||
|
||||
List<Users> useral2 = usersService.getAllList();
|
||||
logger.info(">>> 第二遍的全部用户:"+useral2);
|
||||
|
||||
int pageSiz = 5;
|
||||
int pageNumNew = pageNum - 1;
|
||||
|
||||
//分页获取主题帖子
|
||||
Page<Discussions> allDiscussionsPage = discussionsService.queryAllDiscussionsList(0,20);
|
||||
Page<Discussions> allDiscussionsPage = discussionsService.queryAllDiscussionsList(pageNumNew,pageSiz);
|
||||
|
||||
List<Discussions> allDiscussions =allDiscussionsPage.getContent();
|
||||
|
||||
@@ -67,6 +73,10 @@ public class UserSystemController extends BaseController {
|
||||
map.put("allDiscussions", allDiscussions);
|
||||
map.put("pageDiscussions", pageNumList);
|
||||
map.put("allTags", allTags);
|
||||
|
||||
map.put("tag", tag);
|
||||
map.put("pageNum", pageNum);
|
||||
map.put("pageNumAll", pageNumList.size());
|
||||
UserInfo user = getUserInfo(request);
|
||||
if(user != null){
|
||||
map.put("username", user.getUsername());
|
||||
@@ -76,52 +86,43 @@ public class UserSystemController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
//首页main
|
||||
@RequestMapping("/main")
|
||||
public String homePage(HttpServletRequest request, ModelMap map) {
|
||||
logger.info(">>> index");
|
||||
|
||||
//分页获取主题帖子
|
||||
Page<Discussions> allDiscussionsPage = discussionsService.queryAllDiscussionsList(0,20);
|
||||
|
||||
List<Discussions> allDiscussions =allDiscussionsPage.getContent();
|
||||
|
||||
logger.info("全部主题==>:{}",allDiscussions);
|
||||
|
||||
//获取主题帖子的分页数据
|
||||
List<String> pageNumList = getPageNumList(allDiscussionsPage.getTotalPages());
|
||||
|
||||
//获取所有标签(以后尝试去缓存中取)
|
||||
List<Tags> allTags = tagsService.getAllList();
|
||||
logger.info("全部标签==>:{}",allTags);
|
||||
|
||||
map.put("data", "Jiscuss 用户");
|
||||
map.put("allDiscussions", allDiscussions);
|
||||
map.put("pageDiscussions", pageNumList);
|
||||
map.put("allTags", allTags);
|
||||
UserInfo user = getUserInfo(request);
|
||||
if(user != null){
|
||||
map.put("username", user.getUsername());
|
||||
map.put("data", "Jiscuss 用户:" + user.getUsername());
|
||||
}
|
||||
return "index";
|
||||
}
|
||||
// //首页main
|
||||
// @RequestMapping("/main")
|
||||
// public String homePage(HttpServletRequest request, ModelMap map) {
|
||||
// logger.info(">>> index");
|
||||
//
|
||||
// //分页获取主题帖子
|
||||
// Page<Discussions> allDiscussionsPage = discussionsService.queryAllDiscussionsList(0,20);
|
||||
//
|
||||
// List<Discussions> allDiscussions =allDiscussionsPage.getContent();
|
||||
//
|
||||
// logger.info("全部主题==>:{}",allDiscussions);
|
||||
//
|
||||
// //获取主题帖子的分页数据
|
||||
// List<String> pageNumList = getPageNumList(allDiscussionsPage.getTotalPages());
|
||||
//
|
||||
// //获取所有标签(以后尝试去缓存中取)
|
||||
// List<Tags> allTags = tagsService.getAllList();
|
||||
// logger.info("全部标签==>:{}",allTags);
|
||||
//
|
||||
// map.put("data", "Jiscuss 用户");
|
||||
// map.put("allDiscussions", allDiscussions);
|
||||
// map.put("pageDiscussions", pageNumList);
|
||||
// map.put("allTags", allTags);
|
||||
// UserInfo user = getUserInfo(request);
|
||||
// if(user != null){
|
||||
// map.put("username", user.getUsername());
|
||||
// map.put("data", "Jiscuss 用户:" + user.getUsername());
|
||||
// }
|
||||
// return "index";
|
||||
// }
|
||||
|
||||
|
||||
private List<String> getPageNumList(int size) {
|
||||
List<String> pageNumList = new ArrayList<String>();
|
||||
if(size>5) {
|
||||
pageNumList.add("1");
|
||||
pageNumList.add("2");
|
||||
pageNumList.add("...");
|
||||
pageNumList.add(""+(size-1));
|
||||
pageNumList.add(""+(size));
|
||||
|
||||
}else {
|
||||
for(int i = 0;i<size;i++) {
|
||||
pageNumList.add(""+(i+1));
|
||||
}
|
||||
}
|
||||
for(int i = 0;i<size;i++) {
|
||||
pageNumList.add(""+(i+1));
|
||||
}
|
||||
return pageNumList;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import com.yaoyuan.jiscuss.entity.Posts;
|
||||
import com.yaoyuan.jiscuss.repository.PostsRepository;
|
||||
import com.yaoyuan.jiscuss.service.IPostsService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.transaction.Transactional;
|
||||
|
||||
|
||||
@Service
|
||||
@Transactional
|
||||
public class PostsServiceImpl implements IPostsService {
|
||||
@Autowired
|
||||
private PostsRepository postsRepository;
|
||||
|
||||
Reference in New Issue
Block a user