Merge branch 'develop'

pull/117/head
13621160019@163.com 2021-12-19 08:01:06 +08:00
commit 5057fc9e4c
3 changed files with 45 additions and 106 deletions

View File

@ -1,41 +1,26 @@
from decouple import config
MYEMS_SYSTEM_DB_HOST = config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1')
MYEMS_SYSTEM_DB_PORT = config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int)
MYEMS_SYSTEM_DB_DATABASE = config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db')
MYEMS_SYSTEM_DB_USER = config('MYEMS_SYSTEM_DB_USER', default='root')
MYEMS_SYSTEM_DB_PASSWORD = config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1')
MYEMS_HISTORICAL_DB_HOST = config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1')
MYEMS_HISTORICAL_DB_PORT = config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int)
MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db')
MYEMS_HISTORICAL_DB_USER = config('MYEMS_HISTORICAL_DB_USER', default='root')
MYEMS_HISTORICAL_DB_PASSWORD = config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1')
LIVE_IN_DAYS = config('LIVE_IN_DAYS', default=365, cast=int)
IS_DEBUG = config('IS_DEBUG', default=False, cast=bool)
myems_system_db = {
'host': MYEMS_SYSTEM_DB_HOST,
'port': MYEMS_SYSTEM_DB_PORT,
'database': MYEMS_SYSTEM_DB_DATABASE,
'user': MYEMS_SYSTEM_DB_USER,
'password': MYEMS_SYSTEM_DB_PASSWORD,
'host': config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'),
'user': config('MYEMS_SYSTEM_DB_USER', default='root'),
'password': config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1'),
}
myems_historical_db = {
'host': MYEMS_HISTORICAL_DB_HOST,
'port': MYEMS_HISTORICAL_DB_PORT,
'database': MYEMS_HISTORICAL_DB_DATABASE,
'user': MYEMS_HISTORICAL_DB_USER,
'password': MYEMS_HISTORICAL_DB_PASSWORD,
'host': config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'),
'user': config('MYEMS_HISTORICAL_DB_USER', default='root'),
'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'),
}
# indicates how long analog values and digital values will be kept in database
# the longer days the more memory and disc space needed.
# NOTE: By default, energy values in historical db will never be deleted automatically.
live_in_days = LIVE_IN_DAYS
live_in_days = config('LIVE_IN_DAYS', default=365, cast=int)
# indicates if the program is in debug mode
is_debug = IS_DEBUG
is_debug = config('IS_DEBUG', default=False, cast=bool)

View File

@ -1,45 +1,29 @@
from decouple import config
MYEMS_SYSTEM_DB_HOST = config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1')
MYEMS_SYSTEM_DB_PORT = config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int)
MYEMS_SYSTEM_DB_DATABASE = config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db')
MYEMS_SYSTEM_DB_USER = config('MYEMS_SYSTEM_DB_USER', default='root')
MYEMS_SYSTEM_DB_PASSWORD = config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1')
MYEMS_HISTORICAL_DB_HOST = config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1')
MYEMS_HISTORICAL_DB_PORT = config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int)
MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db')
MYEMS_HISTORICAL_DB_USER = config('MYEMS_HISTORICAL_DB_USER', default='root')
MYEMS_HISTORICAL_DB_PASSWORD = config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1')
INTERVAL_IN_SECONDS = config('INTERVAL_IN_SECONDS', default=600, cast=int)
GATEWAY_ID = config('GATEWAY_ID', default=1, cast=int)
GATEWAY_TOKEN = config('GATEWAY_TOKEN', default='983427af-1c35-42ba-8b4d-288675550225')
myems_system_db = {
'host': MYEMS_SYSTEM_DB_HOST,
'port': MYEMS_SYSTEM_DB_PORT,
'database': MYEMS_SYSTEM_DB_DATABASE,
'user': MYEMS_SYSTEM_DB_USER,
'password': MYEMS_SYSTEM_DB_PASSWORD,
'host': config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'),
'user': config('MYEMS_SYSTEM_DB_USER', default='root'),
'password': config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1'),
}
myems_historical_db = {
'host': MYEMS_HISTORICAL_DB_HOST,
'port': MYEMS_HISTORICAL_DB_PORT,
'database': MYEMS_HISTORICAL_DB_DATABASE,
'user': MYEMS_HISTORICAL_DB_USER,
'password': MYEMS_HISTORICAL_DB_PASSWORD,
'host': config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'),
'user': config('MYEMS_HISTORICAL_DB_USER', default='root'),
'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'),
}
# Indicates how long the process waits between readings
interval_in_seconds = INTERVAL_IN_SECONDS
interval_in_seconds = config('INTERVAL_IN_SECONDS', default=600, cast=int)
# Get the gateway ID and token from MyEMS Admin
# This is used for getting data sources associated with the gateway
gateway = {
'id': GATEWAY_ID,
'token': GATEWAY_TOKEN
'id': config('GATEWAY_ID', default=1, cast=int),
'token': config('GATEWAY_TOKEN', default='983427af-1c35-42ba-8b4d-288675550225')
}

View File

@ -1,76 +1,46 @@
from decouple import config
MYEMS_SYSTEM_DB_HOST = config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1')
MYEMS_SYSTEM_DB_PORT = config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int)
MYEMS_SYSTEM_DB_DATABASE = config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db')
MYEMS_SYSTEM_DB_USER = config('MYEMS_SYSTEM_DB_USER', default='root')
MYEMS_SYSTEM_DB_PASSWORD = config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1')
MYEMS_HISTORICAL_DB_HOST = config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1')
MYEMS_HISTORICAL_DB_PORT = config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int)
MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db')
MYEMS_HISTORICAL_DB_USER = config('MYEMS_HISTORICAL_DB_USER', default='root')
MYEMS_HISTORICAL_DB_PASSWORD = config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1')
MYEMS_ENERGY_DB_HOST = config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1')
MYEMS_ENERGY_DB_PORT = config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int)
MYEMS_ENERGY_DB_DATABASE = config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db')
MYEMS_ENERGY_DB_USER = config('MYEMS_ENERGY_DB_USER', default='root')
MYEMS_ENERGY_DB_PASSWORD = config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1')
MYEMS_BILLING_DB_HOST = config('MYEMS_BILLING_DB_HOST', default='127.0.0.1')
MYEMS_BILLING_DB_PORT = config('MYEMS_BILLING_DB_PORT', default=3306, cast=int)
MYEMS_BILLING_DB_DATABASE = config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db')
MYEMS_BILLING_DB_USER = config('MYEMS_BILLING_DB_USER', default='root')
MYEMS_BILLING_DB_PASSWORD = config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1')
MINUTES_TO_COUNT = config('MINUTES_TO_COUNT', default=60, cast=int)
MINUTES_TO_CLEAN = config('MINUTES_TO_CLEAN', default=30, cast=int)
START_DATETIME_UTC = config('START_DATETIME_UTC', default='2019-12-31 16:00:00')
UTC_OFFSET = config('UTC_OFFSET', default='+08:00')
POOL_SIZE = config('POOL_SIZE', default=5, cast=int)
myems_system_db = {
'host': MYEMS_SYSTEM_DB_HOST,
'port': MYEMS_SYSTEM_DB_PORT,
'database': MYEMS_SYSTEM_DB_DATABASE,
'user': MYEMS_SYSTEM_DB_USER,
'password': MYEMS_SYSTEM_DB_PASSWORD,
'host': config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'),
'user': config('MYEMS_SYSTEM_DB_USER', default='root'),
'password': config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1'),
}
myems_energy_db = {
'host': MYEMS_ENERGY_DB_HOST,
'port': MYEMS_ENERGY_DB_PORT,
'database': MYEMS_ENERGY_DB_DATABASE,
'user': MYEMS_ENERGY_DB_USER,
'password': MYEMS_ENERGY_DB_PASSWORD,
'host': config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db'),
'user': config('MYEMS_ENERGY_DB_USER', default='root'),
'password': config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1'),
}
myems_historical_db = {
'host': MYEMS_HISTORICAL_DB_HOST,
'port': MYEMS_HISTORICAL_DB_PORT,
'database': MYEMS_HISTORICAL_DB_DATABASE,
'user': MYEMS_HISTORICAL_DB_USER,
'password': MYEMS_HISTORICAL_DB_PASSWORD,
'host': config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'),
'user': config('MYEMS_HISTORICAL_DB_USER', default='root'),
'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'),
}
# indicates in how many minutes to normalize energy consumption
# 30 for half hourly
# 60 for hourly
minutes_to_count = MINUTES_TO_COUNT
minutes_to_count = config('MINUTES_TO_COUNT', default=60, cast=int)
# indicates within how many minutes to allow myems-cleaning service to clean the historical data
minutes_to_clean = MINUTES_TO_CLEAN
minutes_to_clean = config('MINUTES_TO_CLEAN', default=30, cast=int)
# indicates from when (in UTC timezone) to calculate if the energy data is empty or were cleared
# format string: "%Y-%m-%d %H:%M:%S"
start_datetime_utc = START_DATETIME_UTC
start_datetime_utc = config('START_DATETIME_UTC', default='2019-12-31 16:00:00')
# indicates the project's time zone offset from UTC
utc_offset = UTC_OFFSET
utc_offset = config('UTC_OFFSET', default='+08:00')
# the number of worker processes in parallel for meter and virtual meter
# the pool size depends on the computing performance of the database server and the analysis server
pool_size = POOL_SIZE
pool_size = config('POOL_SIZE', default=5, cast=int)