评论优化

safe-campus-common/src/main/java/com/tangguo/common/core/page/TableDataInfo.java

 package com.tangguo.common.core.page;
 
+import com.github.pagehelper.PageInfo;
+import com.tangguo.common.constant.HttpStatus;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -79,4 +82,15 @@ public class TableDataInfo implements Serializable {
 	public void setMsg(String msg) {
 		this.msg = msg;
 	}
+
+
+	public static TableDataInfo getDataTable(List<?> list) {
+		TableDataInfo rspData = new TableDataInfo();
+		rspData.setCode(HttpStatus.SUCCESS);
+		rspData.setMsg("查询成功");
+		rspData.setRows(list);
+		rspData.setTotal(new PageInfo(list).getTotal());
+		return rspData;
+	}
+
 }

safe-campus-moment/src/main/java/com/tangguo/controller/mobile/MBbsMomentController.java

 package com.tangguo.controller.mobile;
 
 import com.tangguo.common.core.domain.AjaxResult;
+import com.tangguo.common.core.page.TableDataInfo;
 import com.tangguo.common.mauth.MobileAuth;
 import com.tangguo.common.mauth.MobileTokenHelper;
 import com.tangguo.common.utils.PageUtils;
@@ -51,11 +52,11 @@ public class MBbsMomentController {
 	 */
 	@MobileAuth
 	@GetMapping("/moments")
-	public AjaxResult getMoments(String content) {
+	public TableDataInfo getMoments(String content) {
 		String username = MobileTokenHelper.getUserName();
 		PageUtils.clearPage();
 		List<BbsMomentListVO> moments = this.momentService.getMoments(username, content);
-		return AjaxResult.success(moments);
+		return TableDataInfo.getDataTable(moments);
 	}
 
 
@@ -160,10 +161,10 @@ public class MBbsMomentController {
 	 */
 	@MobileAuth
 	@GetMapping("/votes")
-	public AjaxResult getMomentVotes(@RequestParam Long momentId, @RequestParam String optionCode) {
+	public TableDataInfo getMomentVotes(@RequestParam Long momentId, @RequestParam String optionCode) {
 		PageUtils.startPage();
 		List<BbsVoteVO> dbVotes = this.momentVoteService.getMomentVotes(momentId, optionCode);
-		return AjaxResult.success(dbVotes);
+		return TableDataInfo.getDataTable(dbVotes);
 	}
 
 
@@ -174,11 +175,11 @@ public class MBbsMomentController {
 	 */
 	@MobileAuth
 	@GetMapping("/comments")
-	public AjaxResult getMomentComments(@RequestParam Long momentId) {
+	public TableDataInfo getMomentComments(@RequestParam Long momentId) {
 		String userName = MobileTokenHelper.getUserName();
 		PageUtils.clearPage();
 		List<BbsCommentDetailVO> dbComments = this.momentCommentService.getMomentComments(momentId, userName);
-		return AjaxResult.success(dbComments);
+		return TableDataInfo.getDataTable(dbComments);
 	}
 
 

safe-campus-moment/src/main/java/com/tangguo/controller/mobile/MBbsTopicController.java

 package com.tangguo.controller.mobile;
 
 import com.tangguo.common.core.domain.AjaxResult;
+import com.tangguo.common.core.page.TableDataInfo;
 import com.tangguo.common.mauth.MobileAuth;
 import com.tangguo.common.utils.PageUtils;
 import com.tangguo.common.utils.ValidateOperations;
@@ -35,10 +36,10 @@ public class MBbsTopicController {
 	 */
 	@MobileAuth
 	@GetMapping("/select")
-	public AjaxResult getSelectTopics(String name) {
+	public TableDataInfo getSelectTopics(String name) {
 		PageUtils.startPage();
 		List<BbsTopicListVO> topics = this.topicService.getSelectTopics(name);
-		return AjaxResult.success(topics);
+		return TableDataInfo.getDataTable(topics);
 	}
 
 
@@ -78,10 +79,10 @@ public class MBbsTopicController {
 	 */
 	@MobileAuth
 	@GetMapping("/details")
-	public AjaxResult getTopicDetails(@RequestParam Long topicId) {
+	public TableDataInfo getTopicDetails(@RequestParam Long topicId) {
 		PageUtils.startPage();
 		List<BbsMomentListVO> details = this.topicService.getTopicDetails(topicId);
-		return AjaxResult.success(details);
+		return TableDataInfo.getDataTable(details);
 	}
 
 }

safe-campus-moment/src/main/java/com/tangguo/controller/mobile/MBbsUserController.java

 package com.tangguo.controller.mobile;
 
 import com.tangguo.common.core.domain.AjaxResult;
+import com.tangguo.common.core.page.TableDataInfo;
 import com.tangguo.common.mauth.MobileAuth;
 import com.tangguo.common.mauth.MobileTokenHelper;
 import com.tangguo.common.utils.PageUtils;
@@ -79,11 +80,11 @@ public class MBbsUserController {
 	 */
 	@MobileAuth
 	@GetMapping("/moments")
-	public AjaxResult getUserMoments(String content) {
+	public TableDataInfo getUserMoments(String content) {
 		String username = MobileTokenHelper.getUserName();
 		PageUtils.clearPage();
 		List<BbsMomentListVO> moments = this.momentService.getUserMoments(username, content);
-		return AjaxResult.success(moments);
+		return TableDataInfo.getDataTable(moments);
 	}
 
 }

safe-campus-moment/src/main/java/com/tangguo/service/impl/BbsMomentServiceImpl.java

@@ -371,7 +371,11 @@ public class BbsMomentServiceImpl extends ServiceImpl<BbsMomentMapper, BbsMoment
             throw new ServiceException("操作失败，当前动态未开启评论精选。");
         }
 
-        BbsMomentComment dbComment = this.commentService.getById(bo.getCommentId());
+        // 动态评论
+        BbsMomentComment dbComment = this.commentService.getOne(
+            Wrappers.lambdaQuery(BbsMomentComment.class)
+                .eq(BbsMomentComment::getMomentId, dbMoment.getId()).eq(BbsMomentComment::getId, bo.getCommentId())
+        );
         if (Objects.isNull(dbComment)) {
             throw new ServiceException("操作失败，未查询到当前动态评论数据。");
         }