From 77b9e5146ab77710ebb6f53354da24e399644405 Mon Sep 17 00:00:00 2001
From: zhaojinghao <zhaojh@qibebt.ac.cn>
Date: Thu, 24 Nov 2022 10:35:58 +0800
Subject: [PATCH] bug fix

---
 main.py          | 14 ++++++++------
 read_par_data.py |  4 +---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/main.py b/main.py
index 7ba4e65..20fb6cd 100644
--- a/main.py
+++ b/main.py
@@ -6,7 +6,7 @@ import glob
 from read_par_data import trans2csv
 from logzero import logger
 
-today = dt.date(2022, 7, 23)
+today = dt.date(2022, 8, 1)
 print(today)
 _yearNum = today.year
 _monNum = today.month
@@ -14,7 +14,7 @@ _dayNum = today.day
 _yearStr = ""
 _monStr = ""
 _dayStr = ""
-_hourStr = [f"0{x}"if x < 10 else str(x) for x in range(24)]
+_hourStr = [f"0{x}" if x < 10 else str(x) for x in range(24)]
 
 if __name__ == "__main__":
     # 传入IP地址
@@ -88,7 +88,7 @@ if __name__ == "__main__":
             _dayStr = ""
             _hourStr = [f"0{x}" if x < 10 else str(x) for x in range(24)]
             _yearStr, _monStr, _dayStr = Daod.getDateStr(_yearNum, _monNum, _dayNum)
-            ftp_filePath = "/pub/himawari/L2/PAR/010" + "/" + _yearStr + _monStr + "/" + _dayStr + "/"
+            ftp_filePath = "/pub/himawari/L2/PAR/020" + "/" + _yearStr + _monStr + "/" + _dayStr + "/"
             dst_filePath = dst_filePath_root + "/" + dt.datetime.strftime(today, '%Y-%m-%d')
             Download_Path = dst_filePath + "/PAR_Minutes_Download"
             if not os.path.exists(Download_Path):
@@ -101,14 +101,16 @@ if __name__ == "__main__":
             # if not os.path.exists(Analysis_Path):
             #     os.makedirs(Analysis_Path)
             data_list = glob.glob(Download_Path + "\\*.nc")
-
             logger.info(data_list)
             try:
-                trans2csv(data_list)
+                date_df = trans2csv(data_list)
+                date_df.to_csv(f'./{Download_Path}/{_yearStr}-{_monStr}-{_dayStr}PAR.csv', encoding='utf-8-sig',
+                               index=False)
                 Daod.deleteFile(Download_Path, '.nc')
             except Exception as e:
                 logger.error(e)
                 logger.error(Download_Path)
+
             today = today + dt.timedelta(days=1)
     else:
         logger.error("选择错误！")
@@ -127,4 +129,4 @@ if __name__ == "__main__":
     #     trans.NC_to_tiffs(data, Analysis_Path)
     #     print(data + "-----转tif成功")
 
-    print("----转换结束----")
\ No newline at end of file
+    print("----转换结束----")
diff --git a/read_par_data.py b/read_par_data.py
index e51ea63..061fe7e 100644
--- a/read_par_data.py
+++ b/read_par_data.py
@@ -8,7 +8,6 @@ target_lat = ['29.6', '28.8']
 
 
 def trans2csv(file_list):
-    date = ""
     file_list.sort()
     par_list = []
     cols = []
@@ -16,7 +15,6 @@ def trans2csv(file_list):
         logger.info(file_name)
         try:
             file = file_name.split('\\')[1]
-            date = file_name.split('/')[2]
             date_time = file.split('_')[1] + ' ' + file.split('_')[2]
             print(date_time)
             nc_data = nc.Dataset(file_name)
@@ -40,4 +38,4 @@ def trans2csv(file_list):
             logger.info(e)
             continue
     date_df = pd.DataFrame.from_records(par_list, columns=['time', 'lat'] + cols)
-    date_df.to_csv(f'./data/{date}/PAR.csv', encoding='utf-8-sig', index=False)
\ No newline at end of file
+    return date_df
\ No newline at end of file