|
@@ -14,6 +14,7 @@ from common.database_dml import get_data_from_mongo
|
|
app = Flask('pre_data_ftp——service')
|
|
app = Flask('pre_data_ftp——service')
|
|
|
|
|
|
ftp_params = {
|
|
ftp_params = {
|
|
|
|
+ 'local_dir' : './data_processing/cache/data',
|
|
'host' : '192.168.12.20',
|
|
'host' : '192.168.12.20',
|
|
'port': 32121,
|
|
'port': 32121,
|
|
'zip_mode': 'w',
|
|
'zip_mode': 'w',
|
|
@@ -37,7 +38,7 @@ def zip_temp_file(df, args):
|
|
file_path = os.path.join(root, file)
|
|
file_path = os.path.join(root, file)
|
|
zip_file.write(file_path, os.path.relpath(file_path, folder_path))
|
|
zip_file.write(file_path, os.path.relpath(file_path, folder_path))
|
|
zip_file.close()
|
|
zip_file.close()
|
|
- temp_dir, tem_dir_zip = tempfile.mkdtemp(dir='../cache/data'), tempfile.mkdtemp(dir='../cache/data')
|
|
|
|
|
|
+ temp_dir, tem_dir_zip = tempfile.mkdtemp(dir=ftp_params['local_dir']), tempfile.mkdtemp(dir=ftp_params['local_dir'])
|
|
dt = datetime.datetime.now().strftime('%Y%m%d')
|
|
dt = datetime.datetime.now().strftime('%Y%m%d')
|
|
modeler, model, version, farmId, moment = ftp_params[args['user']]['modeler'], args['model'], args['version'], args['farmId'], args['moment']
|
|
modeler, model, version, farmId, moment = ftp_params[args['user']]['modeler'], args['model'], args['version'], args['farmId'], args['moment']
|
|
csv_file = 'jy_{}.{}.{}_{}_{}{}_dq.csv'.format(modeler, model, version, farmId, dt, moment)
|
|
csv_file = 'jy_{}.{}.{}_{}_{}{}_dq.csv'.format(modeler, model, version, farmId, dt, moment)
|