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

Merge branch 'PR' into develop

pull/126/MERGE
13621160019@163.com 2022-02-23 11:25:41 +08:00
parent d2456134e9 d19838fd32
commit 2e3e38b4b3
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
myems-api/core/meter.py
View File

@ -913,7 +913,6 @@ class MeterPointCollection:
description='API.INVALID_METER_ID') description='API.INVALID_METER_ID')
new_values = json.loads(raw_json) new_values = json.loads(raw_json)
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor() cursor = cnx.cursor()
@ -925,15 +924,27 @@ class MeterPointCollection:
cnx.disconnect() cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
description='API.METER_NOT_FOUND') description='API.METER_NOT_FOUND')
cursor.execute(" SELECT name, object_type "
cursor.execute(" SELECT name "
" FROM tbl_points " " FROM tbl_points "
" WHERE id = %s ", (new_values['data']['point_id'],)) " WHERE id = %s ", (new_values['data']['point_id'],))
if cursor.fetchone() is None: row = cursor.fetchone()
if row is None:
cursor.close() cursor.close()
cnx.disconnect() cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
description='API.POINT_NOT_FOUND') description='API.POINT_NOT_FOUND')
if row[1] == 'ENERGY_VALUE':
query = (" SELECT tmp.id,tmp.meter_id,tmp.point_id,tp.object_type "
" FROM tbl_meters_points tmp "
" LEFT JOIN tbl_points tp ON tmp.point_id = tp.id"
" WHERE tmp.meter_id = %s AND tp.object_type = %s")
cursor.execute(query, (id_, 'ENERGY_VALUE',))
rows = cursor.fetchall()
if rows is not None:
cursor.close()
cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_404, title='API.BAD_REQUEST',
description='API.POINT_OBJECT_TYPE_IS_ALREADY_IN_USE')
query = (" SELECT id " query = (" SELECT id "
" FROM tbl_meters_points " " FROM tbl_meters_points "