Browse Source

几个小改动

xiaoshushu 4 năm trước cách đây
mục cha
commit
be3d9bebbe

+ 1 - 1
ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyMemberController.java

@@ -163,7 +163,7 @@ public class FamilyMemberController extends AppBaseController {
 
 
     @ApiOperation("获取家族成员详情")
-    @PostMapping("/get")
+    @GetMapping("/get")
     public AjaxResult get(Long familyId,Long memberId) {
         if (familyId == null) {
             return AjaxResult.error("家族id不能为空");

+ 2 - 2
ruoyi-app/src/main/java/com/ruoyi/app/controller/MyFriendController.java

@@ -167,8 +167,8 @@ public class MyFriendController extends AppBaseController {
 
     @ApiOperation("删除好友")
     @ApiImplicitParam(name = "id", value = "好友id",paramType="Long")
-    @DeleteMapping("/del")
-    public AjaxResult del(Long id) {
+    @DeleteMapping("/del/{id}")
+    public AjaxResult del(@PathVariable Long id) {
         if (id == null) {
             return AjaxResult.error("id不能为空");
         }

+ 14 - 5
ruoyi-app/src/main/java/com/ruoyi/app/controller/PublishCommentController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.app.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.app.annotation.LoginAppUser;
 import com.ruoyi.app.controller.base.AppBaseController;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbPublishComment;
+import com.ruoyi.app.domain.TbPublishThumbs;
 import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbPublishCommentService;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 评论
@@ -24,16 +27,17 @@ import java.util.Date;
  * @author Alex
  * @date 2020-10-09
  */
-@Api(value = "评论管理",tags = "评论管理")
+@Api(value = "评论管理", tags = "评论管理")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/comment" )
+@RequestMapping("/app/comment")
 public class PublishCommentController extends AppBaseController {
 
     private final ITbPublishCommentService commentService;
 
     /**
      * 添加评论
+     *
      * @param comment
      * @return
      */
@@ -43,14 +47,19 @@ public class PublishCommentController extends AppBaseController {
         if (comment.getPublishId() == null || comment.getAppUserId() == null) {
             return AjaxResult.error("参数为空");
         }
-        if (StringUtils.isBlank(comment.getContents())){
+        if (StringUtils.isBlank(comment.getContents())) {
             return AjaxResult.error("评论内容不能为空");
         }
         AppMemberVo user = getLoginUser().getUser();
         comment.setCreateBy(user.getUserId().toString());
         comment.setCreateTime(new Date());
-        if (commentService.save(comment)){
-            return AjaxResult.success("评论成功");
+        if (commentService.save(comment)) {
+            //返回评论列表
+            List<TbPublishComment> list = commentService.selectList(new LambdaQueryWrapper<TbPublishComment>()
+                    .eq(TbPublishComment::getPublishId, comment.getPublishId())
+            );
+
+            return AjaxResult.success(list);
         }
         return AjaxResult.error("评论失败");
     }

+ 12 - 9
ruoyi-app/src/main/java/com/ruoyi/app/controller/PublishThumbsController.java

@@ -30,34 +30,35 @@ import java.util.List;
  * @author Alex
  * @date 2020-10-09
  */
-@Api(value = "点赞记录",tags = "点赞记录")
+@Api(value = "点赞记录", tags = "点赞记录")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/thumbs" )
+@RequestMapping("/app/thumbs")
 public class PublishThumbsController extends AppBaseController {
 
     private final ITbPublishThumbsService thumbsService;
 
     /**
      * 点赞/取消
+     *
      * @param appUserId
      * @param publishId
      * @return
      */
     @ApiOperation("点赞/取消")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "appUserId", value = "点赞人id",paramType="Long"),
-            @ApiImplicitParam(name = "publishId", value = "发表id",paramType="Long")
+            @ApiImplicitParam(name = "appUserId", value = "点赞人id", paramType = "Long"),
+            @ApiImplicitParam(name = "publishId", value = "发表id", paramType = "Long")
     })
     @GetMapping("/action")
-    public AjaxResult action(Long appUserId, Long publishId){
+    public AjaxResult action(Long appUserId, Long publishId) {
         // TODO 在点赞或取消时,APP端的点赞数组异步增加或去掉记录
         if (appUserId == null || publishId == null) {
             return AjaxResult.error("参数不能为空");
         }
         TbPublishThumbs thumbs = thumbsService.getOne(new LambdaQueryWrapper<TbPublishThumbs>()
                 .eq(TbPublishThumbs::getPublishId, publishId)
-                .eq(TbPublishThumbs::getAppUserId,appUserId)
+                .eq(TbPublishThumbs::getAppUserId, appUserId)
                 .last("limit 1")
         );
         AppMemberVo user = getLoginUser().getUser();
@@ -74,9 +75,11 @@ public class PublishThumbsController extends AppBaseController {
             thumbsService.removeById(thumbs.getId());
         }
         // 点赞或取消后,返回点赞记录
-        List<TbPublishThumbs> list = thumbsService.selectList(new LambdaQueryWrapper<TbPublishThumbs>()
-            .eq(TbPublishThumbs::getPublishId,publishId)
+        TbPublishThumbs obj = thumbsService.getOne(new LambdaQueryWrapper<TbPublishThumbs>()
+                .eq(TbPublishThumbs::getPublishId, publishId)
+                .eq(TbPublishThumbs::getAppUserId, appUserId)
+                .last("limit 1")
         );
-        return AjaxResult.success(list);
+        return AjaxResult.success(obj);
     }
 }