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

Merge branch 'develop'

pull/142/MERGE
13621160019@163.com 2022-03-27 15:27:03 +08:00
parent 8a30bcab7b 23ea4dd74d
commit 0b6dd85ffc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
myems-cleaning/clean_energy_value.py
View File

@ -186,7 +186,7 @@ def process(logger):
cursor_system = None cursor_system = None
try: try:
cnx_system = mysql.connector.connect(**config.myems_system_db) cnx_system = mysql.connector.connect(**config.myems_system_db)
cursor_system = cnx_system.cursor(dictionary=True) cursor_system = cnx_system.cursor()
query = (" SELECT id, high_limit, low_limit " query = (" SELECT id, high_limit, low_limit "
" FROM tbl_points " " FROM tbl_points "
@ -197,8 +197,8 @@ def process(logger):
point_dict = dict() point_dict = dict()
if rows_points is not None and len(rows_points) > 0: if rows_points is not None and len(rows_points) > 0:
for row in rows_points: for row in rows_points:
point_dict[row['id']] = {"high_limit": row['high_limit'], point_dict[row[0]] = {"high_limit": row[1],
"low_limit": row['low_limit']} "low_limit": row[2]}
except Exception as e: except Exception as e:
logger.error("Error in step 2.1 of clean_energy_value.process " + str(e)) logger.error("Error in step 2.1 of clean_energy_value.process " + str(e))
time.sleep(60) time.sleep(60)

14
myems-normalization/virtualpoint.py
View File

@ -22,7 +22,7 @@ def calculate(logger):
cursor_system_db = None cursor_system_db = None
try: try:
cnx_system_db = mysql.connector.connect(**config.myems_system_db) cnx_system_db = mysql.connector.connect(**config.myems_system_db)
cursor_system_db = cnx_system_db.cursor(dictionary=True) cursor_system_db = cnx_system_db.cursor()
except Exception as e: except Exception as e:
logger.error("Error in step 0 of virtual point calculate " + str(e)) logger.error("Error in step 0 of virtual point calculate " + str(e))
if cursor_system_db: if cursor_system_db:
@ -48,12 +48,12 @@ def calculate(logger):
continue continue
for row in rows_virtual_points: for row in rows_virtual_points:
meta_result = {"id": row['id'], meta_result = {"id": row[0],
"name": row['name'], "name": row[1],
"data_source_id": row['data_source_id'], "data_source_id": row[2],
"high_limit": row['high_limit'], "high_limit": row[3],
"low_limit": row['low_limit'], "low_limit": row[4],
"address": row['address']} "address": row[5]}
virtual_point_list.append(meta_result) virtual_point_list.append(meta_result)
except Exception as e: except Exception as e: