This commit is contained in:
2025-01-14 11:26:37 +08:00
parent 02548a3028
commit f2f7fa22c9
10 changed files with 129 additions and 73 deletions

View File

@@ -60,6 +60,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
@@ -143,8 +144,24 @@ public class TaskTaskServiceImpl implements TaskService {
renderWorkerMapper.update(worker);
TaskSyncRespVo resp = new TaskSyncRespVo();
// Template
List<TemplateRespVO> updTemplateList;
if (req.getTemplateList() != null) {
updTemplateList = new ArrayList<>();
// 上报了本地模板列表
req.getTemplateList().forEach(template -> {
if (StringUtils.isNumeric(template.getId())) {
TemplateRespVO dbTemplate = templateRepository.getTemplate(Long.parseLong(template.getId()));
if (!dbTemplate.getUpdateTime().equals(template.getUpdateTime())) {
updTemplateList.add(dbTemplate);
}
}
});
} else {
updTemplateList = templateRepository.getAllEnabledTemplateList();
}
List<TaskRespVO> taskList = taskMapper.selectNotRunning();
resp.setTasks(taskList);
resp.setTemplates(updTemplateList);
taskList.forEach(task -> {
taskMapper.assignToWorker(task.getId(), worker.getId());
videoTaskRepository.clearTaskCache(task.getId());