Merge branch 'dev_david' of anweiguo/algorithm_platform into dev_awg

data_processing/data_operation/pre_data_ftp.py

@@ -176,7 +176,7 @@ def get_nwp_from_ftp():
         df['date_time'] = pd.to_datetime(df['date_time'])
         dfs = df.groupby('farm_id')
         for farm_id, df in dfs:
-            if df.columns.isin(['cdq', 'dq', 'zq']):
+            if {'cdq', 'dq', 'zq'}.issubset(set(df.columns.tolist())):
                 cdq, dq, zq = df.loc[df.index[0], ['cdq', 'dq', 'zq']]
             else:
                 cdq, dq, zq = 0, 0, 0