减少转换器中不必要的参数

MaaAssistantArknights · Jan 3, 2024 · 0504e3e · 0504e3e
1 parent 74170cd
commit 0504e3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/main/java/plus/maa/backend/common/utils/converter/CommentConverter.java b/src/main/java/plus/maa/backend/common/utils/converter/CommentConverter.java
@@ -18,15 +18,15 @@ public interface CommentConverter {
     @Mapping(target = "like", source = "commentsArea.likeCount")
     @Mapping(target = "dislike", source = "commentsArea.dislikeCount")
     @Mapping(target = "uploader", source = "maaUser.userName")
-    @Mapping(target = "commentId", source = "id")
+    @Mapping(target = "commentId", source = "commentsArea.id")
     @Mapping(target = "subCommentsInfos", ignore = true)
-    CommentsInfo toCommentsInfo(CommentsArea commentsArea, String id, MaaUser maaUser);
+    CommentsInfo toCommentsInfo(CommentsArea commentsArea, MaaUser maaUser);
 
 
     @Mapping(target = "like", source = "commentsArea.likeCount")
     @Mapping(target = "dislike", source = "commentsArea.dislikeCount")
     @Mapping(target = "uploader", source = "maaUser.userName")
-    @Mapping(target = "commentId", source = "id")
-    @Mapping(target = "deleted", source = "delete")
-    SubCommentsInfo toSubCommentsInfo(CommentsArea commentsArea, String id, MaaUser maaUser, boolean delete);
+    @Mapping(target = "commentId", source = "commentsArea.id")
+    @Mapping(target = "deleted", source = "commentsArea.delete")
+    SubCommentsInfo toSubCommentsInfo(CommentsArea commentsArea, MaaUser maaUser);
 }
diff --git a/src/main/java/plus/maa/backend/service/CommentsAreaService.java b/src/main/java/plus/maa/backend/service/CommentsAreaService.java
@@ -340,7 +340,6 @@ public CommentsAreaInfo queriesCommentsArea(CommentsQueriesDTO request) {
                     commentConverter
                             .toCommentsInfo(
                                     mainComment
-                                    , mainComment.getId()
                                     , maaUserMap.getOrDefault(
                                             mainComment.getUploaderId()
                                             , UNKNOWN_USER
@@ -354,13 +353,11 @@ public CommentsAreaInfo queriesCommentsArea(CommentsQueriesDTO request) {
                             commentConverter
                                     .toSubCommentsInfo(
                                             subComment
-                                            , subComment.getId()
                                             //填充评论用户名
                                             , maaUserMap.getOrDefault(
                                                     subComment.getUploaderId(),
                                                     UNKNOWN_USER
                                             )
-                                            , subComment.isDelete()
                                     )
                     ).toList();