修复部分接口问题

src/main/java/com/youlai/boot/mini/mapper/MiniAdoptionDiaryCommentLikeMapper.java

@@ -2,12 +2,13 @@ package com.youlai.boot.mini.mapper;
 
 import com.youlai.boot.mini.model.entity.MiniAdoptionDiaryCommentLike;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * 领养日记评论点赞表 Mapper 接口
 *
 * @author jwy
-* @since 
+* @since
 */
 public interface MiniAdoptionDiaryCommentLikeMapper extends BaseMapper<MiniAdoptionDiaryCommentLike> {
 

src/main/java/com/youlai/boot/mini/mapper/MiniAdoptionDiaryMapper.java

@@ -40,7 +40,7 @@ public interface MiniAdoptionDiaryMapper extends BaseMapper<MiniAdoptionDiary> {
 
     Long selectCollectCount(Long diaryId);
 
-    List<AdoptionDiaryVO> getWaterfall(Long cursor, int querySize, Long userId);
+    List<AdoptionDiaryVO> getWaterfall(@Param("cursor") Long cursor, @Param("pageSize") int pageSize, @Param("miniUserId") Long miniUserId);
 
     void increaseDiaryViewCount(String diaryUuid);
 }

src/main/java/com/youlai/boot/mini/mapper/MiniStrayAnimalMapper.java

@@ -9,6 +9,7 @@ import com.youlai.boot.mini.model.query.OwnStrayAnimalQuery;
 import com.youlai.boot.mini.model.vo.StrayAnimalDetailsVO;
 import com.youlai.boot.mini.model.vo.StrayAnimalNearbyVO;
 import com.youlai.boot.mini.model.vo.StrayAnimalShortVO;
+import jakarta.validation.constraints.NotNull;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -32,4 +33,7 @@ public interface MiniStrayAnimalMapper extends BaseMapper<MiniStrayAnimal> {
     List<StrayAnimalNearbyVO> listByMapBounds(MapSearchDTO mapSearch);
 
     List<StrayAnimalShortVO> getWaterfall(@Param("cursor") Long cursor, @Param("pageSize") Integer pageSize, @Param("animalType") String animalType, @Param("miniUserId") Long miniUserId);
+
+    Long selectIdByUuid(@Param("strayAnimalUuId") String strayAnimalUuId);
+
 }

src/main/java/com/youlai/boot/mini/model/form/AdoptionDiaryForm.java

@@ -15,8 +15,8 @@ import java.util.List;
 public class AdoptionDiaryForm {
 
     @NotNull(message = "关联的动物ID不能为空")
-    @Schema(description = "关联的流浪动物ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "关联的流浪动物UUID", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long strayAnimalId;
+    private String strayAnimalUuId;
 
     @NotBlank(message = "日记标题不能为空")
     @Length(max = 200, message = "标题不能超过200个字符")

src/main/java/com/youlai/boot/mini/model/query/OwnAdoptionDiaryQuery.java

@@ -14,4 +14,10 @@ public class OwnAdoptionDiaryQuery extends AdoptionDiaryQuery{
     @Schema(description = "创建领养日记的用户ID", example = "1", hidden = true)
     private Long creatorId;
 
+    @Schema(description = "关键词", example = "标题内容", hidden = true)
+    private String keyword;
+
+    @Schema(description = "权限", example = "public", hidden = true)
+    private String visibility;
+
 }

src/main/java/com/youlai/boot/mini/model/vo/AdoptionDiaryVO.java

@@ -27,8 +27,8 @@ public class AdoptionDiaryVO {
     @Schema(description = "关联的流浪动物UUID")
     private String animalUuid;
 
-    @Schema(description = "关联的流浪动物名称")
+    @Schema(description = "关联的流浪动物类型")
-    private String animalName;
+    private String animalType;
 
     @Schema(description = "封面图片url")
     private String firstImageUrl;
@@ -64,7 +64,7 @@ public class AdoptionDiaryVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
-    @Schema(description = "审核状态：0通过,1审核中,2审核未通过", example = "0")
+//    @Schema(description = "审核状态：0通过,1审核中,2审核未通过", example = "0")
-    private Integer auditStatus;
+//    private Integer auditStatus;
 
 }

src/main/java/com/youlai/boot/mini/service/impl/AdoptionDiaryServiceImpl.java

@@ -28,6 +28,7 @@ import com.youlai.boot.mini.model.query.AdoptionDiaryWaterfallQuery;
 import com.youlai.boot.mini.model.query.OwnAdoptionDiaryQuery;
 import com.youlai.boot.mini.model.vo.*;
 import com.youlai.boot.mini.service.AdoptionDiaryService;
+import com.youlai.boot.mini.service.StrayAnimalService;
 import com.youlai.boot.system.mapper.UserMapper;
 import com.youlai.boot.system.model.entity.SysUser;
 import lombok.RequiredArgsConstructor;
@@ -61,6 +62,7 @@ public class AdoptionDiaryServiceImpl extends ServiceImpl<MiniAdoptionDiaryMappe
     private final RedissonClient redissonClient;
     private final MiniAdoptionDiaryLikeMapper miniAdoptionDiaryLikeMapper;
     private final MiniAdoptionDiaryCollectMapper miniAdoptionDiaryCollectMapper;
+    private final MiniStrayAnimalMapper miniStrayAnimalMapper;
 
     // 布隆过滤器常量
     private static final String BLOOM_VIEW_KEY_PREFIX = "mini:diary:view:bloom:";
@@ -176,6 +178,8 @@ public class AdoptionDiaryServiceImpl extends ServiceImpl<MiniAdoptionDiaryMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String saveAdoptionDiary(AdoptionDiaryForm formData) {
+        // 根据动物uuid 查询动物id
+        Long animalId = miniStrayAnimalMapper.selectIdByUuid(formData.getStrayAnimalUuId());
         long currentTimestamp = System.currentTimeMillis();
         Long userId = SecurityUtils.getUserId();
 
@@ -183,7 +187,7 @@ public class AdoptionDiaryServiceImpl extends ServiceImpl<MiniAdoptionDiaryMappe
         MiniAdoptionDiary diary = new MiniAdoptionDiary();
         diary.setUuid(UUID.randomUUID().toString());
         diary.setMiniUserId(userId);
-        diary.setStrayAnimalId(formData.getStrayAnimalId());
+        diary.setStrayAnimalId(animalId);
         diary.setTitle(formData.getTitle());
         diary.setContent(formData.getContent());
         diary.setVisibility(formData.getVisibility());

src/main/resources/mapper/mini/MiniAdoptionDiaryMapper.xml

@@ -22,7 +22,7 @@
             d.id,
             d.uuid AS diaryUuid,
             sa.uuid AS animalUuid,
-            sa.animal_name AS animalName,
+            sa.animal_type AS animalType,
             d.title,
             LEFT(d.content, 100) AS content,
             d.visibility,
@@ -31,7 +31,7 @@
             d.comment_count AS commentCount,
             d.collect_count AS collectCount,
             d.create_time AS createTime,
-            d.audit_status AS auditStatus,
+<!--            d.audit_status AS auditStatus,-->
             u.uuid AS authorUuid,
             u.nickname AS authorName,
             u.avatar AS authorAvatar,
@@ -81,10 +81,6 @@
             <if test="query.createEndTimestamp != null">
                 AND #{query.createEndTimestamp} >= d.create_timestamp
             </if>
-            <!-- 审核状态筛选 -->
-            <if test="query.auditStatus != null">
-                AND d.audit_status = #{query.auditStatus}
-            </if>
         </where>
         ORDER BY d.create_timestamp DESC
     </select>

src/main/resources/mapper/mini/MiniStrayAnimalMapper.xml

@@ -356,4 +356,10 @@
         LIMIT #{pageSize}
     </select>
 
+    <select id="selectIdByUuid" resultType="java.lang.Long">
+        SELECT id FROM mini_stray_animal
+        WHERE uuid = #{strayAnimalUuId}
+        AND is_deleted = 0
+    </select>
+
 </mapper>