提交更改
This commit is contained in:
+1
-1
@@ -26,7 +26,7 @@ public class TaskHeartbeatController {
|
||||
@PostMapping("/{taskId}/heartbeat")
|
||||
@Operation(
|
||||
summary = "Task heartbeat",
|
||||
description = "Python calls this during execution. The backend resolves biz_file_task or brand task by taskId. user_id is optional.")
|
||||
description = "Python calls this during execution. The backend resolves biz_file_task or brand task by taskId only.")
|
||||
public ApiResponse<TaskHeartbeatVo> heartbeat(
|
||||
@Parameter(description = "Task ID", required = true, example = "200")
|
||||
@PathVariable Long taskId,
|
||||
|
||||
+2
-5
@@ -1,17 +1,14 @@
|
||||
package com.nanri.aiimage.modules.task.model.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
@Schema(description = "Task heartbeat request")
|
||||
public class TaskHeartbeatRequest {
|
||||
|
||||
@JsonProperty("user_id")
|
||||
@Schema(description = "Optional task owner user ID. Python workers can omit it.", example = "453")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "Optional phase label", example = "crawling")
|
||||
private String phase;
|
||||
|
||||
|
||||
+15
-9
@@ -18,6 +18,7 @@ import com.nanri.aiimage.modules.task.model.dto.TaskHeartbeatRequest;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.vo.TaskHeartbeatVo;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
@@ -26,6 +27,7 @@ import java.util.Map;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class TaskHeartbeatService {
|
||||
|
||||
private static final String STATUS_RUNNING = "RUNNING";
|
||||
@@ -55,24 +57,18 @@ public class TaskHeartbeatService {
|
||||
|
||||
public TaskHeartbeatVo heartbeat(Long taskId, TaskHeartbeatRequest request) {
|
||||
if (taskId == null || taskId <= 0) {
|
||||
log.warn("[task-heartbeat] ignored invalid heartbeat taskId={}", taskId);
|
||||
return TaskHeartbeatVo.notAlive(null, null, "invalid taskId");
|
||||
}
|
||||
Long userId = request == null ? null : request.getUserId();
|
||||
|
||||
LambdaQueryWrapper<FileTaskEntity> fileQuery = new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getId, taskId)
|
||||
.last("limit 1");
|
||||
if (userId != null && userId > 0) {
|
||||
fileQuery.eq(FileTaskEntity::getUserId, userId);
|
||||
}
|
||||
FileTaskEntity fileTask = fileTaskMapper.selectOne(fileQuery);
|
||||
|
||||
LambdaQueryWrapper<BrandCrawlTaskEntity> brandQuery = new LambdaQueryWrapper<BrandCrawlTaskEntity>()
|
||||
.eq(BrandCrawlTaskEntity::getId, taskId)
|
||||
.last("limit 1");
|
||||
if (userId != null && userId > 0) {
|
||||
brandQuery.eq(BrandCrawlTaskEntity::getUserId, userId);
|
||||
}
|
||||
BrandCrawlTaskEntity brandTask = brandCrawlTaskMapper.selectOne(brandQuery);
|
||||
|
||||
TaskHeartbeatVo fileResult = touchFileTaskIfRunning(fileTask, request);
|
||||
@@ -93,6 +89,7 @@ public class TaskHeartbeatService {
|
||||
if (brandResult != null) {
|
||||
return brandResult;
|
||||
}
|
||||
log.warn("[task-heartbeat] task not found taskId={} fileFound=false brandFound=false", taskId);
|
||||
return TaskHeartbeatVo.notAlive(null, null, "task not found");
|
||||
}
|
||||
|
||||
@@ -103,16 +100,20 @@ public class TaskHeartbeatService {
|
||||
String moduleType = task.getModuleType() == null ? "" : task.getModuleType();
|
||||
String status = task.getStatus();
|
||||
if (!STATUS_RUNNING.equals(status)) {
|
||||
log.warn("[task-heartbeat] file task is not running taskId={} actualUserId={} moduleType={} status={}",
|
||||
task.getId(), task.getUserId(), moduleType, status);
|
||||
return TaskHeartbeatVo.notAlive(moduleType, status, "task is not running");
|
||||
}
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getId, task.getId())
|
||||
.eq(FileTaskEntity::getUserId, task.getUserId())
|
||||
.eq(FileTaskEntity::getStatus, STATUS_RUNNING)
|
||||
.set(FileTaskEntity::getUpdatedAt, now));
|
||||
if (updated <= 0) {
|
||||
FileTaskEntity latest = fileTaskMapper.selectById(task.getId());
|
||||
log.warn("[task-heartbeat] file task heartbeat update missed taskId={} actualUserId={} moduleType={} status={} latestStatus={}",
|
||||
task.getId(), task.getUserId(), moduleType, status,
|
||||
latest == null ? null : latest.getStatus());
|
||||
return TaskHeartbeatVo.notAlive(moduleType, latest == null ? status : latest.getStatus(), "task is not running");
|
||||
}
|
||||
touchModuleHeartbeat(moduleType, task.getId(), request);
|
||||
@@ -127,15 +128,19 @@ public class TaskHeartbeatService {
|
||||
}
|
||||
String status = task.getStatus();
|
||||
if (!BRAND_STATUS_RUNNING.equals(status)) {
|
||||
log.warn("[task-heartbeat] brand task is not running taskId={} actualUserId={} status={}",
|
||||
task.getId(), task.getUserId(), status);
|
||||
return TaskHeartbeatVo.notAlive(MODULE_BRAND, status, "task is not running");
|
||||
}
|
||||
int updated = brandCrawlTaskMapper.update(null, new LambdaUpdateWrapper<BrandCrawlTaskEntity>()
|
||||
.eq(BrandCrawlTaskEntity::getId, task.getId())
|
||||
.eq(BrandCrawlTaskEntity::getUserId, task.getUserId())
|
||||
.eq(BrandCrawlTaskEntity::getStatus, BRAND_STATUS_RUNNING)
|
||||
.set(BrandCrawlTaskEntity::getUpdatedAt, LocalDateTime.now()));
|
||||
if (updated <= 0) {
|
||||
BrandCrawlTaskEntity latest = brandCrawlTaskMapper.selectById(task.getId());
|
||||
log.warn("[task-heartbeat] brand task heartbeat update missed taskId={} actualUserId={} status={} latestStatus={}",
|
||||
task.getId(), task.getUserId(), status,
|
||||
latest == null ? null : latest.getStatus());
|
||||
return TaskHeartbeatVo.notAlive(MODULE_BRAND, latest == null ? status : latest.getStatus(), "task is not running");
|
||||
}
|
||||
brandTaskProgressCacheService.touchHeartbeat(
|
||||
@@ -208,4 +213,5 @@ public class TaskHeartbeatService {
|
||||
values.put(key, String.valueOf(value));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+7
@@ -4,6 +4,7 @@ import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
|
||||
import com.nanri.aiimage.config.InstanceMetadata;
|
||||
import com.nanri.aiimage.modules.brand.service.BrandTaskService;
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataService;
|
||||
import com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService;
|
||||
import com.nanri.aiimage.modules.patroldelete.service.PatrolDeleteTaskService;
|
||||
import com.nanri.aiimage.modules.pricetrack.service.PriceTrackTaskService;
|
||||
@@ -45,6 +46,7 @@ public class TaskResultFileJobWorker {
|
||||
private final SimilarAsinTaskService similarAsinTaskService;
|
||||
private final DeleteBrandRunService deleteBrandRunService;
|
||||
private final BrandTaskService brandTaskService;
|
||||
private final CollectDataService collectDataService;
|
||||
@Autowired
|
||||
@Qualifier("cozeTaskExecutor")
|
||||
private TaskExecutor cozeTaskExecutor;
|
||||
@@ -274,6 +276,10 @@ public class TaskResultFileJobWorker {
|
||||
brandTaskService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
if ("COLLECT_DATA".equals(moduleType)) {
|
||||
collectDataService.processResultFileJob(job);
|
||||
return true;
|
||||
}
|
||||
throw new IllegalArgumentException("unsupported result file job module: " + moduleType);
|
||||
}
|
||||
|
||||
@@ -297,6 +303,7 @@ public class TaskResultFileJobWorker {
|
||||
}
|
||||
if ("DELETE_BRAND".equals(moduleType)) {
|
||||
deleteBrandRunService.cleanupResultFileJob(job);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user