David 4 ماه پیش
والد
کامیت
9ad1623771
2فایلهای تغییر یافته به همراه3 افزوده شده و 2 حذف شده
  1. 1 1
      data_processing/data_operation/data_nwp_ftp.py
  2. 2 1
      data_processing/data_operation/pre_data_ftp.py

+ 1 - 1
data_processing/data_operation/data_nwp_ftp.py

@@ -166,7 +166,7 @@ ftp_params = {
         'user' : 'jiayue',
         'password' : 'JYoguf2018',
         'remote_dir' : './',
-        'local_dir': '../cache/data/xxl'
+        'local_dir': './data_processing/cache/data/xxl'
     }
 }
 

+ 2 - 1
data_processing/data_operation/pre_data_ftp.py

@@ -14,6 +14,7 @@ from common.database_dml import get_data_from_mongo
 app = Flask('pre_data_ftp——service')
 
 ftp_params = {
+    'local_dir' : './data_processing/cache/data',
     'host' : '192.168.12.20',
     'port': 32121,
     'zip_mode': 'w',
@@ -37,7 +38,7 @@ def zip_temp_file(df, args):
                 file_path = os.path.join(root, file)
                 zip_file.write(file_path, os.path.relpath(file_path, folder_path))
         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')
     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)