Update Search footer header index user
This commit is contained in:
@@ -6,6 +6,7 @@ import com.yaoyuan.jiscuss.entity.User;
|
||||
import com.yaoyuan.jiscuss.entity.UserInfo;
|
||||
import com.yaoyuan.jiscuss.entity.custom.DiscussionCustom;
|
||||
import com.yaoyuan.jiscuss.entity.custom.TagCustom;
|
||||
import com.yaoyuan.jiscuss.repository.DiscussionsRepository;
|
||||
import com.yaoyuan.jiscuss.service.IDiscussionsService;
|
||||
import com.yaoyuan.jiscuss.service.ITagsService;
|
||||
import com.yaoyuan.jiscuss.service.IUsersService;
|
||||
@@ -54,6 +55,9 @@ public class UserSystemController extends BaseController {
|
||||
@Autowired
|
||||
private BCryptPasswordEncoder passwordEncoder;
|
||||
|
||||
@Autowired
|
||||
private DiscussionsRepository discussionsRepository;
|
||||
|
||||
/**
|
||||
* 首页index
|
||||
* @param tag
|
||||
@@ -276,6 +280,36 @@ public class UserSystemController extends BaseController {
|
||||
return "register";
|
||||
}
|
||||
|
||||
/**
|
||||
* 搜索页
|
||||
*/
|
||||
@GetMapping("/search")
|
||||
public String search(@RequestParam(defaultValue = "") String q,
|
||||
@RequestParam(defaultValue = "1") Integer pageNum,
|
||||
HttpServletRequest request, ModelMap map) {
|
||||
String keyword = q.trim();
|
||||
int pageSize = 10;
|
||||
int page = Math.max(pageNum - 1, 0);
|
||||
Page<Discussion> resultPage = keyword.isEmpty()
|
||||
? Page.empty()
|
||||
: discussionsRepository.searchByKeyword(keyword,
|
||||
org.springframework.data.domain.PageRequest.of(page, pageSize));
|
||||
|
||||
List<DiscussionCustom> results = new ArrayList<>();
|
||||
if (!keyword.isEmpty()) {
|
||||
setTagAndUserList(results, resultPage.getContent());
|
||||
}
|
||||
|
||||
map.put("q", keyword);
|
||||
map.put("results", results);
|
||||
map.put("totalPages", resultPage.getTotalPages());
|
||||
map.put("totalElements", resultPage.getTotalElements());
|
||||
map.put("pageNum", pageNum);
|
||||
UserInfo user = getUserInfo(request);
|
||||
if (user != null) map.put("username", user.getUsername());
|
||||
return "search";
|
||||
}
|
||||
|
||||
//获取设置信息
|
||||
|
||||
//获取首页统计
|
||||
|
||||
Reference in New Issue
Block a user