|
@@ -48,12 +48,9 @@ public class IntegralController extends BaseController{
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = UrlConstants.API_MEDAL,method = RequestMethod.GET)
|
|
|
- public Page<MedalDTO> getIntegrals(@RequestParam(value = "userId")String userId,
|
|
|
+ public List<MedalDTO> getIntegrals(@RequestParam(value = "userId")Long userId,
|
|
|
+ @RequestParam(value = "keyword")String keyword,
|
|
|
HttpServletRequest request){
|
|
|
- Integer activePage = Integer.parseInt(request.getHeader("activePage"));
|
|
|
- Integer rowsOnPage = Integer.parseInt(request.getHeader("rowsOnPage"));
|
|
|
- Sort sort=new Sort(Sort.Direction.DESC,"createTime");
|
|
|
- Pageable pageable=new PageRequest(activePage-1, rowsOnPage,sort);
|
|
|
- return medalLogic.getMedals(userId,pageable);
|
|
|
+ return medalLogic.getMedals(keyword,userId);
|
|
|
}
|
|
|
}
|