David пре 1 месец
родитељ
комит
3c028634cc

+ 6 - 6
DataBase/db-light/utils/Arg.py → DataBase/db-light/Arg.py

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

+ 0 - 0
DataBase/db-light/getdata/data_cleaning.py → DataBase/db-light/data_cleaning.py


+ 18 - 21
DataBase/db-light/getdata/inputData.py → DataBase/db-light/inputData.py

@@ -1,12 +1,9 @@
 import pandas as pd
 import datetime, time
-import yaml
 import os
-import pymysql
 from sqlalchemy import create_engine
-import pytz
-from getdata.data_cleaning import cleaning, rm_duplicated
-import utils.savedata
+import pytz, savedata
+from data_cleaning import cleaning, rm_duplicated
 current_path = os.path.dirname(__file__)
 dataloc = current_path + '/data/'
 weatherloc = [1]
@@ -140,7 +137,7 @@ class DataBase(object):
         NWP = cleaning(NWP, 'NWP')
         # NWP = self.split_time(NWP)
         NWP['C_TIME'] = NWP['C_TIME'].dt.strftime('%Y-%m-%d %H:%M:%S')
-        utils.savedata.saveData("NWP.csv", NWP)
+        savedata.saveData("NWP.csv", NWP)
         print("导出nwp数据")
         return NWP
 
@@ -169,7 +166,7 @@ class DataBase(object):
             weather = self.exec_sql(weather_sql, engine)
             weather['C_TIME'] = pd.to_datetime(weather['C_TIME'])
             # weather = self.split_time(weather)
-            utils.savedata.saveData("/weather-{}.csv".format(i), weather)
+            savedata.saveData("/weather-{}.csv".format(i), weather)
             print("环境监测仪{}导出数据".format(i))
 
     def get_process_power(self):
@@ -197,7 +194,7 @@ class DataBase(object):
         binary_map = {b'\x00': 0, b'\x01': 1}
         powers['C_IS_RATIONING_BY_AUTO_CONTROL'] = powers['C_IS_RATIONING_BY_AUTO_CONTROL'].map(binary_map)
         powers = rm_duplicated(powers)
-        utils.savedata.saveData("power.csv", powers)
+        savedata.saveData("power.csv", powers)
 
     def get_process_dq(self):
         """
@@ -215,7 +212,7 @@ class DataBase(object):
         # dq.drop('C_FORECAST_HOW_LONG_AGO', axis=1, inplace=True)
         dq = cleaning(dq, 'dq', cols=['C_FP_VALUE'])
         dq['C_TIME'] = dq['C_TIME'].dt.strftime('%Y-%m-%d %H:%M:%S')
-        utils.savedata.saveData("dq.csv", dq)
+        savedata.saveData("dq.csv", dq)
         print("导出dq数据")
 
     def get_process_cdq(self):
@@ -233,7 +230,7 @@ class DataBase(object):
         cdq = cleaning(cdq, 'cdq', cols=['C_ABLE_VALUE'], dup=False)
         # cdq = cdq[cdq['C_FORECAST_HOW_LONG_AGO'] == int(str(self.opt.predict_point)[1:])]
         cdq['C_TIME'] = cdq['C_TIME'].dt.strftime('%Y-%m-%d %H:%M:%S')
-        utils.savedata.saveData("cdq.csv", cdq)
+        savedata.saveData("cdq.csv", cdq)
 
     def indep_process(self):
         """
@@ -242,9 +239,9 @@ class DataBase(object):
         """
         # 环境监测仪数据处理
         for i in weatherloc:
-            weather = utils.savedata.readData("/weather-{}.csv".format(i))
+            weather = savedata.readData("/weather-{}.csv".format(i))
             weather = cleaning(weather, 'weather', cols=['C_GLOBALR', 'C_DIRECTR', 'C_DIFFUSER', 'C_RH', 'C_AIRT', 'C_P', 'C_WS', 'C_WD'])
-            utils.savedata.saveData("/weather-{}-process.csv".format(i), weather)
+            savedata.saveData("/weather-{}-process.csv".format(i), weather)
 
     def data_process(self):
         """
@@ -253,15 +250,15 @@ class DataBase(object):
         :return:
         """
         # self.clear_data()
-        try:
-            self.get_process_power()
-            self.get_process_dq()
-            # self.get_process_cdq()
-            self.get_process_NWP()
-            self.get_process_weather()
-            self.indep_process()
-        except Exception as e:
-            print("导出数据出错:{}".format(e.args))
+        # try:
+        self.get_process_power()
+        self.get_process_dq()
+        # self.get_process_cdq()
+        self.get_process_NWP()
+        self.get_process_weather()
+        self.indep_process()
+        # except Exception as e:
+        #     print("导出数据出错:{}".format(e.args))
 
 
 

+ 2 - 4
DataBase/db-light/main.py

@@ -1,8 +1,6 @@
-import pandas as pd
-import os
 import datetime
-from getdata.inputData import DataBase
-from utils import Arg
+from inputData import DataBase
+import Arg
 
 if __name__ == "__main__":
     arg = Arg.Arg()

+ 1 - 1
DataBase/db-light/utils/savedata.py → DataBase/db-light/savedata.py

@@ -1,6 +1,6 @@
 import pickle
 import pandas as pd
-from utils import Arg
+import Arg
 import os
 
 arg = Arg.Arg()

+ 0 - 0
DataBase/db-light/getdata/splitdata.py → DataBase/db-light/splitdata.py