Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ocean-note-service/src/main/java/com/oriole/ocean/controller/NoteController.java
#	ocean-note-service/src/main/java/com/oriole/ocean/dao/NoteCommentDao.java
#	ocean-note-service/src/main/java/com/oriole/ocean/service/NoteServiceImpl.java

Author: AInfinity-LilacDream

ocean-common/src/main/java/com/oriole/ocean/common/po/mongo/comment/NoteCommentEntity.java

@@ -0,0 +1,53 @@
+package com.oriole.ocean.common.po.mysql;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class NoteCommentEntity implements java.io.Serializable {
+    @TableField("id")
+    private String id;
+
+    @TableField("note_id")
+    private String noteId;
+
+    @TableField("content")
+    private String content;
+
+    @TableField("build_username")
+    private String buildUsername;
+
+    @TableField("like_num")
+    private Integer likeNum;
+
+    @TableField("build_date")
+    private Date buildDate;
+
+    @TableField("is_deleted")
+    private Byte isDeleted;
+
+    @TableField("reply_id")
+    private String replyId;
+
+    @TableField("reply_username")
+    private String replyUsername;
+
+    /**
+     * Whether the current user has liked this comment.
+     * This field is not mapped to the database, only used for data transfer
+     */
+    @TableField(exist = false)
+    private Boolean isLikedByCurrentUser;
+
+    public NoteCommentEntity(
+            String noteId, String buildUsername,
+            String content, String replyId, String replyUsername) {
+        this.noteId = noteId;
+        this.content = content;
+        this.buildUsername = buildUsername;
+        this.replyId = replyId;
+        this.replyUsername = replyUsername;
+    }
+}

ocean-common/src/main/java/com/oriole/ocean/common/po/mysql/NoteCommentEntity.java

@@ -0,0 +1,48 @@
+package com.oriole.ocean.common.po.mysql;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Note like record entity
+ * Records the like relationship between users and notes
+ */
+@Data
+@TableName("`note_like`")
+public class NoteCommentLikeEntity implements java.io.Serializable {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @TableField("username")
+    private String username;
+
+    @TableField("comment_id")
+    private String commentId;
+
+    @TableField("like_time")
+    private Date likeTime;
+
+    /**
+     * Default constructor
+     */
+    public NoteCommentLikeEntity() {
+        this.likeTime = new Date();
+    }
+
+    /**
+     * Constructor with username and commentId
+     * @param username The username who likes the comment
+     * @param commentId The ID of the liked comment
+     */
+    public NoteCommentLikeEntity(String username, String commentId) {
+        this.username = username;
+        this.commentId = commentId;
+        this.likeTime = new Date();
+    }
+}

ocean-common/src/main/java/com/oriole/ocean/common/po/mysql/NoteCommentLikeEntity.java

@@ -0,0 +1,77 @@
+package com.oriole.ocean.common.service;
+
+import com.oriole.ocean.common.po.mongo.FavorEntity;
+import com.oriole.ocean.common.po.mysql.NoteCommentEntity;
+import com.oriole.ocean.common.po.mysql.NoteCommentLikeEntity;
+import com.oriole.ocean.common.po.mysql.NoteEntity;
+import com.oriole.ocean.common.po.mysql.NoteLikeEntity;
+
+import java.util.List;
+
+/**
+ * Note service interface
+ * Provides business logic for note operations
+ */
+public interface NoteCommentService {
+
+    /**
+     * Check if user is the creator of a comment
+     * @param commentId Comment ID
+     * @param username Username to check
+     * @return true if user is creator, false otherwise
+     */
+    boolean isCommentCreator(String commentId, String username);
+
+    /**
+     * Delete a note comment
+     * @param commentId Comment ID
+     */
+    void deleteNoteComment(String commentId);
+
+    /**
+     * Get note comments by note ID
+     * @param noteId Note ID
+     * @return List of note comments
+     */
+    List<NoteCommentEntity> getNoteCommentsByNoteIdWithLikeStatus(String noteId);
+
+    /**
+     * Get note comments by comment ID
+     * @param commentId comment ID
+     * @return note comment
+     */
+    NoteCommentEntity getNoteComment(String commentId);
+
+    /**
+     * Create a new note comment
+     * @param noteCommentEntity Note comment entity to create
+     * @return Created note comment entity
+     */
+    NoteCommentEntity createNoteComment(NoteCommentEntity noteCommentEntity);
+
+
+    /**
+     * Like or unlike a note
+     * @param username Username who likes/unlikes
+     * @param commentId Note ID to like/unlike
+     * @param isLike true to like, false to unlike
+     * @return NoteLikeEntity if liked, null if unliked
+     */
+    NoteCommentLikeEntity likeNoteComment(String username, String commentId, boolean isLike);
+
+    /**
+     * Check if a user has liked a specific note
+     * @param username Username to check
+     * @param commentId Note ID to check
+     * @return true if liked, false otherwise
+     */
+    boolean hasUserLikedNoteComment(String username, String commentId);
+
+    /**
+     * Get like record for a user and note
+     * @param username Username
+     * @param commentId Note ID
+     * @return NoteLikeEntity if exists, null otherwise
+     */
+    NoteCommentLikeEntity getNoteCommentLike(String username, String commentId);
+}

ocean-common/src/main/java/com/oriole/ocean/common/service/NoteCommentService.java

@@ -1,7 +1,7 @@
 package com.oriole.ocean.common.service;
 
 import com.oriole.ocean.common.po.mongo.FavorEntity;
-import com.oriole.ocean.common.po.mongo.comment.NoteCommentEntity;
+import com.oriole.ocean.common.po.mysql.NoteCommentEntity;
 import com.oriole.ocean.common.po.mysql.NoteEntity;
 import com.oriole.ocean.common.po.mysql.NoteLikeEntity;
 import java.util.List;
@@ -53,12 +53,6 @@ public interface NoteService {
      */
     NoteEntity getNoteByIdWithLikeStatus(String noteID, String username);
 
-    /**
-     * Delete a note comment
-     * @param commentId Comment ID
-     */
-    void deleteNoteComment(String commentId);
-
     /**
      * Get user behavior (favorites) for a specific note
      * @param username Username
@@ -126,29 +120,13 @@ public interface NoteService {
      */
     List<NoteEntity> getNotesByTagWithLikeStatus(String tag, String username);
 
-    /**
-     * Get note comments by note ID
-     * @param noteId Note ID
-     * @param pageNo Page number
-     * @param pageSize Page size
-     * @return List of note comments
-     */
-    List<NoteCommentEntity> getNoteCommentsByNoteId(String noteId, int pageNo, int pageSize);
-
     /**
      * Create a new note
      * @param noteEntity Note entity to create
      * @return Created note entity
      */
     NoteEntity createNote(NoteEntity noteEntity);
 
-    /**
-     * Create a new note comment
-     * @param noteCommentEntity Note comment entity to create
-     * @return Created note comment entity
-     */
-    NoteCommentEntity createNoteComment(NoteCommentEntity noteCommentEntity);
-
     // === Like functionality ===
 
     /**