项目评论添加评论用户的昵称和头像

src/main/java/cn/meteor/beyondclouds/modules/post/enums/PostErrorCode.java

@@ -9,8 +9,8 @@ import cn.meteor.beyondclouds.core.IErrorCode;
 public enum PostErrorCode implements IErrorCode {
 public enum PostErrorCode implements IErrorCode {
     NOT_APPEAR_SAME_TIME(10001,"视频和图片不能同时出现"),
     NOT_APPEAR_SAME_TIME(10001,"视频和图片不能同时出现"),
     POST_MUST_NOT_NULL(10002,"动态无内容"),
     POST_MUST_NOT_NULL(10002,"动态无内容"),
-    POST_NOT_FOUND(10003,"该动态不存在")
-    ;
+    POST_NOT_FOUND(10003,"该动态不存在"),
+    USER_POST_NOT_FOUND(10004, "用户未发布过此动态");
 
 
     private long code;
     private long code;
 
 

src/main/java/cn/meteor/beyondclouds/modules/post/service/impl/PostServiceImpl.java

@@ -72,7 +72,7 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("user_id", userId);
         Post post = getOne(queryWrapper);
         Post post = getOne(queryWrapper);
         if ( null == post ) {
         if ( null == post ) {
-            throw new PostServiceException(PostErrorCode.POST_NOT_FOUND);
+            throw new PostServiceException(PostErrorCode.USER_POST_NOT_FOUND);
         }
         }
 
 
         //2.删除动态
         //2.删除动态

src/main/java/cn/meteor/beyondclouds/modules/project/api/ProjectApi.java

@@ -80,7 +80,9 @@ public class ProjectApi {
     @PutMapping("/project/{projectId}")
     @PutMapping("/project/{projectId}")
     public Response updateProject(@RequestBody @Valid ProjectForm projectForm, BindingResult bindingResult,
     public Response updateProject(@RequestBody @Valid ProjectForm projectForm, BindingResult bindingResult,
                                   @PathVariable("projectId") Integer projectId, @CurrentSubject Subject subject) {
                                   @PathVariable("projectId") Integer projectId, @CurrentSubject Subject subject) {
-
+        if (bindingResult.hasErrors()) {
+            return Response.fieldError(bindingResult.getFieldError());
+        }
         // 将项目表单转换为项目对象
         // 将项目表单转换为项目对象
         Project project = new Project();
         Project project = new Project();
         BeanUtils.copyProperties(projectForm, project);
         BeanUtils.copyProperties(projectForm, project);

src/main/java/cn/meteor/beyondclouds/modules/project/entity/ProjectComment.java

@@ -35,6 +35,12 @@ public class ProjectComment implements Serializable {
     @ApiModelProperty(value = "评论者ID")
     @ApiModelProperty(value = "评论者ID")
     private String userId;
     private String userId;
 
 
+    @ApiModelProperty(value = "用户昵称")
+    private String userNick;
+
+    @ApiModelProperty(value = "用户头像")
+    private String userAvatar;
+
     @ApiModelProperty(value = "父级评论 ID")
     @ApiModelProperty(value = "父级评论 ID")
     private Integer parentId;
     private Integer parentId;
 
 

src/main/java/cn/meteor/beyondclouds/modules/project/service/impl/ProjectCommentServiceImpl.java

@@ -8,6 +8,8 @@ import cn.meteor.beyondclouds.modules.project.exception.ProjectCommentServiceExc
 import cn.meteor.beyondclouds.modules.project.mapper.ProjectCommentMapper;
 import cn.meteor.beyondclouds.modules.project.mapper.ProjectCommentMapper;
 import cn.meteor.beyondclouds.modules.project.service.IProjectCommentService;
 import cn.meteor.beyondclouds.modules.project.service.IProjectCommentService;
 import cn.meteor.beyondclouds.modules.project.service.IProjectService;
 import cn.meteor.beyondclouds.modules.project.service.IProjectService;
+import cn.meteor.beyondclouds.modules.user.entity.User;
+import cn.meteor.beyondclouds.modules.user.service.IUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,11 +31,18 @@ public class ProjectCommentServiceImpl extends ServiceImpl<ProjectCommentMapper,
 
 
     private IProjectService projectService;
     private IProjectService projectService;
 
 
+    private IUserService userService;
+
     @Autowired
     @Autowired
     public void setProjectService(IProjectService projectService) {
     public void setProjectService(IProjectService projectService) {
         this.projectService = projectService;
         this.projectService = projectService;
     }
     }
 
 
+    @Autowired
+    public void setUserService(IUserService userService) {
+        this.userService = userService;
+    }
+
     @Override
     @Override
     public void publishComment(Integer projectId, Integer parentId, String comment, String userId) throws ProjectCommentServiceException {
     public void publishComment(Integer projectId, Integer parentId, String comment, String userId) throws ProjectCommentServiceException {
         Assert.notNull(projectId, "projectId must not be null");
         Assert.notNull(projectId, "projectId must not be null");
@@ -59,9 +68,13 @@ public class ProjectCommentServiceImpl extends ServiceImpl<ProjectCommentMapper,
         }
         }
 
 
         // 3.保存评论
         // 3.保存评论
+        // 获取用户信息
+        User user = userService.getById(userId);
         ProjectComment projectComment = new ProjectComment();
         ProjectComment projectComment = new ProjectComment();
         projectComment.setProjectId(projectId);
         projectComment.setProjectId(projectId);
         projectComment.setUserId(userId);
         projectComment.setUserId(userId);
+        projectComment.setUserNick(user.getNickName());
+        projectComment.setUserAvatar(user.getUserAvatar());
         projectComment.setParentId(parentId);
         projectComment.setParentId(parentId);
         projectComment.setComment(comment);
         projectComment.setComment(comment);
         save(projectComment);
         save(projectComment);