fix(jd-collect): 删任务与京东数据库解耦——只收 scope 行与任务行,商品/图片/SKU/归属行不再级联清除
This commit is contained in:
+14
-31
@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.task.TaskStatuses;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductGroupAssignMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductImageMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductMapper;
|
||||
import com.nanri.aiimage.modules.jd.mapper.JdProductSkuMapper;
|
||||
import com.nanri.aiimage.modules.jd.model.dto.JdCollectTaskCreateRequest;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdCollectDashboardVo;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdCollectHistoryItemVo;
|
||||
@@ -17,9 +14,6 @@ import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskBatchVo;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskDetailVo;
|
||||
import com.nanri.aiimage.modules.jd.model.vo.JdCollectTaskItemVo;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductGroupAssignEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductImageEntity;
|
||||
import com.nanri.aiimage.modules.jd.model.entity.JdProductSkuEntity;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
@@ -46,8 +40,8 @@ import java.util.Set;
|
||||
* <p>形状照外观专利的 {@code AppearancePatentProgressSupport}+{@code AppearancePatentTaskRecordSupport}
|
||||
* 裁剪:京东采集<b>没有</b> {@code biz_file_result}/{@code biz_task_file_job}(交付物直接落
|
||||
* 京东数据库,无结果文件、无下载),所以历史行的「行数」改从 {@code biz_jd_product} 按
|
||||
* {@code task_id} 计数、进度从 {@code biz_task_scope_state} 游标取;删除面清理
|
||||
* {@code biz_jd_product(_image/_sku)}+scope 行+任务主行(铁律 32 数据面)。
|
||||
* {@code task_id} 计数、进度从 {@code biz_task_scope_state} 游标取;删除面只收 scope 行+
|
||||
* 任务主行,<b>京东数据库行不随任务删除</b>(2026-11-21 用户拍板解耦,见 {@link #deleteTask})。
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@@ -59,9 +53,6 @@ public class JdCollectBoardService {
|
||||
private final FileTaskMapper fileTaskMapper;
|
||||
private final TaskScopeStateMapper taskScopeStateMapper;
|
||||
private final JdProductMapper jdProductMapper;
|
||||
private final JdProductImageMapper jdProductImageMapper;
|
||||
private final JdProductSkuMapper jdProductSkuMapper;
|
||||
private final JdProductGroupAssignMapper jdProductGroupAssignMapper;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
/** 查询当前用户的面板总览(运行中/成功/失败三档计数,已结束=成功+失败)。 */
|
||||
@@ -282,10 +273,17 @@ public class JdCollectBoardService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除任务(铁律 32 数据面):京东数据库四表按 {@code task_id}/商品 id 清 + scope 行 + 任务主行。
|
||||
* 事务内只做 DB 删除;京东采集没有 OSS 载荷/任务缓存需要 afterCommit 清理。
|
||||
* 删行顺序照 {@code JdProductRowDeleteService#deleteRows}:先归类归属/sku/image 子行再主行
|
||||
* (V203 加入 {@code biz_jd_product_group_assign},按商品 id 清所有组的归属)。
|
||||
* 删除任务(2026-11-21 用户拍板与京东数据库解耦):只收 {@code biz_task_scope_state} 行+
|
||||
* 任务主行,<b>不碰京东数据库四表</b>——已同步的商品行/图片/SKU/归类归属全部保留,只由
|
||||
* 京东数据库页的显式删除入口({@link JdProductDeleteService},先删桶对象再删库行)回收。
|
||||
* 重新采集按唯一键 upsert 命中已有行,人工编辑锁(V199)与删除忽略表继续生效。
|
||||
*
|
||||
* <p>解耦背景:级联形状(v1.4 原「铁律 32 数据面」口径)把删任务变成了京东数据库的隐形
|
||||
* 全量删除口——2026-11-21 admin 在用户端清理测试任务(02:29~02:45 六单),级联把商品库
|
||||
* (自增位 4,052)删到只剩 2 行,而通用删除确认框从未提示这层连带。任务删除本就是
|
||||
* 高频轻操作,不该携带「公共数据库整批蒸发」的副作用。</p>
|
||||
*
|
||||
* <p>事务内只做 DB 删除;京东采集没有 OSS 载荷/任务缓存需要 afterCommit 清理。</p>
|
||||
*/
|
||||
@Transactional
|
||||
public void deleteTask(Long taskId, Long userId) {
|
||||
@@ -294,25 +292,10 @@ public class JdCollectBoardService {
|
||||
|| (userId != null && task.getUserId() != null && !Objects.equals(userId, task.getUserId()))) {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
List<Long> productIds = jdProductMapper.selectList(
|
||||
new LambdaQueryWrapper<JdProductEntity>()
|
||||
.select(JdProductEntity::getId)
|
||||
.eq(JdProductEntity::getTaskId, taskId))
|
||||
.stream().map(JdProductEntity::getId).toList();
|
||||
if (!productIds.isEmpty()) {
|
||||
jdProductGroupAssignMapper.delete(new LambdaQueryWrapper<JdProductGroupAssignEntity>()
|
||||
.in(JdProductGroupAssignEntity::getProductId, productIds));
|
||||
jdProductSkuMapper.delete(new LambdaQueryWrapper<JdProductSkuEntity>()
|
||||
.in(JdProductSkuEntity::getProductId, productIds));
|
||||
jdProductImageMapper.delete(new LambdaQueryWrapper<JdProductImageEntity>()
|
||||
.in(JdProductImageEntity::getProductId, productIds));
|
||||
}
|
||||
int products = jdProductMapper.delete(new LambdaQueryWrapper<JdProductEntity>()
|
||||
.eq(JdProductEntity::getTaskId, taskId));
|
||||
taskScopeStateMapper.delete(new LambdaQueryWrapper<TaskScopeStateEntity>()
|
||||
.eq(TaskScopeStateEntity::getTaskId, taskId)
|
||||
.eq(TaskScopeStateEntity::getModuleType, JdCollectTaskService.MODULE_TYPE));
|
||||
fileTaskMapper.deleteById(taskId);
|
||||
log.info("[jd-collect] 删除任务 taskId={} userId={} 商品行={}", taskId, userId, products);
|
||||
log.info("[jd-collect] 删除任务 taskId={} userId={}(京东数据库行保留,不随任务删除)", taskId, userId);
|
||||
}
|
||||
}
|
||||
|
||||
-1
@@ -77,7 +77,6 @@ public class JdResultIngestService {
|
||||
private final TaskProgressSnapshotService taskProgressSnapshotService;
|
||||
private final JdProductImageIngestService jdProductImageIngestService;
|
||||
private final JdProductSkuIngestService jdProductSkuIngestService;
|
||||
private final JdProductRowDeleteService jdProductRowDeleteService;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
public JdIngestChunkVo submitChunk(Long taskId, JdIngestChunkRequest request, boolean trustedErrorReporter) {
|
||||
|
||||
+9
-12
@@ -36,7 +36,8 @@ import static org.mockito.Mockito.when;
|
||||
*
|
||||
* <p>判据四件:① 总览三档计数(已结束=成功+失败);② 历史行读真源(biz_jd_product 行数
|
||||
* + scope 游标),活跃任务排前;③ 批量进度按模块过滤,非本模块任务进 missingTaskIds
|
||||
* 不冒充面板条目;④ 删除面校验归属后才清京东数据库三表+scope 行+任务主行(铁律 32)。
|
||||
* 不冒充面板条目;④ 删除面校验归属后只收 scope 行+任务主行,京东数据库四表一律不碰
|
||||
* (2026-11-21 用户拍板解耦:数据库行只由京东数据库页显式删除入口回收,不随任务删除)。
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class JdCollectBoardServiceTest {
|
||||
@@ -182,22 +183,18 @@ class JdCollectBoardServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void 删除任务_先清子行再清主行_scope行与任务行一并收掉() {
|
||||
void 删除任务_只收scope行与任务行_京东数据库四表一律不碰() {
|
||||
FileTaskEntity mine = task(88L, 7L, "FAILED");
|
||||
when(fileTaskMapper.selectById(88L)).thenReturn(mine);
|
||||
com.nanri.aiimage.modules.jd.model.entity.JdProductEntity product =
|
||||
new com.nanri.aiimage.modules.jd.model.entity.JdProductEntity();
|
||||
product.setId(5001L);
|
||||
when(jdProductMapper.selectList(any())).thenReturn(List.of(product));
|
||||
when(jdProductMapper.delete(any())).thenReturn(1);
|
||||
|
||||
service.deleteTask(88L, 7L);
|
||||
|
||||
// 归类归属(V203)→ sku/image 子行 → 主行 → scope → 任务行,六次删除一次不落
|
||||
verify(jdProductGroupAssignMapper, times(1)).delete(any());
|
||||
verify(jdProductSkuMapper, times(1)).delete(any());
|
||||
verify(jdProductImageMapper, times(1)).delete(any());
|
||||
verify(jdProductMapper, times(1)).delete(any());
|
||||
// 2026-11-21 解耦拍板:任务删除不再级联清京东数据库——商品行/图片/SKU/归类归属全保留,
|
||||
// 只由京东数据库页显式删除入口回收。三支子表 mock 是拨断线:回加级联即红。
|
||||
verify(jdProductGroupAssignMapper, never()).delete(any());
|
||||
verify(jdProductSkuMapper, never()).delete(any());
|
||||
verify(jdProductImageMapper, never()).delete(any());
|
||||
verify(jdProductMapper, never()).delete(any());
|
||||
verify(taskScopeStateMapper, times(1)).delete(any());
|
||||
verify(fileTaskMapper, times(1)).deleteById(any(java.io.Serializable.class));
|
||||
}
|
||||
|
||||
+1
-3
@@ -73,8 +73,6 @@ class JdResultIngestServiceTest {
|
||||
private JdProductImageIngestService jdProductImageIngestService;
|
||||
@Mock
|
||||
private JdProductSkuIngestService jdProductSkuIngestService;
|
||||
@Mock
|
||||
private JdProductRowDeleteService jdProductRowDeleteService;
|
||||
|
||||
private JdResultIngestService service;
|
||||
|
||||
@@ -88,7 +86,7 @@ class JdResultIngestServiceTest {
|
||||
service = new JdResultIngestService(fileTaskMapper, jdProductMapper, jdProductIgnoreMapper,
|
||||
taskScopeStateMapper, adminUserMapper, collectTaskService, jdStaleTaskService,
|
||||
taskProgressSnapshotService, jdProductImageIngestService, jdProductSkuIngestService,
|
||||
jdProductRowDeleteService, new ObjectMapper());
|
||||
new ObjectMapper());
|
||||
}
|
||||
|
||||
private FileTaskEntity runningTask() {
|
||||
|
||||
Reference in New Issue
Block a user