12271819

data_processing/data_operation/data_nwp_ftp.py

@@ -6,7 +6,7 @@
 # @Company: shenyang JY
 from datetime import timedelta
 from ftplib import FTP
-import threading, glob
+import threading, glob, pytz
 import pandas as pd
 from pytz import timezone
 from flask import Flask,request,jsonify
@@ -206,7 +206,7 @@ if __name__ == "__main__":
     logger = logging.getLogger("data_nwp_ftp")
     from waitress import serve
     update_thread() #定时任务开启
-    current_time = datetime.datetime.now()
+    current_time = datetime.datetime.now(pytz.utc).astimezone(timezone("Asia/Shanghai"))
     current_hour = current_time.hour
     if current_hour >= 18:
         current_hour = '18'

data_processing/data_operation/pre_data_ftp.py

@@ -6,8 +6,9 @@
 # @Company: shenyang JY
 from ftplib import FTP
 import pandas as pd
-from flask import Flask,request,jsonify
-import time, datetime, os, traceback
+from flask import Flask, request, jsonify
+import time, datetime, os, traceback, pytz
+from pytz import timezone
 import logging, zipfile, tempfile, shutil
 from common.database_dml import get_data_from_mongo
 
@@ -39,7 +40,8 @@ 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=ftp_params['local_dir']), tempfile.mkdtemp(dir=ftp_params['local_dir'])
-    dt = datetime.datetime.now().strftime('%Y%m%d')
+    current_time = datetime.datetime.now(pytz.utc).astimezone(timezone("Asia/Shanghai"))
+    dt = current_time.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_path = os.path.join(temp_dir, farmId, csv_file)