feat(BangumiService): add user-specific episode watch status and update episode retrieval method

LiggMax · LiggMax · commit 0725e398e284 · 2026-07-09T08:38:00.000+08:00
diff --git a/common/src/main/java/com/ligg/common/entity/UserEpisodeWatchEntity.java b/common/src/main/java/com/ligg/common/entity/UserEpisodeWatchEntity.java
@@ -0,0 +1,38 @@
+package com.ligg.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@TableName("user_episode_watch")
+public class UserEpisodeWatchEntity {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Long userId;
+
+    private Integer subjectId;
+
+    private Integer episodeId;
+
+    /**
+     * 0 未看，1 已看。
+     */
+    private Integer watchStatus;
+
+    /**
+     * 首次标记已看的时间。
+     */
+    private LocalDateTime watchedAt;
+
+    private LocalDateTime updateTime;
+
+    private LocalDateTime createTime;
+}
diff --git a/common/src/main/java/com/ligg/common/thirdparty/bangumi/response/SubjectEpisodesDto.java b/common/src/main/java/com/ligg/common/thirdparty/bangumi/response/SubjectEpisodesDto.java
@@ -1,6 +1,7 @@
 package com.ligg.common.thirdparty.bangumi.response;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -31,5 +32,7 @@ public static class Episode {
         private String airdate;
         private Integer comment;
         private String desc;
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        private Boolean watched;
     }
 }
diff --git a/flow-client/src/main/java/com/ligg/flowclient/controller/FlowUserController.java b/flow-client/src/main/java/com/ligg/flowclient/controller/FlowUserController.java
@@ -11,8 +11,10 @@
 import com.ligg.flowclient.annotation.IpEndpointRateLimit;
 import com.ligg.flowclient.interceptor.AuthorizationInterceptor;
 import com.ligg.flowclient.module.dto.UpdateUserCollectionDto;
+import com.ligg.flowclient.module.dto.UpdateEpisodeWatchDto;
 import com.ligg.flowclient.module.dto.UpdateUserDto;
 import com.ligg.flowclient.module.vo.FlowUserVo;
+import com.ligg.flowclient.module.vo.SubjectEpisodeWatchStatusVo;
 import com.ligg.common.vo.bangumi.UserCollectionsVo;
 import com.ligg.flowclient.module.vo.UserBgmCollectionSyncStatusVo;
 import com.ligg.flowclient.service.*;
@@ -36,6 +38,8 @@ public class FlowUserController {
 
     private final JwtTokenService jwtTokenService;
 
+    private final UserEpisodeWatchService userEpisodeWatchService;
+
     /**
      * 获取当前登录用户信息（需携带 AnimeFlow access_token）。
      */
@@ -104,6 +108,29 @@ public Result<Void> updateCollection(
         return Result.success();
     }
 
+    /**
+     * 标记当前用户某一集已看/未看。
+     */
+    @PutMapping("/episodes/{episodeId}/watch")
+    public Result<Void> updateEpisodeWatch(
+            @RequestAttribute(AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE) String accessToken,
+            @PathVariable int episodeId,
+            @Valid @RequestBody UpdateEpisodeWatchDto body) {
+        userEpisodeWatchService.updateEpisodeWatch(accessToken, episodeId, body);
+        return Result.success();
+    }
+
+    /**
+     * 获取当前用户对某部作品的已看剧集列表。
+     */
+    @GetMapping("/subjects/{subjectId}/episodes/watch-status")
+    public Result<SubjectEpisodeWatchStatusVo> getSubjectEpisodeWatchStatus(
+            @RequestAttribute(AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE) String accessToken,
+            @PathVariable int subjectId) {
+        SubjectEpisodeWatchStatusVo vo = userEpisodeWatchService.getSubjectWatchStatus(accessToken, subjectId);
+        return Result.success(ResponseCode.SUCCESS, vo);
+    }
+
     /**
      * 提交 Bangumi 收藏同步任务（异步执行，立即返回任务状态）。
      * 从 user_oauth 读取 Bangumi token 拉取收藏并写入 user_bgm_collection。
diff --git a/flow-client/src/main/java/com/ligg/flowclient/controller/bangumi/SubjectsController.java b/flow-client/src/main/java/com/ligg/flowclient/controller/bangumi/SubjectsController.java
@@ -54,8 +54,18 @@ public class SubjectsController {
     public Result<SubjectEpisodesVo> subjectEpisodes(
             @NotNull @PathVariable int subjectId,
             @RequestParam(defaultValue = "100") int limit,
-            @RequestParam(defaultValue = "0") int offset) {
-        SubjectEpisodesDto dto = bangumiService.getEpisodes(subjectId, limit, offset);
+            @RequestParam(defaultValue = "0") int offset,
+            @RequestAttribute(name = AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE, required = false)
+            String flowAccessToken) {
+        long userId = 0;
+        if (StringUtils.hasText(flowAccessToken)) {
+            try {
+                userId = jwtTokenService.validateAccessToken(flowAccessToken);
+            } catch (LoginExpiredException ignored) {
+                // token 无效时回退匿名访问
+            }
+        }
+        SubjectEpisodesDto dto = bangumiService.getEpisodes(subjectId, limit, offset, userId);
         SubjectEpisodesVo vo = new SubjectEpisodesVo();
         BeanUtils.copyProperties(dto, vo);
         return Result.success(ResponseCode.SUCCESS, vo);
diff --git a/flow-client/src/main/java/com/ligg/flowclient/mapper/UserEpisodeWatchMapper.java b/flow-client/src/main/java/com/ligg/flowclient/mapper/UserEpisodeWatchMapper.java
@@ -0,0 +1,9 @@
+package com.ligg.flowclient.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ligg.common.entity.UserEpisodeWatchEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserEpisodeWatchMapper extends BaseMapper<UserEpisodeWatchEntity> {
+}
diff --git a/flow-client/src/main/java/com/ligg/flowclient/module/dto/UpdateEpisodeWatchDto.java b/flow-client/src/main/java/com/ligg/flowclient/module/dto/UpdateEpisodeWatchDto.java
@@ -0,0 +1,11 @@
+package com.ligg.flowclient.module.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class UpdateEpisodeWatchDto {
+
+    @NotNull
+    private Boolean watched;
+}
diff --git a/flow-client/src/main/java/com/ligg/flowclient/module/vo/SubjectEpisodeWatchStatusVo.java b/flow-client/src/main/java/com/ligg/flowclient/module/vo/SubjectEpisodeWatchStatusVo.java
@@ -0,0 +1,15 @@
+package com.ligg.flowclient.module.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class SubjectEpisodeWatchStatusVo {
+
+    private Integer subjectId;
+
+    private List<Long> watchedEpisodeIds;
+}
diff --git a/flow-client/src/main/java/com/ligg/flowclient/service/BangumiService.java b/flow-client/src/main/java/com/ligg/flowclient/service/BangumiService.java
@@ -17,7 +17,7 @@ public interface BangumiService {
     /**
      * 获取番剧剧集列表
      */
-    SubjectEpisodesDto getEpisodes(Integer subjectId, int limit, int offset);
+    SubjectEpisodesDto getEpisodes(Integer subjectId, int limit, int offset, long userId);
 
     /**
      * 获取搜索建议
diff --git a/flow-client/src/main/java/com/ligg/flowclient/service/UserEpisodeWatchService.java b/flow-client/src/main/java/com/ligg/flowclient/service/UserEpisodeWatchService.java
@@ -0,0 +1,15 @@
+package com.ligg.flowclient.service;
+
+import com.ligg.flowclient.module.dto.UpdateEpisodeWatchDto;
+import com.ligg.flowclient.module.vo.SubjectEpisodeWatchStatusVo;
+
+import java.util.Set;
+
+public interface UserEpisodeWatchService {
+
+    void updateEpisodeWatch(String accessToken, int episodeId, UpdateEpisodeWatchDto dto);
+
+    SubjectEpisodeWatchStatusVo getSubjectWatchStatus(String accessToken, int subjectId);
+
+    Set<Long> listWatchedEpisodeIds(long userId, int subjectId);
+}
diff --git a/flow-client/src/main/java/com/ligg/flowclient/service/impl/BangumiServiceImpl.java b/flow-client/src/main/java/com/ligg/flowclient/service/impl/BangumiServiceImpl.java
@@ -59,6 +59,7 @@ public class BangumiServiceImpl implements BangumiService {
     private final ObjectMapper objectMapper;
     private final ImageBackfillService imageBackfillService;
     private final UserBgmCollectionMapper userBgmCollectionMapper;
+    private final UserEpisodeWatchService userEpisodeWatchService;
 
     /**
      * 条目详情
@@ -224,7 +225,7 @@ private static SubjectDetailDto.SubjectInterest getInterest(UserSubjectInterestR
     }
 
     @Override
-    public SubjectEpisodesDto getEpisodes(Integer subjectId, int limit, int offset) {
+    public SubjectEpisodesDto getEpisodes(Integer subjectId, int limit, int offset, long userId) {
         SubjectEpisodesDto dto = new SubjectEpisodesDto();
         if (subjectId == null) {
             dto.setData(Collections.emptyList());
@@ -245,11 +246,20 @@ public SubjectEpisodesDto getEpisodes(Integer subjectId, int limit, int offset)
         IPage<BangumiEpisodeEntity> page = episodeMapper.selectPage(new LimitOffsetPage<>(limit, offset), wrapper);
 
         dto.setTotal((int) page.getTotal());
-        dto.setData(page.getRecords().stream().map(this::toEpisode).toList());
+        Set<Long> watchedEpisodeIds = userId > 0
+                ? userEpisodeWatchService.listWatchedEpisodeIds(userId, subjectId)
+                : Collections.emptySet();
+        boolean includeWatched = userId > 0;
+        dto.setData(page.getRecords().stream()
+                .map(entity -> toEpisode(entity, watchedEpisodeIds, includeWatched))
+                .toList());
         return dto;
     }
 
-    private SubjectEpisodesDto.Episode toEpisode(BangumiEpisodeEntity entity) {
+    private SubjectEpisodesDto.Episode toEpisode(
+            BangumiEpisodeEntity entity,
+            Set<Long> watchedEpisodeIds,
+            boolean includeWatched) {
         SubjectEpisodesDto.Episode episode = new SubjectEpisodesDto.Episode();
         episode.setId(entity.getId().longValue());
         episode.setSubjectId(entity.getSubjectId());
@@ -261,6 +271,9 @@ private SubjectEpisodesDto.Episode toEpisode(BangumiEpisodeEntity entity) {
         episode.setDuration(entity.getDuration());
         episode.setAirdate(entity.getAirdate());
         episode.setDesc(entity.getDescription());
+        if (includeWatched) {
+            episode.setWatched(watchedEpisodeIds.contains(entity.getId().longValue()));
+        }
         return episode;
     }
 
diff --git a/flow-client/src/main/java/com/ligg/flowclient/service/impl/UserEpisodeWatchServiceImpl.java b/flow-client/src/main/java/com/ligg/flowclient/service/impl/UserEpisodeWatchServiceImpl.java
@@ -0,0 +1,142 @@
+package com.ligg.flowclient.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ligg.common.entity.BangumiEpisodeEntity;
+import com.ligg.common.entity.UserBgmCollectionEntity;
+import com.ligg.common.entity.UserEpisodeWatchEntity;
+import com.ligg.flowclient.mapper.BangumiEpisodeMapper;
+import com.ligg.flowclient.mapper.UserBgmCollectionMapper;
+import com.ligg.flowclient.mapper.UserEpisodeWatchMapper;
+import com.ligg.flowclient.module.dto.UpdateEpisodeWatchDto;
+import com.ligg.flowclient.module.vo.SubjectEpisodeWatchStatusVo;
+import com.ligg.flowclient.service.JwtTokenService;
+import com.ligg.flowclient.service.UserEpisodeWatchService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+@Service
+@RequiredArgsConstructor
+public class UserEpisodeWatchServiceImpl implements UserEpisodeWatchService {
+
+    private static final int WATCH_STATUS_UNWATCHED = 0;
+    private static final int WATCH_STATUS_WATCHED = 1;
+    private static final int EPISODE_TYPE_MAIN = 0;
+
+    private final JwtTokenService jwtTokenService;
+    private final BangumiEpisodeMapper bangumiEpisodeMapper;
+    private final UserEpisodeWatchMapper userEpisodeWatchMapper;
+    private final UserBgmCollectionMapper userBgmCollectionMapper;
+
+    @Override
+    public void updateEpisodeWatch(String accessToken, int episodeId, UpdateEpisodeWatchDto dto) {
+        Long userId = jwtTokenService.validateAccessToken(accessToken);
+        BangumiEpisodeEntity episode = bangumiEpisodeMapper.selectById(episodeId);
+        if (episode == null) {
+            throw new IllegalArgumentException("剧集不存在");
+        }
+
+        UserEpisodeWatchEntity existing = userEpisodeWatchMapper.selectOne(
+                new LambdaQueryWrapper<UserEpisodeWatchEntity>()
+                        .eq(UserEpisodeWatchEntity::getUserId, userId)
+                        .eq(UserEpisodeWatchEntity::getEpisodeId, episodeId)
+                        .last("LIMIT 1"));
+
+        if (Boolean.TRUE.equals(dto.getWatched())) {
+            upsertWatched(userId, episode, existing);
+        } else if (existing != null) {
+            existing.setWatchStatus(WATCH_STATUS_UNWATCHED);
+            userEpisodeWatchMapper.updateById(existing);
+        }
+
+        refreshCollectionEpisodeProgress(userId, episode.getSubjectId());
+    }
+
+    @Override
+    public SubjectEpisodeWatchStatusVo getSubjectWatchStatus(String accessToken, int subjectId) {
+        Long userId = jwtTokenService.validateAccessToken(accessToken);
+        List<Long> watchedEpisodeIds = listWatchedEpisodeIds(userId, subjectId).stream().toList();
+        return new SubjectEpisodeWatchStatusVo(subjectId, watchedEpisodeIds);
+    }
+
+    @Override
+    public Set<Long> listWatchedEpisodeIds(long userId, int subjectId) {
+        if (userId <= 0 || subjectId <= 0) {
+            return Collections.emptySet();
+        }
+        List<UserEpisodeWatchEntity> rows = userEpisodeWatchMapper.selectList(
+                new LambdaQueryWrapper<UserEpisodeWatchEntity>()
+                        .select(UserEpisodeWatchEntity::getEpisodeId)
+                        .eq(UserEpisodeWatchEntity::getUserId, userId)
+                        .eq(UserEpisodeWatchEntity::getSubjectId, subjectId)
+                        .eq(UserEpisodeWatchEntity::getWatchStatus, WATCH_STATUS_WATCHED)
+                        .orderByAsc(UserEpisodeWatchEntity::getEpisodeId));
+        Set<Long> watchedEpisodeIds = new LinkedHashSet<>(rows.size());
+        for (UserEpisodeWatchEntity row : rows) {
+            watchedEpisodeIds.add(row.getEpisodeId().longValue());
+        }
+        return watchedEpisodeIds;
+    }
+
+    private void upsertWatched(Long userId, BangumiEpisodeEntity episode, UserEpisodeWatchEntity existing) {
+        if (existing != null) {
+            existing.setWatchStatus(WATCH_STATUS_WATCHED);
+            if (existing.getWatchedAt() == null) {
+                existing.setWatchedAt(LocalDateTime.now());
+            }
+            userEpisodeWatchMapper.updateById(existing);
+            return;
+        }
+
+        UserEpisodeWatchEntity row = new UserEpisodeWatchEntity();
+        row.setUserId(userId);
+        row.setSubjectId(episode.getSubjectId());
+        row.setEpisodeId(episode.getId());
+        row.setWatchStatus(WATCH_STATUS_WATCHED);
+        row.setWatchedAt(LocalDateTime.now());
+        userEpisodeWatchMapper.insert(row);
+    }
+
+    /**
+     * 维护 user_bgm_collection.ep_status，表示按正片顺序连续看完的话数。
+     */
+    private void refreshCollectionEpisodeProgress(Long userId, Integer subjectId) {
+        UserBgmCollectionEntity collection = userBgmCollectionMapper.selectOne(
+                new LambdaQueryWrapper<UserBgmCollectionEntity>()
+                        .eq(UserBgmCollectionEntity::getUserId, userId)
+                        .eq(UserBgmCollectionEntity::getSubjectId, subjectId)
+                        .last("LIMIT 1"));
+        if (collection == null) {
+            return;
+        }
+
+        List<BangumiEpisodeEntity> mainEpisodes = bangumiEpisodeMapper.selectList(
+                new LambdaQueryWrapper<BangumiEpisodeEntity>()
+                        .select(BangumiEpisodeEntity::getId, BangumiEpisodeEntity::getSort)
+                        .eq(BangumiEpisodeEntity::getSubjectId, subjectId)
+                        .eq(BangumiEpisodeEntity::getType, EPISODE_TYPE_MAIN)
+                        .orderByAsc(BangumiEpisodeEntity::getSort)
+                        .orderByAsc(BangumiEpisodeEntity::getId));
+
+        Set<Long> watchedEpisodeIds = listWatchedEpisodeIds(userId, subjectId);
+        int contiguousWatchedCount = 0;
+        for (BangumiEpisodeEntity mainEpisode : mainEpisodes) {
+            if (!watchedEpisodeIds.contains(mainEpisode.getId().longValue())) {
+                break;
+            }
+            contiguousWatchedCount++;
+        }
+
+        userBgmCollectionMapper.update(
+                null,
+                new LambdaUpdateWrapper<UserBgmCollectionEntity>()
+                        .eq(UserBgmCollectionEntity::getId, collection.getId())
+                        .set(UserBgmCollectionEntity::getEpStatus, contiguousWatchedCount));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.ligg.common.thirdparty.bangumi.response;`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonIgnoreProperties;`
	`4`	`+import com.fasterxml.jackson.annotation.JsonInclude;`
`4`	`5`	`import com.fasterxml.jackson.annotation.JsonProperty;`
`5`	`6`	`import lombok.Data;`
`6`	`7`
`@@ -31,5 +32,7 @@ public static class Episode {`
`31`	`32`	`private String airdate;`
`32`	`33`	`private Integer comment;`
`33`	`34`	`private String desc;`
	`35`	`+ @JsonInclude(JsonInclude.Include.NON_NULL)`
	`36`	`+ private Boolean watched;`
`34`	`37`	`}`
`35`	`38`	`}`