feat(D2): 导入进度跨节点可见(NodeSharedStore:本地快路径 + Redis 真源)

- 新增 common/service/NodeSharedStore:本地 Map 快路径 + Redis 跨节点真源 + 写节流
  (默认 500ms,逐行刷新进度不会打爆 Redis)+ 本节点条目快照(维护用)+ TTL 兜底过期
- 接入 DedupeTotalDataService(8 个进度/归属/分组/完成时间映射)、QueryAsinService、
  SkipPriceAsinService(各 3 个):轮询落到另一节点不再报"任务不存在"
- 保留期清理改为遍历本节点快照(跨节点过期由 Redis TTL 兜底),不再依赖全量遍历
- 测试同步:去重服务测试的反射注入改用 NodeSharedStore(未注入 Redis 时等价纯本地)

mvn test 2815 全绿
This commit is contained in:
2026-09-14 06:54:48 +08:00
parent f4ee7e16f0
commit af7886926c
5 changed files with 188 additions and 66 deletions
@@ -7,6 +7,7 @@ import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.dedupe.mapper.DedupeTotalDataMapper;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataCreateRequest;
import com.nanri.aiimage.modules.dedupe.model.entity.DedupeTotalDataEntity;
import com.nanri.aiimage.common.service.NodeSharedStore;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataImportProgressVo;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataItemVo;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataPageVo;
@@ -481,38 +482,45 @@ class DedupeTotalDataServiceTest {
@Test
@SuppressWarnings("unchecked")
void expiredCompletedProgressIsRemovedOnNextLookup() {
Map<String, DedupeTotalDataImportProgressVo> progressMap =
(Map<String, DedupeTotalDataImportProgressVo>) ReflectionTestUtils.getField(service, "importProgressMap");
Map<String, Long> ownerMap = (Map<String, Long>) ReflectionTestUtils.getField(service, "importOwnerMap");
Map<String, Long> groupMap = (Map<String, Long>) ReflectionTestUtils.getField(service, "importGroupMap");
Map<String, Long> completedAtMap =
(Map<String, Long>) ReflectionTestUtils.getField(service, "importCompletedAtMap");
NodeSharedStore<String, DedupeTotalDataImportProgressVo> progressStore =
(NodeSharedStore<String, DedupeTotalDataImportProgressVo>) ReflectionTestUtils.getField(service, "importProgressMap");
NodeSharedStore<String, Long> ownerStore =
(NodeSharedStore<String, Long>) ReflectionTestUtils.getField(service, "importOwnerMap");
NodeSharedStore<String, Long> groupStore =
(NodeSharedStore<String, Long>) ReflectionTestUtils.getField(service, "importGroupMap");
NodeSharedStore<String, Long> completedAtStore =
(NodeSharedStore<String, Long>) ReflectionTestUtils.getField(service, "importCompletedAtMap");
DedupeTotalDataImportProgressVo progress = new DedupeTotalDataImportProgressVo();
progress.setStatus("success");
progressMap.put("expired", progress);
ownerMap.put("expired", 23L);
groupMap.put("expired", 7L);
completedAtMap.put("expired", System.currentTimeMillis() - (2 * 60 * 60 * 1000L));
progressStore.put("expired", progress);
ownerStore.put("expired", 23L);
groupStore.put("expired", 7L);
completedAtStore.put("expired", System.currentTimeMillis() - (2 * 60 * 60 * 1000L));
assertThrows(BusinessException.class, () -> service.getImportProgress("expired", 23L));
assertFalse(progressMap.containsKey("expired"));
assertFalse(ownerMap.containsKey("expired"));
assertFalse(groupMap.containsKey("expired"));
assertFalse(completedAtMap.containsKey("expired"));
assertFalse(progressStore.containsKey("expired"));
assertFalse(ownerStore.containsKey("expired"));
assertFalse(groupStore.containsKey("expired"));
assertFalse(completedAtStore.containsKey("expired"));
}
/**
* 直接注入导入进度状态(D2 后由 NodeSharedStore 承载:测试里未注入 Redis,等价于纯本地)。
*/
@SuppressWarnings("unchecked")
private DedupeTotalDataImportProgressVo registerImportProgress(String importId, Long ownerId, Long groupId) {
Map<String, DedupeTotalDataImportProgressVo> progressMap =
(Map<String, DedupeTotalDataImportProgressVo>) ReflectionTestUtils.getField(service, "importProgressMap");
Map<String, Long> ownerMap = (Map<String, Long>) ReflectionTestUtils.getField(service, "importOwnerMap");
Map<String, Long> groupMap = (Map<String, Long>) ReflectionTestUtils.getField(service, "importGroupMap");
NodeSharedStore<String, DedupeTotalDataImportProgressVo> progressStore =
(NodeSharedStore<String, DedupeTotalDataImportProgressVo>) ReflectionTestUtils.getField(service, "importProgressMap");
NodeSharedStore<String, Long> ownerStore =
(NodeSharedStore<String, Long>) ReflectionTestUtils.getField(service, "importOwnerMap");
NodeSharedStore<String, Long> groupStore =
(NodeSharedStore<String, Long>) ReflectionTestUtils.getField(service, "importGroupMap");
DedupeTotalDataImportProgressVo progress = new DedupeTotalDataImportProgressVo();
progress.setStatus("running");
progressMap.put(importId, progress);
ownerMap.put(importId, ownerId);
groupMap.put(importId, groupId);
progressStore.put(importId, progress);
ownerStore.put(importId, ownerId);
groupStore.put(importId, groupId);
return progress;
}