diff --git a/timeline-story-service/src/main/java/com/timeline/story/controller/StoryController.java b/timeline-story-service/src/main/java/com/timeline/story/controller/StoryController.java index 2e3c1e4..62bb8d4 100644 --- a/timeline-story-service/src/main/java/com/timeline/story/controller/StoryController.java +++ b/timeline-story-service/src/main/java/com/timeline/story/controller/StoryController.java @@ -49,9 +49,9 @@ public class StoryController { } @GetMapping("/{storyId}") - public ResponseEntity getStoryById(@PathVariable String storyId) { + public ResponseEntity getStoryById(@PathVariable String storyId) { log.info("获取故事详情, ID: {}", storyId); - Story story = storyService.getStoryByInstanceId(storyId); + StoryDetailVo story = storyService.getStoryByInstanceId(storyId); return ResponseEntity.success(story); } diff --git a/timeline-story-service/src/main/java/com/timeline/story/service/StoryService.java b/timeline-story-service/src/main/java/com/timeline/story/service/StoryService.java index d96807a..ddc1816 100644 --- a/timeline-story-service/src/main/java/com/timeline/story/service/StoryService.java +++ b/timeline-story-service/src/main/java/com/timeline/story/service/StoryService.java @@ -10,7 +10,7 @@ public interface StoryService { void createStory(StoryVo storyVo); void updateStory(StoryVo storyVo, String storyId); void deleteStory(String storyId); - Story getStoryByInstanceId(String storyId); + StoryDetailVo getStoryByInstanceId(String storyId); List getStoriesByOwnerId(String ownerId); List getStories(StoryVo storyVo); diff --git a/timeline-story-service/src/main/java/com/timeline/story/service/impl/StoryServiceImpl.java b/timeline-story-service/src/main/java/com/timeline/story/service/impl/StoryServiceImpl.java index 15316fe..0f2582c 100644 --- a/timeline-story-service/src/main/java/com/timeline/story/service/impl/StoryServiceImpl.java +++ b/timeline-story-service/src/main/java/com/timeline/story/service/impl/StoryServiceImpl.java @@ -136,9 +136,9 @@ public class StoryServiceImpl implements StoryService { } @Override - public Story getStoryByInstanceId(String storyId) { + public StoryDetailVo getStoryByInstanceId(String storyId) { val userId = getCurrentUserId(); - Story story = storyMapper.selectByInstanceId(storyId, userId); + StoryDetailVo story = storyMapper.selectByInstanceId(storyId, userId); if (story == null) { throw new CustomException(ResponseEnum.NOT_FOUND); } diff --git a/timeline-story-service/src/main/resources/com/timeline/story/dao/StoryMapper.xml b/timeline-story-service/src/main/resources/com/timeline/story/dao/StoryMapper.xml index b412b36..918fb1b 100644 --- a/timeline-story-service/src/main/resources/com/timeline/story/dao/StoryMapper.xml +++ b/timeline-story-service/src/main/resources/com/timeline/story/dao/StoryMapper.xml @@ -42,7 +42,7 @@ WHERE s.instance_id = #{instanceId} - SELECT s.*, u1.username AS owner_name,