合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -92,4 +92,16 @@ public class SocialController {
         responseBean.addSuccess(activityList);
         return responseBean;
     }
+    
+    
+    @ApiOperation(value = "论坛活动帖子详情", notes = "获取论坛活动帖子详情")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id")})
+    @RequestMapping(value = "/activity/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findActivityDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId") Integer activityId){
+        ResponseBean responseBean = new ResponseBean();
+        TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId);
+        responseBean.addSuccess(activity);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -41,4 +41,12 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 获取活动帖子详情
+	 * @param activityId
+	 * @param communityId
+	 * @return
+	 */
+	TpActivity findActivityDetail(Integer activityId, Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -104,4 +104,15 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
         return activityList;
     }
+    
+    /**
+     * 获取活动帖子详情
+     * @param activityId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public TpActivity findActivityDetail(Integer activityId, Integer communityId) {
+        return null;
+    }
 }