diff --git a/api/app/lib/controllers/metadataAcquisition/taskHandle.js b/api/app/lib/controllers/metadataAcquisition/taskHandle.js index 89810c8..07c7f96 100644 --- a/api/app/lib/controllers/metadataAcquisition/taskHandle.js +++ b/api/app/lib/controllers/metadataAcquisition/taskHandle.js @@ -182,7 +182,7 @@ async function handleTask(app, task) { const logBody = { task: task.id, success: true, - details: '采集成功', + details: '采集成功' + task.id, startTime: startTime, endTime: endTime } @@ -205,7 +205,7 @@ async function handleTask(app, task) { message = error.message.split('.')[0].split('"')[1] + '未定义任何字段' } } - + const logBody = { task: task.id, success: false, @@ -216,11 +216,14 @@ async function handleTask(app, task) { await models.AcquisitionLog.create(logBody) taskRetryIndex[task.id]++; //处理采集失败重试 - if (task.retried && task.retryCount && task.retryTime && taskRetryIndex[task.id] < task.retryCount) { + if (task.retried && task.retryCount && task.retryTime && taskRetryIndex[task.id] <= task.retryCount) { setTimeout(() => { handleTask(app, task) }, 1000 * 60 * task.retryTime); } + if (taskRetryIndex[task.id] && taskRetryIndex[task.id] == task.retryCount) { + taskRetryIndex[task.id] = 0; + } app.fs.logger.error(`sechedule: handleTask, error: ${error}`); } } @@ -231,7 +234,10 @@ function handleAddTableChildren(dataToSave, tables, table, tableChildrens) { Object.keys(tables[table.name].structures).forEach(key => { if (!tableChildrens || !tableChildrens.find(s => s.code == key)) { dataToSave.parent = table.id; - dataToSave.name = tables[table.name].structures[key].comment || key; + dataToSave.name = tables[table.name].structures[key].comment ? + tables[table.name].structures[key].comment.substring(0, 250) + : key; + // dataToSave.name = key; dataToSave.code = key; dataToSave.type = '字段'; const tableObj = { ...dataToSave } @@ -288,4 +294,5 @@ function createDbOptions(params) { } -module.exports = { handleTask } \ No newline at end of file +module.exports = { handleTask } +