12271605

data_processing/data_operation/data_nwp_ftp.py

@@ -221,8 +221,8 @@ if __name__ == "__main__":
     print("server start!")
 
     # args = {"source": 'xxl', "date": '2024-12-27 00:00:00', 'moment': '06', 'farmId': 'J00645',
-    # 'mongodb_database': 'db2', 'mongodb_write_table': 'j00645-d1', 'day_begin':'D1',
-    #         'day_end': 'D1', 'isDq': True}
-    # download_zip_files_from_ftp()
+    # 'mongodb_database': 'db2', 'mongodb_write_table': 'j00645-d1', 'day_begin':'D0',
+    #         'day_end': 'D13', 'isDq': True}
+    # download_zip_files_from_ftp(hour='06')
     # select_file_to_mongo(args)
     # delete_zip_files('20241225')

data_processing/data_operation/pre_data_ftp.py

@@ -38,9 +38,9 @@ def zip_temp_file(df, args):
                 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')
-    dt = df.loc[0, 'date_time'].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']
-    csv_file = 'jy_{}.{}{}_{}_{}{}_dq.csv'.format(modeler, model, version, farmId, dt, moment)
+    csv_file = 'jy_{}.{}.{}_{}_{}{}_dq.csv'.format(modeler, model, version, farmId, dt, moment)
     csv_path = os.path.join(temp_dir, farmId, csv_file)
     os.makedirs(os.path.dirname(csv_path), exist_ok=True)
     df.to_csv(csv_path, index=False)
@@ -88,6 +88,8 @@ def get_nwp_from_ftp():
         print('args', args)
         logger.info(args)
         df = get_data_from_mongo(args)
+        df['date_time'] = pd.to_datetime(df['date_time'])
+        df = df.sort_values(by='date_time')
         # 2. 将预测结果保存成csv临时文件，命名压缩
         zip_path, zip_file = zip_temp_file(df, args)
         # 3. 上传到指定的FTP服务器中