临时提交代码

src/main/java/com/youlai/boot/mini/controller/AdoptionDiaryController.java

@@ -121,11 +121,11 @@ public class AdoptionDiaryController {
         return PageResult.success(adoptionDiaryService.getSelfCreatedPage(queryParams));
     }
 
-//    @Operation(summary = "获取领养日记详情")
+    @Operation(summary = "获取领养日记详情")
-//    @RequestMapping(value = "/getDetails/{animalUuid}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getDetails/{diaryUuid}", method = RequestMethod.GET)
-//    public Result<AdoptionDiaryDetailsVO> getDetails(
+    public Result<AdoptionDiaryDetailsVO> getDetails(
-//        @PathVariable String diaryUuid){
+        @PathVariable String diaryUuid){
-//        return Result.success(adoptionDiaryService.getDetails(diaryUuid, SecurityUtils.getUserId()));
+        return Result.success(adoptionDiaryService.getDetails(diaryUuid, SecurityUtils.getUserId()));
-//    }
+    } // 待修改
 
 }

src/main/java/com/youlai/boot/mini/controller/MiniUserController.java

@@ -46,7 +46,7 @@ public class MiniUserController {
     @Operation(summary = "修改当前登录用户基本信息")
     @PostMapping(value = "/updateInfo")
     @Log(module = LogModuleEnum.USER, value = ActionTypeEnum.UPDATE)
-    public Result<Void> updateCurrentUserInfo(@Valid MiniUserUpdateForm form) {
+    public Result<Void> updateCurrentUserInfo(@Valid @RequestBody MiniUserUpdateForm form) {
         Long userId = SecurityUtils.getUserId();
         miniUserService.updateCurrentUserInfo(userId, form);
         return Result.success();

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.boot.mini.model.entity.MiniAdoptionDiary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.youlai.boot.mini.model.query.OwnAdoptionDiaryQuery;
+import com.youlai.boot.mini.model.vo.AdoptionDiaryDetailsVO;
 import com.youlai.boot.mini.model.vo.AdoptionDiaryVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
 * 领养日记表 Mapper 接口
 *
 * @author jwy
-* @since 
+* @since
 */
 public interface MiniAdoptionDiaryMapper extends BaseMapper<MiniAdoptionDiary> {
 
@@ -24,6 +25,6 @@ public interface MiniAdoptionDiaryMapper extends BaseMapper<MiniAdoptionDiary> {
     /**
      * 查询领养日记详情
      */
-    AdoptionDiaryVO getDiaryDetails(@Param("diaryUuid") String diaryUuid, @Param("miniUserId") Long miniUserId);
+    AdoptionDiaryDetailsVO getDiaryDetails(@Param("diaryUuid") String diaryUuid, @Param("miniUserId") Long miniUserId);
 
 }

src/main/java/com/youlai/boot/mini/service/AdoptionDiaryService.java

@@ -8,6 +8,7 @@ import com.youlai.boot.mini.model.dto.EditVisibilityDTO;
 import com.youlai.boot.mini.model.entity.MiniAdoptionDiary;
 import com.youlai.boot.mini.model.form.AdoptionDiaryForm;
 import com.youlai.boot.mini.model.query.OwnAdoptionDiaryQuery;
+import com.youlai.boot.mini.model.vo.AdoptionDiaryDetailsVO;
 import com.youlai.boot.mini.model.vo.AdoptionDiaryVO;
 import com.youlai.boot.mini.model.vo.SaveStrayAnimalVO;
 import com.youlai.boot.mini.model.vo.StrayAnimalDetailsVO;
@@ -34,6 +35,6 @@ public interface AdoptionDiaryService extends IService<MiniAdoptionDiary> {
 
     IPage<AdoptionDiaryVO> getSelfCreatedPage(OwnAdoptionDiaryQuery queryParams);
 
-//    AdoptionDiaryVO getDetails(String diaryUuid, Long userId);
+    AdoptionDiaryDetailsVO getDetails(String diaryUuid, Long userId);
 
 }

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

@@ -1,6 +1,7 @@
 package com.youlai.boot.mini.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,6 +24,7 @@ import com.youlai.boot.mini.model.entity.MiniAdoptionDiaryMedia;
 import com.youlai.boot.mini.model.enums.AnimalNoteMediaTypeEnum;
 import com.youlai.boot.mini.model.form.AdoptionDiaryForm;
 import com.youlai.boot.mini.model.query.OwnAdoptionDiaryQuery;
+import com.youlai.boot.mini.model.vo.AdoptionDiaryDetailsVO;
 import com.youlai.boot.mini.model.vo.AdoptionDiaryVO;
 import com.youlai.boot.mini.service.AdoptionDiaryService;
 import lombok.RequiredArgsConstructor;
@@ -392,13 +394,10 @@ public class AdoptionDiaryServiceImpl extends ServiceImpl<MiniAdoptionDiaryMappe
         return result;
     }
 
-//    @Override
+    @Override
-//    public AdoptionDiaryVO getDetails(String diaryUuid, Long userId) {
+    public AdoptionDiaryDetailsVO getDetails(String diaryUuid, Long userId) {
-//        AdoptionDiaryVO diaryVO = miniAdoptionDiaryMapper.getDiaryDetails(diaryUuid, userId);
+        AdoptionDiaryDetailsVO diaryVO = baseMapper.getDiaryDetails(diaryUuid, userId);
-//        if (diaryVO != null && cn.hutool.core.util.StrUtil.isBlank(diaryVO.getFirstImageUrl())) {
+        return diaryVO;
-//            diaryVO.setFirstImageUrl(getDefaultCoverHost() + "/default_diary.png");
+    }
-//        }
-//        return diaryVO;
-//    }
 
 }

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

@@ -89,7 +89,7 @@
         ORDER BY d.create_timestamp DESC
     </select>
 
-    <select id="getDiaryDetails" resultType="com.youlai.boot.mini.model.vo.AdoptionDiaryVO">
+    <select id="getDiaryDetails" resultType="com.youlai.boot.mini.model.vo.AdoptionDiaryDetailsVO">
         SELECT
             d.id,
             d.uuid AS diaryUuid,
@@ -134,7 +134,6 @@
                 0 AS isLiked,
                 0 AS isCollected,
             </if>
-            -- 可扩展返回所有媒体资源列表，这里先返回首图即可，需要的话可以单独加接口返回所有媒体
             d.create_timestamp
         FROM mini_adoption_diary d
         INNER JOIN sys_user u ON d.mini_user_id = u.id AND u.is_deleted = 0