diff --git a/app/task_db_func.py b/app/task_db_func.py index 1f3159f..2ad9e06 100644 --- a/app/task_db_func.py +++ b/app/task_db_func.py @@ -194,11 +194,11 @@ class TaskDbHelper(TableDbHelperBase): return self.do_execute(sql) ########################################################################## - def insert_upload_file_record(self, taskno, nodeid, download_url): + def insert_upload_file_record(self, taskno, nodeid, download_url, area_id): sql = f""" - insert into task.task_upload_file_record (taskno, nodeid, download_url) - values (%d , %d, '%s') - """ % (int(taskno), int(nodeid), download_url) + insert into task.task_upload_file_record (taskno, nodeid, download_url, area_id) + values (%d , %d, '%s', %s) + """ % (int(taskno), int(nodeid), download_url, area_id) return self.do_execute(sql) def query_task_file(self, nodeid, area_id): diff --git a/app/task_worker.py b/app/task_worker.py index 4aadba1..f14c131 100644 --- a/app/task_worker.py +++ b/app/task_worker.py @@ -737,6 +737,9 @@ def do_task_upload(params): nodeid = check_param({'nodeid': request.form.get('nodeid')}, 'nodeid') if not nodeid: return json.dumps(make_common_res(3, "nodeid检查报错")) + area_id = check_param({'area_id': request.form.get('area_id')}, 'area_id') + if not area_id: + return json.dumps(make_common_res(3, "area_id检查报错")) taskno = check_param({'taskno': request.form.get('taskno')}, 'taskno') if not taskno: return json.dumps(make_common_res(2, '任务id异常,请检查后重试')) @@ -754,7 +757,7 @@ def do_task_upload(params): file.save(f'./app/static/task_file/{nodeid}/task_no_{taskno}/{file.filename}') suc_file_num += 1 download_url = f'/api/download_task_file?nodeid={nodeid}&taskno={taskno}&file_name={file.filename}' - ret = db_task.insert_upload_file_record(taskno, nodeid, download_url) + ret = db_task.insert_upload_file_record(taskno, nodeid, download_url, area_id) if ret == 1: suc_mysql_num += 1 else: