This commit is contained in:
2022-06-28 23:57:05 +08:00
committed by GitHub
parent d61e9e2351
commit f852c5c74b
@@ -48,7 +48,6 @@ public class UserSystemController extends BaseController {
/** /**
* 首页index * 首页index
*
* @param tag * @param tag
* @param type * @param type
* @param pageNum * @param pageNum
@@ -62,7 +61,6 @@ public class UserSystemController extends BaseController {
logger.info(">>> index"); logger.info(">>> index");
logger.info(">>> tag:" + tag); logger.info(">>> tag:" + tag);
logger.info(">>> pageNum:" + pageNum); logger.info(">>> pageNum:" + pageNum);
int pageSiz = 10; int pageSiz = 10;
int pageNumNew = pageNum - 1; int pageNumNew = pageNum - 1;
Discussion discussion = new Discussion(); Discussion discussion = new Discussion();
@@ -71,14 +69,12 @@ public class UserSystemController extends BaseController {
List<Discussion> allDiscussions = allDiscussionsPage.getContent(); List<Discussion> allDiscussions = allDiscussionsPage.getContent();
List<DiscussionCustom> newAllD = new ArrayList<>(); List<DiscussionCustom> newAllD = new ArrayList<>();
setTagAndUserList(newAllD, allDiscussions); setTagAndUserList(newAllD, allDiscussions);
logger.info("全部主题==>{}", allDiscussions); logger.info("全部主题==>{}", allDiscussions);
Long total = allDiscussionsPage.getTotalElements(); Long total = allDiscussionsPage.getTotalElements();
//获取主题帖子的分页数据 //获取主题帖子的分页数据(以后尝试去缓存中取)
List<String> pageNumList = getPageNumList(allDiscussionsPage.getTotalPages()); List<String> pageNumList = getPageNumList(allDiscussionsPage.getTotalPages());
//获取所有标签(以后尝试去缓存中取) //获取所有标签(以后尝试去缓存中取)
@@ -169,7 +165,7 @@ public class UserSystemController extends BaseController {
newdd.setRealnameLast(lastUser != null && lastUser.getRealname() != null ? lastUser.getRealname() : ""); newdd.setRealnameLast(lastUser != null && lastUser.getRealname() != null ? lastUser.getRealname() : "");
newdd.setUsernameLast(lastUser != null && lastUser.getUsername() != null ? lastUser.getUsername() : ""); newdd.setUsernameLast(lastUser != null && lastUser.getUsername() != null ? lastUser.getUsername() : "");
} }
//组装tag // 组装tag
newdd.setTagList(tagMap.get(dd.getId())); newdd.setTagList(tagMap.get(dd.getId()));
newAllD.add(newdd); newAllD.add(newdd);
} }
@@ -216,7 +212,6 @@ public class UserSystemController extends BaseController {
/** /**
* 注册提交 * 注册提交
*
* @param username * @param username
* @param email * @param email
* @param password * @param password
@@ -232,7 +227,6 @@ public class UserSystemController extends BaseController {
return "register"; return "register";
} else { } else {
User user = new User(); User user = new User();
user.setEmail(email); user.setEmail(email);
user.setPassword(password); user.setPassword(password);
user.setUsername(username); user.setUsername(username);
@@ -254,7 +248,6 @@ public class UserSystemController extends BaseController {
return "register"; return "register";
} }
//获取设置信息 //获取设置信息
//获取首页统计 //获取首页统计