傅行帆 6 年前
父节点
当前提交
9fba842e8c

+ 6
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java 查看文件

48
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
48
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
49
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
49
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
50
 	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
50
 	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
51
-	public ResponseBean getNews(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
51
+	public ResponseBean getNews(@PathVariable Integer communityId,
52
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
53
+	                            @RequestParam(value ="pageNum",defaultValue = "5") Integer pageSize){
52
 		ResponseBean responseBean = new ResponseBean();
54
 		ResponseBean responseBean = new ResponseBean();
53
 		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS);
55
 		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS);
54
 		responseBean.addSuccess(newsList);
56
 		responseBean.addSuccess(newsList);
60
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
62
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
61
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
63
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
62
 	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
64
 	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
63
-	public ResponseBean getUpcoming(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
65
+	public ResponseBean getUpcoming(@PathVariable Integer communityId,
66
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
67
+	                                @RequestParam(value ="pageNum",defaultValue = "5") Integer pageSize){
64
 		ResponseBean responseBean = new ResponseBean();
68
 		ResponseBean responseBean = new ResponseBean();
65
 		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING);
69
 		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING);
66
 		responseBean.addSuccess(upcomingList);
70
 		responseBean.addSuccess(upcomingList);

+ 6
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java 查看文件

55
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
55
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
56
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
56
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
57
     @RequestMapping(value = "/announcements/{communityId}",method = RequestMethod.GET)
57
     @RequestMapping(value = "/announcements/{communityId}",method = RequestMethod.GET)
58
-    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
58
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam String title,
59
+                                         @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
60
+                                         @RequestParam(value ="pageNum",defaultValue = "5") Integer pageSize){
59
         ResponseBean responseBean = new ResponseBean();
61
         ResponseBean responseBean = new ResponseBean();
60
         List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId,title,pageNum,pageSize);
62
         List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId,title,pageNum,pageSize);
61
         responseBean.addSuccess(announcementList);
63
         responseBean.addSuccess(announcementList);
82
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
84
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
83
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
85
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
84
     @RequestMapping(value = "/activitys/{communityId}",method = RequestMethod.GET)
86
     @RequestMapping(value = "/activitys/{communityId}",method = RequestMethod.GET)
85
-    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
87
+    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,
88
+                                     @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
89
+                                     @RequestParam(value ="pageNum",defaultValue = "5") Integer pageSize){
86
         ResponseBean responseBean = new ResponseBean();
90
         ResponseBean responseBean = new ResponseBean();
87
         List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
91
         List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
88
         responseBean.addSuccess(activityList);
92
         responseBean.addSuccess(activityList);

+ 0
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java 查看文件

44
 	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
44
 	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
45
 		//todo
45
 		//todo
46
 		Integer userId = 1;
46
 		Integer userId = 1;
47
-		pageNum = null == pageNum ? 1 : pageNum;
48
-		pageSize = null == pageSize ? 10 : pageSize;
49
 		//使用分页插件
47
 		//使用分页插件
50
 		PageHelper.startPage(pageNum, pageSize);
48
 		PageHelper.startPage(pageNum, pageSize);
51
 		// 获取数据
49
 		// 获取数据

+ 0
- 4
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java 查看文件

69
      */
69
      */
70
     @Override
70
     @Override
71
     public List<TpAnnouncement> getAnnouncements(Integer communityId,String title, Integer pageNum, Integer pageSize) {
71
     public List<TpAnnouncement> getAnnouncements(Integer communityId,String title, Integer pageNum, Integer pageSize) {
72
-        pageNum = null == pageNum ? 1 : pageNum;
73
-        pageSize = null == pageSize ? 10 : pageSize;
74
         //使用分页插件
72
         //使用分页插件
75
         PageHelper.startPage(pageNum, pageSize);
73
         PageHelper.startPage(pageNum, pageSize);
76
         // 获取数据
74
         // 获取数据
100
      */
98
      */
101
     @Override
99
     @Override
102
     public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
100
     public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
103
-        pageNum = null == pageNum ? 1 : pageNum;
104
-        pageSize = null == pageSize ? 10 : pageSize;
105
         //使用分页插件
101
         //使用分页插件
106
         PageHelper.startPage(pageNum, pageSize);
102
         PageHelper.startPage(pageNum, pageSize);
107
         // 获取数据
103
         // 获取数据