合并

whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java

@@ -38,14 +38,15 @@ public class ActivityController extends BaseController {
     private IActivityEnrollService iActivityEnrollService;
 
 
-    @RequestMapping(value = "/activity/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/activity/list", method = RequestMethod.GET)
     @ApiOperation(value = "活动列表", notes = "活动列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "pageNum第几页;pageSize一页多少行")
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行")
     })
-    public ResponseBean getList(@RequestBody String parameter) {
+    public ResponseBean getList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iActivityService.getList(parameter);
+        responseBean = iActivityService.getList(pageNum, pageSize);
         return responseBean;
     }
 
@@ -108,11 +109,12 @@ public class ActivityController extends BaseController {
     @RequestMapping(value = "/activity/enroll/list/{activityId}", method = RequestMethod.POST)
     @ApiOperation(value = "根据活动id查询活动报名列表", notes = "根据活动id查询活动报名列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "pageNum第几页;pageSize一页多少行")
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行")
     })
-    public ResponseBean activityEnrollList(@PathVariable("activityId") String activityId, @RequestBody String parameter) {
+    public ResponseBean activityEnrollList(@PathVariable("activityId") String activityId, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iActivityEnrollService.getActivitySignUpList(activityId, parameter);
+        responseBean = iActivityEnrollService.getActivitySignUpList(activityId, pageNum, pageSize);
         return responseBean;
     }
 

whole-estate/src/main/java/com/example/wholeestate/controller/CommentController.java

@@ -11,10 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -60,6 +57,34 @@ public class CommentController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/comment/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加评论", notes = "添加评论")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "customerId用户ID;commentType评论类型;mainId评论类型;parentId父级;commentContent评论内容")
+    })
+    public ResponseBean addComment(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iCommentService.addComment(parameter);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/comment/list", method = RequestMethod.GET)
+    @ApiOperation(value = "查询评论列表", notes = "查询评论列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "commentType", value = "评论类型"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "mainId", value = "评论主体id"),
+    })
+    public ResponseBean commentList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                    @RequestParam(defaultValue = "10") Integer pageSize,
+                                    @RequestParam String commentType,
+                                    @RequestParam String mainId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iCommentService.getCommentList(commentType, mainId, pageNum, pageSize);
+        return responseBean;
+    }
 
 
 }

whole-estate/src/main/java/com/example/wholeestate/service/IActivityEnrollService.java

@@ -16,9 +16,11 @@ public interface IActivityEnrollService extends IService<ActivityEnroll> {
 
     /**
      * 根据活动id 查询 活动报名列表
-     * @param parameter
+     * @param activityId
+     * @param pageSize
+     * @param pageNum
      * @return
      */
-    ResponseBean getActivitySignUpList(String activityId,String parameter);
+    ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize);
 
 }

whole-estate/src/main/java/com/example/wholeestate/service/IActivityService.java

@@ -16,10 +16,11 @@ public interface IActivityService extends IService<Activity> {
 
     /**
      * 查询活动列表
-     * @param parameter
+     * @param pageNum
+     * @param pageSize
      * @return
      */
-    ResponseBean getList(String parameter);
+    ResponseBean getList(Integer pageNum, Integer pageSize);
 
     /**
      * 根据 活动id 查询

whole-estate/src/main/java/com/example/wholeestate/service/ICommentService.java

@@ -20,6 +20,16 @@ public interface ICommentService extends IService<Comment> {
      * @param parameter
      * @return
      */
-    ResponseBean addComment(SysUser user, String parameter);
+    ResponseBean addComment(String parameter);
+
+    /**
+     * 根据 评论类型, 评论主题id 查询
+     * @param commentType
+     * @param mainId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getCommentList(String commentType, String mainId, Integer pageNum, Integer pageSize);
 
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/ActivityEnrollServiceImpl.java

@@ -31,7 +31,7 @@ public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper,
     private ActivityMapper activityMapper;
 
     @Override
-    public ResponseBean getActivitySignUpList(String activityId,String parameter) {
+    public ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
 
         Activity activity = activityMapper.selectById(activityId);
@@ -40,10 +40,6 @@ public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper,
             return responseBean;
         }
 
-        JSONObject jsonObject = JSONObject.parseObject(parameter);
-        Integer pageNum = jsonObject.getInteger("pageNum");
-        Integer pageSize = jsonObject.getInteger("pageSize");
-
         Page<Activity> page = new Page<>();
         page.setCurrent(pageNum == null ? 1 : pageNum);
         page.setSize(pageSize == null ? 10 : pageSize);

whole-estate/src/main/java/com/example/wholeestate/service/impl/ActivityServiceImpl.java

@@ -32,13 +32,9 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     private BuildingMapper buildingMapper;
 
     @Override
-    public ResponseBean getList(String parameter) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
 
-        JSONObject jsonObject = JSONObject.parseObject(parameter);
-        Integer pageNum = jsonObject.getInteger("pageNum");
-        Integer pageSize = jsonObject.getInteger("pageSize");
-
         Page<Activity> page = new Page<>();
         page.setCurrent(pageNum == null ? 1 : pageNum);
         page.setSize(pageSize == null ? 10 : pageSize);

whole-estate/src/main/java/com/example/wholeestate/service/impl/CommentServiceImpl.java

@@ -2,6 +2,8 @@ package com.example.wholeestate.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.dao.CommentMapper;
@@ -35,7 +37,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
     private CustomerMapper customerMapper;
 
     @Override
-    public ResponseBean addComment(SysUser user, String parameter) {
+    public ResponseBean addComment(String parameter) {
         ResponseBean responseBean = new ResponseBean();
         Comment comment = JSONObject.parseObject(parameter, Comment.class);
         comment.setCreateDate(LocalDateTime.now());
@@ -45,10 +47,13 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         customerQueryWrapper.eq("customer_id", comment.getCustomerId());
         Customer customer = customerMapper.selectOne(customerQueryWrapper);
         if (null == customer) {
-            responseBean.addError("用户不存在!");
+            responseBean.addError("评论用户不存在!");
             return responseBean;
         }
 
+        comment.setCustomerName(customer.getCustomerName());
+        comment.setAvatar(customer.getAvatar());
+
         int insert = commentMapper.insert(comment);
         if (insert <= 0) {
             responseBean.addError("评论失败!");
@@ -57,4 +62,21 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         responseBean.addSuccess("评论成功!");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getCommentList(String commentType, String mainId, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<Comment> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<Comment> commentQueryWrapper = new QueryWrapper<>();
+        commentQueryWrapper.eq("comment_type", commentType);
+        commentQueryWrapper.eq("main_id", mainId);
+        IPage<Comment> commentIPage = commentMapper.selectPage(page, commentQueryWrapper);
+
+        responseBean.addSuccess(commentIPage);
+        return responseBean;
+    }
 }