seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add the judgement

pull/142/head
hyh123a 2022-04-22 20:48:16 +08:00
parent d76cb1cae9
commit 01c368900f
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
myems-api/config.py
View File

@ -6,7 +6,7 @@ myems_system_db = {
'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'), 'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'),
'user': config('MYEMS_SYSTEM_DB_USER', default='root'), 'user': config('MYEMS_SYSTEM_DB_USER', default='root'),
'password': config('MYEMS_SYSTEM_DB_PASSWORD', default=''), 'password': config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1'),
} }
myems_energy_db = { myems_energy_db = {
@ -14,7 +14,7 @@ myems_energy_db = {
'port': config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db'), 'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db'),
'user': config('MYEMS_ENERGY_DB_USER', default='root'), 'user': config('MYEMS_ENERGY_DB_USER', default='root'),
'password': config('MYEMS_ENERGY_DB_PASSWORD', default=''), 'password': config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1'),
} }
myems_energy_baseline_db = { myems_energy_baseline_db = {
@ -22,7 +22,7 @@ myems_energy_baseline_db = {
'port': config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db'), 'database': config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db'),
'user': config('MYEMS_ENERGY_BASELINE_DB_USER', default='root'), 'user': config('MYEMS_ENERGY_BASELINE_DB_USER', default='root'),
'password': config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default=''), 'password': config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default='!MyEMS1'),
} }
myems_billing_db = { myems_billing_db = {
@ -30,7 +30,7 @@ myems_billing_db = {
'port': config('MYEMS_BILLING_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_BILLING_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db'), 'database': config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db'),
'user': config('MYEMS_BILLING_DB_USER', default='root'), 'user': config('MYEMS_BILLING_DB_USER', default='root'),
'password': config('MYEMS_BILLING_DB_PASSWORD', default=''), 'password': config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1'),
} }
myems_billing_baseline_db = { myems_billing_baseline_db = {
@ -38,7 +38,7 @@ myems_billing_baseline_db = {
'port': config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db'), 'database': config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db'),
'user': config('MYEMS_BILLING_BASELINE_DB_USER', default='root'), 'user': config('MYEMS_BILLING_BASELINE_DB_USER', default='root'),
'password': config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default=''), 'password': config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default='!MyEMS1'),
} }
myems_historical_db = { myems_historical_db = {
@ -46,7 +46,7 @@ myems_historical_db = {
'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'), 'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'),
'user': config('MYEMS_HISTORICAL_DB_USER', default='root'), 'user': config('MYEMS_HISTORICAL_DB_USER', default='root'),
'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default=''), 'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'),
} }
myems_user_db = { myems_user_db = {
@ -54,7 +54,7 @@ myems_user_db = {
'port': config('MYEMS_USER_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_USER_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_USER_DB_DATABASE', default='myems_user_db'), 'database': config('MYEMS_USER_DB_DATABASE', default='myems_user_db'),
'user': config('MYEMS_USER_DB_USER', default='root'), 'user': config('MYEMS_USER_DB_USER', default='root'),
'password': config('MYEMS_USER_DB_PASSWORD', default=''), 'password': config('MYEMS_USER_DB_PASSWORD', default='!MyEMS1'),
} }
myems_fdd_db = { myems_fdd_db = {
@ -62,7 +62,7 @@ myems_fdd_db = {
'port': config('MYEMS_FDD_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_FDD_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db'), 'database': config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db'),
'user': config('MYEMS_FDD_DB_USER', default='root'), 'user': config('MYEMS_FDD_DB_USER', default='root'),
'password': config('MYEMS_FDD_DB_PASSWORD', default=''), 'password': config('MYEMS_FDD_DB_PASSWORD', default='!MyEMS1'),
} }
myems_reporting_db = { myems_reporting_db = {
@ -70,7 +70,7 @@ myems_reporting_db = {
'port': config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db'), 'database': config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db'),
'user': config('MYEMS_REPORTING_DB_USER', default='root'), 'user': config('MYEMS_REPORTING_DB_USER', default='root'),
'password': config('MYEMS_REPORTING_DB_PASSWORD', default=''), 'password': config('MYEMS_REPORTING_DB_PASSWORD', default='!MyEMS1'),
} }
myems_carbon_db = { myems_carbon_db = {
@ -78,7 +78,7 @@ myems_carbon_db = {
'port': config('MYEMS_CARBON_DB_PORT', default=3306, cast=int), 'port': config('MYEMS_CARBON_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_CARBON_DB_DATABASE', default='myems_carbon_db'), 'database': config('MYEMS_CARBON_DB_DATABASE', default='myems_carbon_db'),
'user': config('MYEMS_CARBON_DB_USER', default='root'), 'user': config('MYEMS_CARBON_DB_USER', default='root'),
'password': config('MYEMS_CARBON_DB_PASSWORD', default=''), 'password': config('MYEMS_CARBON_DB_PASSWORD', default='!MyEMS1'),
} }
# indicated in how many minutes to calculate meter energy consumption # indicated in how many minutes to calculate meter energy consumption

3
myems-api/core/svg.py
View File

@ -107,6 +107,9 @@ class Item:
for item in ids: for item in ids:
_type = item[0:2] _type = item[0:2]
_number = item[2:] _number = item[2:]
if _type not in _dict.keys():
print("Error Type", item)
continue
if _number not in _dict[_type].keys(): if _number not in _dict[_type].keys():
_dict[_type][_number] = 111 _dict[_type][_number] = 111