傅行帆 6 年前
父节点
当前提交
0e6bb637c2

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

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

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

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