6141032

db-light/getdata/inputData.py

@@ -252,7 +252,7 @@ class DataBase(object):
         :param database:
         :return:
         """
-        self.clear_data()
+        # self.clear_data()
         try:
             self.get_process_power()
             self.get_process_dq()

db-light/utils/Arg.py

@@ -2,14 +2,14 @@ class Arg:
     def __init__(self):
         # 数据库地址
         # 数据存放位置
-        self.dataloc = "../data/526/"
+        self.dataloc = "../data/526"
         # 变量存放位置
-        self.varloc = "../data/526/var/"
+        self.varloc = "../data/526/var"
         # 环境监测仪个数
         self.weatherloc = [1]
         # 归一化文件存放位置
         self.normloc = '../data/526/norm.yaml'
 
-        self.begin = '2024-01-01'
+        self.begin = '2023-11-01'
         self.end = '2024-05-31'
         self.database = "mysql+pymysql://root:mysql_T7yN3E@192.168.12.10:19306/ipfcst_j00526_20240527101346"

db-wind/Arg.py

@@ -3,14 +3,14 @@ class Arg:
         # 数据库地址
         self.database = "mysql+pymysql://root:mysql_T7yN3E@192.168.12.10:19306/ipfcst_j00314_20240516121839"
         # 数据存放位置
-        self.dataloc = "../data/314/"
+        self.dataloc = "../data/314"
         # 变量存放位置
-        self.varloc = "../data/314/var/"
+        self.varloc = "../data/314/var"
         # 测风塔个数
         self.towerloc = [1]
         # 机头编号
         self.turbineloc = [i for i in range(1, 16)]
 
-        self.begin = '2023-01-01'
-        self.end = '2024-05-31'
+        self.begin = '2022-01-01'
+        self.end = '2022-12-31'
 

db-wind/inputData.py

@@ -2,33 +2,31 @@ import pandas as pd
 import datetime, time
 import pytz
 from savedata import saveData, readData
-import os
+from Arg import Arg
 from sqlalchemy import create_engine
 import pytz
 from data_cleaning import cleaning, rm_duplicated
-current_path = os.path.dirname(__file__)
-dataloc = current_path + '/data/'
 
-def readData(name):
-    """
-    读取数据
-    :param name: 名字
-    :return:
-    """
-    path = dataloc + r"/" + name
-    return pd.read_csv(path)
-
-
-def saveData(name, data):
-    """
-    存放数据
-    :param name: 名字
-    :param data: 数据
-    :return:
-    """
-    path = dataloc + r"/" + name
-    os.makedirs(os.path.dirname(path), exist_ok=True)
-    data.to_csv(path, index=False)
+# def readData(name):
+#     """
+#     读取数据
+#     :param name: 名字
+#     :return:
+#     """
+#     path = dataloc + r"/" + name
+#     return pd.read_csv(path)
+#
+#
+# def saveData(name, data):
+#     """
+#     存放数据
+#     :param name: 名字
+#     :param data: 数据
+#     :return:
+#     """
+#     path = dataloc + r"/" + name
+#     os.makedirs(os.path.dirname(path), exist_ok=True)
+#     data.to_csv(path, index=False)
 
 
 def timestamp_to_datetime(ts):
@@ -65,13 +63,14 @@ def timestr_to_timestamp(time_str):
 
 
 class DataBase(object):
-    def __init__(self, begin, end, database):
-        self.begin = begin
-        self.end = end - pd.Timedelta(minutes=15)
-        self.begin_stamp = timestr_to_timestamp(str(begin))
+    def __init__(self, arg):
+        self.begin = datetime.datetime.strptime(arg.begin, '%Y-%m-%d')
+        self.end = datetime.datetime.strptime(arg.end, '%Y-%m-%d') - pd.Timedelta(minutes=15)
+        self.begin_stamp = timestr_to_timestamp(str(arg.begin))
         self.end_stamp = timestr_to_timestamp(str(self.end))
-        self.database = database
-        self.towerloc = [1]
+        self.database = arg.database
+        self.towerloc = arg.towerloc
+        self.dataloc = arg.dataloc
 
     def clear_data(self):
         """
@@ -81,7 +80,7 @@ class DataBase(object):
         # 设置文件夹路径
         import glob
         import os
-        folder_path = dataloc
+        folder_path = self.dataloc
 
         # 使用 glob 获取所有的 .csv 文件路径
         csv_files = glob.glob(os.path.join(folder_path, '**/*.csv'), recursive=True)

db-wind/main.py

@@ -207,8 +207,7 @@ def Continuous_Data(input_dir,output_dir,M,TopN):
 if __name__ == "__main__":
     import datetime
     arg = Arg.Arg()
-    db = DataBase(begin=datetime.datetime.strptime(arg.begin, '%Y-%m-%d'),
-                  end=datetime.datetime.strptime(arg.end, '%Y-%m-%d'), database=arg.database)
+    db = DataBase(arg=arg)
     db.data_process()
     # input_dir = "../data_mts/turbine-15"  # 输入文件夹路径
     # output_dir = "../data_mts/output_clean_csv_files"  # 输出文件夹路径