傅行帆 6 years ago
parent
commit
9fba842e8c

+ 6
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java View File

@@ -48,7 +48,9 @@ public class MessageController {
48 48
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
49 49
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
50 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 54
 		ResponseBean responseBean = new ResponseBean();
53 55
 		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS);
54 56
 		responseBean.addSuccess(newsList);
@@ -60,7 +62,9 @@ public class MessageController {
60 62
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
61 63
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
62 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 68
 		ResponseBean responseBean = new ResponseBean();
65 69
 		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING);
66 70
 		responseBean.addSuccess(upcomingList);

+ 6
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java View File

@@ -55,7 +55,9 @@ public class SocialController {
55 55
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
56 56
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
57 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 61
         ResponseBean responseBean = new ResponseBean();
60 62
         List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId,title,pageNum,pageSize);
61 63
         responseBean.addSuccess(announcementList);
@@ -82,7 +84,9 @@ public class SocialController {
82 84
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
83 85
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
84 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 90
         ResponseBean responseBean = new ResponseBean();
87 91
         List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
88 92
         responseBean.addSuccess(activityList);

+ 0
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java View File

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

+ 0
- 4
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java View File

@@ -69,8 +69,6 @@ public class SocialServiceImpl implements SocialServiceI {
69 69
      */
70 70
     @Override
71 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 73
         PageHelper.startPage(pageNum, pageSize);
76 74
         // 获取数据
@@ -100,8 +98,6 @@ public class SocialServiceImpl implements SocialServiceI {
100 98
      */
101 99
     @Override
102 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 102
         PageHelper.startPage(pageNum, pageSize);
107 103
         // 获取数据