yescent/par
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 批量解析过滤无URL旧数据，解析失败或内容为空时返回明确消息

Browse Source
This commit is contained in:
mediabot-pt
2026-07-01 09:26:17 +08:00
parent 71fbf90ad7
commit daa84cf82a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
par-api/src/main/java/com/par/api/controller/AdapterController.java
View File

@@ -103,11 +103,12 @@ public class AdapterController {
try { adapterConfig = objectMapper.readValue(configJson, AdapterConfig.class); } try { adapterConfig = objectMapper.readValue(configJson, AdapterConfig.class); }
catch (Exception e) { return ApiResponse.error(400, "配置格式无效: " + e.getMessage()); } catch (Exception e) { return ApiResponse.error(400, "配置格式无效: " + e.getMessage()); }
// 获取该站点所有结果，按URL分组取最新 // 获取该站点所有结果，按URL分组取最新（过滤无URL的旧数据）
List<AccessResult> allResults = accessResultMapper.selectBySiteId(siteId); List<AccessResult> allResults = accessResultMapper.selectBySiteId(siteId);
Map<String, AccessResult> latestByUrl = allResults.stream() Map<String, AccessResult> latestByUrl = allResults.stream()
.filter(r -> r.getUrl() != null && !r.getUrl().isBlank())
.collect(Collectors.toMap( .collect(Collectors.toMap(
r -> r.getUrl() != null && !r.getUrl().isBlank() ? r.getUrl() : "(未指定URL)", AccessResult::getUrl,
r -> r, r -> r,
(a, b) -> a.getCreatedAt().isAfter(b.getCreatedAt()) ? a : b)); (a, b) -> a.getCreatedAt().isAfter(b.getCreatedAt()) ? a : b));
@@ -125,6 +126,7 @@ public class AdapterController {
Map<String, Object> item = new LinkedHashMap<>(); Map<String, Object> item = new LinkedHashMap<>();
item.put("url", url); item.put("url", url);
item.put("accessResultId", ar.getId()); item.put("accessResultId", ar.getId());
item.put("contentType", ar.getContentType());
item.put("statusCode", ar.getStatusCode()); item.put("statusCode", ar.getStatusCode());
item.put("responseTimeMs", ar.getResponseTimeMs()); item.put("responseTimeMs", ar.getResponseTimeMs());
item.put("createdAt", ar.getCreatedAt()); item.put("createdAt", ar.getCreatedAt());
@@ -139,9 +141,11 @@ public class AdapterController {
if (content != null) { if (content != null) {
Map<String, Object> parsed = adapterEngine.extract(adapterConfig, content, ar.getContentType(), url); Map<String, Object> parsed = adapterEngine.extract(adapterConfig, content, ar.getContentType(), url);
item.put("parsed", parsed); item.put("parsed", parsed);
} else {
item.put("parsed", Map.of("matched", false, "message", "内容为空，可能已从存储中删除"));
} }
} catch (Exception e) { } catch (Exception e) {
item.put("parseError", e.getMessage()); item.put("parsed", Map.of("matched", false, "message", "解析异常: " + e.getMessage()));
} }
pages.add(item); pages.add(item);