|
@@ -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))
|
|
|
|
|
|
|
|
|
|