傅行帆 6 gadus atpakaļ
vecāks
revīzija
0e6bb637c2

+ 8
- 4
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java Parādīt failu

@@ -36,7 +36,8 @@ public class MessageController {
36 36
 	private MessageServiceI messageService;
37 37
 	
38 38
 	@ApiOperation(value = "按小区获取消息总数", notes = "按小区获取个人消息总数")
39
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id") })
39
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
40
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
40 41
 	@RequestMapping(value = "/message/{communityId}/total",method = RequestMethod.GET)
41 42
 	public ResponseBean getMessageTotal(@PathVariable Integer communityId, HttpSession session){
42 43
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -50,7 +51,8 @@ public class MessageController {
50 51
 	@ApiOperation(value = "按小区获取分页消息", notes = "按小区获取分页消息")
51 52
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
52 53
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
53
-			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
54
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
55
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
54 56
 	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
55 57
 	public ResponseBean getNews(@PathVariable Integer communityId,
56 58
 	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
@@ -66,7 +68,8 @@ public class MessageController {
66 68
 	@ApiOperation(value = "按小区获取分页待办", notes = "按小区获取分页待办")
67 69
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
68 70
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
69
-			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
71
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
72
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
70 73
 	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
71 74
 	public ResponseBean getUpcoming(@PathVariable Integer communityId,
72 75
 	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
@@ -80,7 +83,8 @@ public class MessageController {
80 83
 	}
81 84
 
82 85
 	@ApiOperation(value = "消息已读接口", notes = "消息已读接口")
83
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id")})
86
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
87
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
84 88
 	@RequestMapping(value = "/readStatus/{communityId}",method = RequestMethod.POST)
85 89
 	public ResponseBean allMessageRead(@PathVariable("communityId") Integer communityId){
86 90
 		ResponseBean responseBean = new ResponseBean();

+ 18
- 11
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java Parādīt failu

@@ -36,7 +36,8 @@ public class SocialController {
36 36
     @RequestMapping(value = "/announcement/{communityId}", method = RequestMethod.GET)
37 37
     @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
38 38
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
39
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id")})
39
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id"),
40
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
40 41
     public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId") Integer communityId, @RequestParam("id") Integer id, HttpSession session) {
41 42
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
42 43
         Integer userId = userElement.getId();
@@ -48,10 +49,9 @@ public class SocialController {
48 49
 
49 50
     @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.GET)
50 51
     @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
51
-
52
-
53 52
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
54
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id")})
53
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
54
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
55 55
     public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
56 56
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
57 57
         Integer userId = userElement.getId();
@@ -104,7 +104,9 @@ public class SocialController {
104 104
 
105 105
     @ApiOperation(value = "论坛活动帖子详情", notes = "获取论坛活动帖子详情")
106 106
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
107
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id")})
107
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id"),
108
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
109
+    @RequestMapping(value = "/activity/{communityId}", method = RequestMethod.GET)
108 110
     public ResponseBean findActivityDetail(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
109 111
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
110 112
         Integer userId = userElement.getId();
@@ -116,7 +118,8 @@ public class SocialController {
116 118
 
117 119
     @ApiOperation(value = "二手租赁详情", notes = "二手租赁详情")
118 120
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
119
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id")})
121
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id"),
122
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
120 123
     @RequestMapping(value = "/secondHand/{communityId}", method = RequestMethod.GET)
121 124
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
122 125
         ResponseBean responseBean = new ResponseBean();
@@ -144,7 +147,8 @@ public class SocialController {
144 147
 
145 148
     @ApiOperation(value = "报修进度终止", notes = "报修进度终止")
146 149
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
147
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id")})
150
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id"),
151
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
148 152
     @RequestMapping(value = "/stopTicket/{communityId}", method = RequestMethod.GET)
149 153
     public ResponseBean stopTicket(@PathVariable("communityId") Integer communityId, @RequestParam("ticketId") Integer ticketId, HttpSession session) {
150 154
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -169,6 +173,7 @@ public class SocialController {
169 173
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "交易标题"),
170 174
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionContent", value = "交易内容"),
171 175
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "0:二手 1:求购  2:租赁"),
176
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
172 177
     })
173 178
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
174 179
     @ResponseBody
@@ -183,7 +188,8 @@ public class SocialController {
183 188
     @ApiOperation(value = "获取我发布所有二手租赁帖子", notes = "获取我发布所有二手租赁帖子")
184 189
     @ApiImplicitParams({
185 190
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
186
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
191
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
192
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
187 193
     })
188 194
     @RequestMapping(value = "/selectAllTransaction", method = RequestMethod.GET)
189 195
     public ResponseBean selectAllTransaction(HttpSession session,
@@ -198,12 +204,12 @@ public class SocialController {
198 204
 
199 205
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
200 206
     @ApiImplicitParams({
201
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "二手租赁帖子Id"),
202 207
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "小区标题"),
203 208
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "transactionContent", value = "交易内容"),
204 209
             @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "Type", value = "0 代表,1求购,2租赁"),
210
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
205 211
     })
206
-    @RequestMapping(value = "/upDateTransaction/{Id}", method = RequestMethod.PUT)
212
+    @RequestMapping(value = "/updateTransaction/{Id}", method = RequestMethod.PUT)
207 213
     public ResponseBean ubdateTransaction(HttpSession session, @PathVariable(value = "Id") Integer Id,
208 214
                                           @RequestParam(value = "transactionTitle") String transactionTitle,
209 215
                                           @RequestParam(value = "transactionContent") String transactionContent,
@@ -218,7 +224,8 @@ public class SocialController {
218 224
     @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
219 225
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
220 226
             @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
221
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id")})
227
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id"),
228
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
222 229
     @RequestMapping(value = "/accessTicket/{communityId}", method = RequestMethod.POST)
223 230
     public ResponseBean accessTicket(@PathVariable("communityId") Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId") String ticketId, HttpSession session) {
224 231
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);