feat(BangumiService): add getSubjectInfo method and refactor related functionality

LiggMax · LiggMax · commit 29b7e4ec86ba · 2026-07-02T03:52:57.000+08:00
diff --git a/common/src/main/java/com/ligg/common/thirdparty/bangumi/response/SubjectDetailDto.java b/common/src/main/java/com/ligg/common/thirdparty/bangumi/response/SubjectDetailDto.java
@@ -88,14 +88,14 @@ public static class SubjectTag {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class SubjectInterest {
         private Long id;
-        private Integer rate;
+        private Integer rate = 0;
         private Integer type;
-        private String comment;
-        private List<String> tags;
-        private Integer epStatus;
-        private Integer volStatus;
+        private String comment = "";
+        private List<String> tags = List.of();
+        private Integer epStatus = 0;
+        private Integer volStatus = 0;
         @JsonProperty("private")
-        private Boolean privately;
+        private Boolean privately = false;
         private Long updatedAt;
     }
 }
diff --git a/common/src/main/java/com/ligg/common/utils/InfoboxParser.java b/common/src/main/java/com/ligg/common/utils/InfoboxParser.java
@@ -2,6 +2,7 @@
 
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -12,20 +13,6 @@
 
 /**
  * Bangumi wiki 原始字符串（infobox）解析工具。
- *
- * <pre>
- * 输入示例:
- * {{Infobox animanga/TVAnime
- * |中文名= 呪術廻戦
- * |话数= 24
- * |放送开始= 2020年10月2日
- * |导演= 朴性厚
- * |原作= 芥見下々
- * |人物设定= 平松禎史
- * }}
- *
- * 输出 info 示例: "24话 / 2020年10月2日 / 朴性厚 / 芥見下々 / 平松禎史"
- * </pre>
  */
 public final class InfoboxParser {
 
@@ -88,4 +75,62 @@ public static String toInfo(String infobox) {
                 .filter(StringUtils::hasText)
                 .collect(Collectors.joining(" / "));
     }
+
+    /**
+     * 将 infobox wiki 字符串解析为 key → 多值列表，同时处理单行和多行（{…}）值。
+     * <pre>
+     * 单行：|话数= 25          → "话数" → ["25"]
+     * 多行：|别名={            → "别名" → ["叛逆的鲁路修R2", "Code Geass: ..."]
+     *         [叛逆的鲁路修R2]
+     *         [Code Geass: ...]
+     *       }
+     * </pre>
+     */
+    public static Map<String, List<String>> toEntries(String infobox) {
+        if (!StringUtils.hasText(infobox)) {
+            return Collections.emptyMap();
+        }
+        Map<String, List<String>> entries = new LinkedHashMap<>();
+        String[] lines = infobox.split("\\R");
+        String currentKey = null;
+        boolean inBlock = false;
+
+        for (String line : lines) {
+            String trimmed = line.trim();
+            if (trimmed.equals("}}")) {
+                break;
+            }
+            if (trimmed.startsWith("{{")) {
+                continue;
+            }
+            if (inBlock) {
+                if (trimmed.equals("}")) {
+                    inBlock = false;
+                    currentKey = null;
+                    continue;
+                }
+                // 多行值：去掉首尾的 [ ]
+                if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+                    String v = trimmed.substring(1, trimmed.length() - 1).trim();
+                    if (!v.isEmpty()) {
+                        entries.get(currentKey).add(v);
+                    }
+                }
+                continue;
+            }
+            Matcher m = INFOBOX_LINE.matcher(trimmed);
+            if (m.matches()) {
+                currentKey = m.group(1).trim();
+                String value = m.group(2).trim();
+                if (value.equals("{")) {
+                    inBlock = true;
+                    entries.put(currentKey, new ArrayList<>());
+                } else {
+                    entries.put(currentKey, new ArrayList<>(List.of(value)));
+                    currentKey = null;
+                }
+            }
+        }
+        return Collections.unmodifiableMap(entries);
+    }
 }
diff --git a/flow-bootstrap/src/main/resources/application.yaml b/flow-bootstrap/src/main/resources/application.yaml
@@ -54,7 +54,7 @@ anime-flow:
 
   sync:
     archive:
-      enabled: true
+      enabled: false
       run-on-startup-if-missing: true
       latest-url: https://raw.githubusercontent.com/openAnimeFlow/animeFlow-assets/main/archive/latest.json
       cron: "0 0 3 * * *"
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
@@ -322,32 +322,15 @@ public Result<SubjectDetailVo> subjectDetail(
             @NotNull @PathVariable int subjectId,
             @RequestAttribute(name = AuthorizationInterceptor.ACCESS_TOKEN_REQUEST_ATTRIBUTE, required = false)
             String flowAccessToken) {
+        long userId = 0;
         if (StringUtils.hasText(flowAccessToken)) {
             try {
-                Long userId = jwtTokenService.validateAccessToken(flowAccessToken);
-                UserOauthEntity oauth = bangumiOAuthTokenService.findBangumiOauth(userId);
-                if (oauth != null) {
-                    SubjectDetailDto dto = bangumiOAuthExecutor.execute(oauth,
-                            bangumiToken -> bangumiClient.getSubject(subjectId, bangumiToken));
-                    return Result.success(ResponseCode.SUCCESS, toSubjectDetailVo(dto));
-                }
+                userId = jwtTokenService.validateAccessToken(flowAccessToken);
             } catch (LoginExpiredException ignored) {
-                // token 无效或未绑定 Bangumi，回退公开缓存逻辑
+               // 未登录，回退公开访问
             }
         }
-
-        String cacheKey = BangumiConstants.BANGUMI_SUBJECT_DETAIL_CACHE_KEY_PREFIX + ':' + subjectId;
-        SubjectDetailVo vo = bangumiCacheService.getOrLoad(
-                cacheKey,
-                BangumiCacheService.lockKey(cacheKey),
-                SubjectDetailVo.class,
-                BangumiConstants.BANGUMI_SUBJECT_DETAIL_CACHE_TTL_SECONDS,
-                "获取条目详情超时，请稍后重试",
-                "获取条目详情被中断",
-                () -> toSubjectDetailVo(bangumiClient.getSubject(subjectId, null)),
-                SubjectsController::shouldCacheSubjectDetail,
-                () -> log.info("条目详情(命中缓存), subjectId={}", subjectId));
-        return Result.success(ResponseCode.SUCCESS, vo);
+        return Result.success(ResponseCode.SUCCESS, bangumiService.getSubjectInfo(subjectId, userId));
     }
 
     /**
diff --git a/flow-client/src/main/java/com/ligg/flowclient/mapper/UserBgmCollectionMapper.java b/flow-client/src/main/java/com/ligg/flowclient/mapper/UserBgmCollectionMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ligg.common.entity.UserBgmCollectionEntity;
 import com.ligg.flowclient.module.dto.UserBgmCollectionRow;
+import com.ligg.flowclient.module.dto.UserSubjectInterestRow;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +21,11 @@ List<UserBgmCollectionRow> selectPageByUserFilter(@Param("userId") Long userId,
                                                       @Param("subjectType") int subjectType,
                                                       @Param("limit") int limit,
                                                       @Param("offset") int offset);
+
+    /**
+     * 获取用户条目评价
+     */
+    UserSubjectInterestRow selectUserSubjectInterest(@Param("userId") Long userId,
+                                                    @Param("subjectId") Integer subjectId);
+
 }
diff --git a/flow-client/src/main/java/com/ligg/flowclient/module/dto/UserSubjectInterestRow.java b/flow-client/src/main/java/com/ligg/flowclient/module/dto/UserSubjectInterestRow.java
@@ -0,0 +1,26 @@
+/**
+ * @author Ligg
+ * @date 2026/7/2 02:48
+ */
+package com.ligg.flowclient.module.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserSubjectInterestRow {
+    private Long id;
+    private Integer rate;
+    private Integer type;
+    private String comment;
+    private List<String> tags;
+    private Integer epStatus;
+    private Integer volStatus;
+    private Boolean privately;
+    private Long bgmUpdatedAt;
+}
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
@@ -4,10 +4,16 @@
 import com.ligg.common.thirdparty.bangumi.response.SubjectEpisodesDto;
 import com.ligg.common.thirdparty.bangumi.response.SubjectsDto;
 import com.ligg.common.vo.bangumi.SearchSuggestionsVo;
+import com.ligg.common.vo.bangumi.SubjectDetailVo;
 import com.ligg.common.vo.bangumi.SubjectRelationsVo;
 
 public interface BangumiService {
 
+    /**
+     * 条目详情
+     */
+    SubjectDetailVo getSubjectInfo(Integer subjectId, long userId);
+
     /**
      * 获取番剧剧集列表
      */
@@ -28,5 +34,5 @@ public interface BangumiService {
     /**
      * 获取关联条目
      */
-    SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int offset,int type, String bangumiAccessToken);
+    SubjectRelationsVo getRelatedSubjects(Integer subjectId, int limit, int offset, int type, String bangumiAccessToken);
 }
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
diff --git a/flow-client/src/main/resources/mapper/UserBgmCollectionMapper.xml b/flow-client/src/main/resources/mapper/UserBgmCollectionMapper.xml
