看板(心跳位置补进度): 跟价/定时匹配这类无快照的行不再恒画「—」
客户端心跳位置此前只喂 progress/light(客户端进度条),后台任务中心的进度列仍按 10-04 那条 「没分母就画 —」走,于是同一个在跑的跟价任务,客户端有条、看板是「—」。 - TaskCenterQueryService 注入位置服务:只对「无快照 + 不是行内已计数的三个模块 + 非终态」的行 批量读位置;这个判据抽成 wantsHeartbeatPosition 一处共用——收集与填充各写一遍的话, 改一处就会让另一处静默拿到 null,又退成「安静地没有条」 - 封顶与页大小同源(BOARD_POSITION_LOOKUPS=100):沿用 light 那个 20 的话,第 21 行之后的 在跑任务永远读不到进度 - 心跳新增 progressGrain 一并入库;看板按它把 units 的「国家数×1000 摊平当量」折算回自然计数, 否则管理员会读到「已完成 1222 / 总 5000」。客户端那条仍吃原始千分位(要的是平滑), 所以折算做成 Position#displayUnits() 显式一步,不是一处改两边 - 快照优先不变:位置只是执行器自述,服务端算出来的快照更权威 - 用例:displayUnits 折算/钳位/分母不塌 0、grain 存取、老客户端不报粒度按自然计数原样通过; 看板三例(在跑行用心跳、终态一次都不读、有快照不许被覆盖)。TaskCenterQueryServiceTest 37 例绿
This commit is contained in:
+65
@@ -58,6 +58,71 @@ class TaskHeartbeatPositionServiceTest {
|
||||
verify(stringRedisTemplate).expire(eq("task:heartbeat:position:123"), any(Duration.class));
|
||||
}
|
||||
|
||||
private static TaskHeartbeatPositionService.Position pos(int current, int total, String grain) {
|
||||
return new TaskHeartbeatPositionService.Position(current, total, "label", grain);
|
||||
}
|
||||
|
||||
/** 粒度名必须跟着位置一起存:看板要靠它判断这是「国家数×1000」的摊平当量还是自然计数。 */
|
||||
@Test
|
||||
void recordStoresGrainAlongsideCounts() {
|
||||
when(stringRedisTemplate.opsForHash()).thenReturn(hashOperations);
|
||||
TaskHeartbeatRequest request = new TaskHeartbeatRequest();
|
||||
request.setCurrent(1222);
|
||||
request.setTotal(5000);
|
||||
request.setProgressGrain("units");
|
||||
|
||||
service().record(123L, request);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
ArgumentCaptor<Map<String, String>> values = ArgumentCaptor.forClass(Map.class);
|
||||
verify(hashOperations).putAll(eq("task:heartbeat:position:123"), values.capture());
|
||||
assertEquals("units", values.getValue().get("grain"), "粒度丢了,看板就会把 5000 当自然总数显示");
|
||||
}
|
||||
|
||||
@Test
|
||||
void readPositionCarriesGrain() {
|
||||
when(stringRedisTemplate.opsForHash()).thenReturn(hashOperations);
|
||||
when(hashOperations.entries("task:heartbeat:position:123"))
|
||||
.thenReturn(Map.of("current", "1222", "total", "5000", "grain", "units"));
|
||||
|
||||
assertEquals("units", service().readPosition(123L).grain());
|
||||
}
|
||||
|
||||
/** 老客户端没报粒度:grain 为空串,displayUnits 就必须原样返回,不许把 3/9 折成 0/1。 */
|
||||
@Test
|
||||
void absentGrainIsTreatedAsNaturalCount() {
|
||||
when(stringRedisTemplate.opsForHash()).thenReturn(hashOperations);
|
||||
when(hashOperations.entries("task:heartbeat:position:123"))
|
||||
.thenReturn(Map.of("current", "3", "total", "9"));
|
||||
|
||||
TaskHeartbeatPositionService.Position position = service().readPosition(123L);
|
||||
|
||||
assertEquals("", position.grain());
|
||||
assertEquals(9, position.displayUnits().total());
|
||||
assertEquals(3, position.displayUnits().current());
|
||||
}
|
||||
|
||||
/**
|
||||
* 摊平当量与自然计数的折算分别走两条路:看板除以 1000,客户端进度条仍拿原始千分位。
|
||||
*
|
||||
* <p>这两条必须同时成立——只测折算会漏掉「客户端那条被误伤」,只测原始值会漏掉看板显示 1222/5000。
|
||||
*/
|
||||
@Test
|
||||
void displayUnitsCollapsesFlattenedScaleOnly() {
|
||||
assertEquals(5, pos(1222, 5000, "units").displayUnits().total());
|
||||
assertEquals(1, pos(1222, 5000, "units").displayUnits().current());
|
||||
assertEquals(1222, pos(1222, 5000, "units").drawable().current(), "客户端侧仍是千分位,不能一起折");
|
||||
assertEquals(9, pos(3, 9, "countries").displayUnits().total(), "国家计数原样用");
|
||||
assertEquals(50, pos(57000, 50000, "units").displayUnits().current(), "折算后也不许超过分母");
|
||||
}
|
||||
|
||||
/** 分母不足一个当量时至少给 1 格:0 会被前端读成「没有进度」,那是另一种说谎。 */
|
||||
@Test
|
||||
void displayUnitsNeverCollapsesTotalToZero() {
|
||||
assertEquals(1, pos(0, 999, "units").displayUnits().total());
|
||||
assertEquals(1, pos(998, 999, "units").displayUnits().total());
|
||||
}
|
||||
|
||||
@Test
|
||||
void readPositionReturnsStructuredNumbers() {
|
||||
when(stringRedisTemplate.opsForHash()).thenReturn(hashOperations);
|
||||
|
||||
+81
@@ -1,5 +1,6 @@
|
||||
package com.nanri.aiimage.modules.taskcenter.service;
|
||||
|
||||
import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService;
|
||||
import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper;
|
||||
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterCollectStatsRow;
|
||||
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterCountryRow;
|
||||
@@ -57,6 +58,7 @@ import static org.mockito.Mockito.when;
|
||||
class TaskCenterQueryServiceTest {
|
||||
|
||||
@Mock private TaskCenterQueryMapper queryMapper;
|
||||
@Mock private TaskHeartbeatPositionService positionService;
|
||||
@InjectMocks private TaskCenterQueryService service;
|
||||
|
||||
private static TaskCenterScopeService.ScopeContext superScope() {
|
||||
@@ -496,6 +498,85 @@ class TaskCenterQueryServiceTest {
|
||||
assertEquals(0L, vo.getProgressFailed());
|
||||
}
|
||||
|
||||
/**
|
||||
* 「执行器原本没进度条」的模块现在用心跳位置画进度。
|
||||
*
|
||||
* <p>units 那一档的读数是「国家数×1000」的摊平当量,看板必须折算——照原样显示会读出
|
||||
* 「已完成 1222 / 总 5000」,管理员只会问 5000 是什么。countries 是自然计数,原样用。
|
||||
*/
|
||||
@Test
|
||||
void runningRowWithoutSnapshotTakesProgressFromHeartbeatPosition() {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
TaskCenterTaskRow priceTrack = taskRow(1L, "PRICE_TRACK", "RUNNING", now, now);
|
||||
priceTrack.setTotalCount(1L);
|
||||
TaskCenterTaskRow shopMatch = taskRow(2L, "SHOP_MATCH", "RUNNING", now, now);
|
||||
shopMatch.setTotalCount(1L);
|
||||
|
||||
stubPage(List.of(priceTrack, shopMatch));
|
||||
when(queryMapper.selectSnapshots(any())).thenReturn(List.of());
|
||||
stubPublishShops(List.of());
|
||||
stubFileResultShops(List.of());
|
||||
when(positionService.readDrawablePositions(any(), org.mockito.ArgumentMatchers.anyInt()))
|
||||
.thenReturn(java.util.Map.of(
|
||||
1L, new TaskHeartbeatPositionService.Position(1222, 5000, "US 2/5", "units"),
|
||||
2L, new TaskHeartbeatPositionService.Position(3, 9, "shop A", "countries")));
|
||||
|
||||
TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery());
|
||||
|
||||
assertEquals(5L, item(page, 1L).getProgressTotal(), "units 读数必须折算回国家当量");
|
||||
assertEquals(1L, item(page, 1L).getProgressSuccess());
|
||||
assertEquals(9L, item(page, 2L).getProgressTotal(), "countries 是自然计数,不许再被折算");
|
||||
assertEquals(3L, item(page, 2L).getProgressSuccess());
|
||||
assertEquals(0L, item(page, 1L).getProgressFailed(), "心跳位置没有失败口径,failed 必须留 0 而不是猜一个");
|
||||
}
|
||||
|
||||
/**
|
||||
* 终态行一次都不读心跳位置。
|
||||
*
|
||||
* <p>位置 Hash 只有 24h TTL,隔天就读不到;而且跑完的行该按状态收尾,不该显示某个中途百分比
|
||||
* (跟价页那种「成功 0 / 总 1 + 失败 1」的旧读法就是被这个形态坑出来的)。
|
||||
*/
|
||||
@Test
|
||||
void terminalRowsMustNotReadHeartbeatPosition() {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
TaskCenterTaskRow done = taskRow(1L, "PRICE_TRACK", "SUCCESS", now, now);
|
||||
done.setTotalCount(1L);
|
||||
TaskCenterTaskRow failed = taskRow(2L, "SHOP_MATCH", "FAILED", now, now);
|
||||
|
||||
stubPage(List.of(done, failed));
|
||||
when(queryMapper.selectSnapshots(any())).thenReturn(List.of());
|
||||
stubPublishShops(List.of());
|
||||
stubFileResultShops(List.of());
|
||||
|
||||
TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery());
|
||||
|
||||
verify(positionService, org.mockito.Mockito.never()).readDrawablePositions(any(),
|
||||
org.mockito.ArgumentMatchers.anyInt());
|
||||
assertEquals(0L, item(page, 1L).getProgressTotal(), "终态行不回退输入文件数");
|
||||
assertEquals(0L, item(page, 2L).getProgressTotal());
|
||||
}
|
||||
|
||||
/** 已经有快照的行不用心跳位置:快照是服务端算出来的权威读数,位置只是执行器的自述。 */
|
||||
@Test
|
||||
void snapshotWinsOverHeartbeatPosition() {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
TaskCenterTaskRow row = taskRow(1L, "QUERY_ASIN", "RUNNING", now, now);
|
||||
row.setTotalCount(9L);
|
||||
|
||||
stubPage(List.of(row));
|
||||
when(queryMapper.selectSnapshots(any())).thenReturn(List.of(
|
||||
snapshotRow(1L, "QUERY_ASIN", 40L, 30L, 2L, "shop-a", "在跑")));
|
||||
stubPublishShops(List.of());
|
||||
stubFileResultShops(List.of());
|
||||
|
||||
TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery());
|
||||
|
||||
assertEquals(40L, item(page, 1L).getProgressTotal(), "快照优先,不能被心跳位置覆盖");
|
||||
assertEquals(30L, item(page, 1L).getProgressSuccess());
|
||||
verify(positionService, org.mockito.Mockito.never()).readDrawablePositions(any(),
|
||||
org.mockito.ArgumentMatchers.anyInt());
|
||||
}
|
||||
|
||||
@Test
|
||||
void modulesWithoutClientProgressBarHaveNoFallbackCount() {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
Reference in New Issue
Block a user