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-04-09 00:30:00 +08:00
parent 7a3fbbd1a8 f190c9d5c3
commit 227fb6b20b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myems-api/README.md
View File

@ -59,7 +59,7 @@ Install and run with waitress:
```bash ```bash
pip install waitress pip install waitress
cd myems\myems-api cd myems\myems-api
waitress-serve --listen=127.0.0.1:8000 app:api waitress-serve --listen=0.0.0.0:8000 app:api
``` ```

2
myems-api/core/virtualmeter.py
View File

@ -89,7 +89,7 @@ class VirtualMeterCollection:
query_variables = (" SELECT v.id, v.name, v.meter_type, v.meter_id " query_variables = (" SELECT v.id, v.name, v.meter_type, v.meter_id "
" FROM tbl_virtual_meters vm, tbl_variables v " " FROM tbl_virtual_meters vm, tbl_variables v "
" WHERE vm.id = %s AND v.virtual_meter_id = vm.id " " WHERE vm.id = %s AND v.virtual_meter_id = vm.id "
" ORDER BY SUBSTRING(v.name,2) + 0 ") " ORDER BY SUBSTRING(v.name, 2, 10) + 0 ")
cursor.execute(query_variables, (meta_result['id'],)) cursor.execute(query_variables, (meta_result['id'],))
rows_variables = cursor.fetchall() rows_variables = cursor.fetchall()
if rows_variables is not None: if rows_variables is not None: