fix(backend-java): 收口并发资源与恢复链路

This commit is contained in:
2026-09-05 14:33:07 +08:00
parent 5a00201931
commit 0bf39b04db
35 changed files with 917 additions and 154 deletions
@@ -75,15 +75,16 @@ public class CollectDataBrandBatchFilter {
List<String> batchBrands = distinctNonBlank(batch.stream()
.filter(row -> row != null)
.map(CollectDataResultRowVo::getBrand).toList());
Map<String, String> cachedVerdicts = snapshotVerdicts(batchBrands);
List<String> uncachedBrands = new ArrayList<>();
for (String brand : batchBrands) {
if (!verdictCache.containsKey(normalizeBrand(brand))) {
if (!cachedVerdicts.containsKey(normalizeBrand(brand))) {
uncachedBrands.add(brand);
}
}
if (uncachedBrands.isEmpty() && !batchBrands.isEmpty()) {
// 本批次品牌全部命中缓存,无需远程调用。
classify(batch, verdictCache, rejected, queryFailed, accepted);
classify(batch, cachedVerdicts, rejected, queryFailed, accepted);
continue;
}
if (batchBrands.isEmpty()) {
@@ -95,14 +96,7 @@ public class CollectDataBrandBatchFilter {
}
continue;
}
Map<String, String> batchVerdicts = new LinkedHashMap<>();
for (String brand : batchBrands) {
String normalized = normalizeBrand(brand);
String cached = verdictCache.get(normalized);
if (cached != null) {
batchVerdicts.put(normalized, cached);
}
}
Map<String, String> batchVerdicts = new LinkedHashMap<>(cachedVerdicts);
try {
batchVerdicts.putAll(checkAndCache(uncachedBrands));
} catch (RuntimeException ex) {
@@ -141,15 +135,38 @@ public class CollectDataBrandBatchFilter {
return verdicts;
}
private void putBounded(String brand, String verdict) {
if (verdictCache.containsKey(brand)) {
return;
private Map<String, String> snapshotVerdicts(List<String> brands) {
Map<String, String> snapshot = new LinkedHashMap<>();
if (brands == null || brands.isEmpty()) {
return snapshot;
}
verdictCache.put(brand, verdict);
if (verdictCache.size() > cacheCapacity) {
var it = verdictCache.entrySet().iterator();
it.next();
it.remove();
synchronized (verdictCache) {
for (String brand : brands) {
String normalized = normalizeBrand(brand);
if (!normalized.isBlank()) {
String verdict = verdictCache.get(normalized);
if (verdict != null) {
snapshot.put(normalized, verdict);
}
}
}
}
return snapshot;
}
private void putBounded(String brand, String verdict) {
synchronized (verdictCache) {
if (verdictCache.containsKey(brand)) {
return;
}
verdictCache.put(brand, verdict);
if (verdictCache.size() > cacheCapacity) {
var it = verdictCache.entrySet().iterator();
if (it.hasNext()) {
it.next();
it.remove();
}
}
}
}