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

Merge branch 'develop'

master
13621160019@163.com 2022-04-25 19:23:43 +08:00
parent b9bb9ad693 e01228e30e
commit 46b002aa06
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- replaced true with 1 in SQL statements of myems-api. - replaced true with 1 in SQL statements of myems-api.
- updated user insert sql statement for failed_login_count. - updated user insert sql statement for failed_login_count.
- updated icons for vertical menu items. - updated icons for vertical menu items.
- updated acquisition procedure of myems-modbus-tcp.
### Fixed ### Fixed
- fixed typo in virtualmetercarbon. - fixed typo in virtualmetercarbon.

9
myems-modbus-tcp/acquisition.py
View File

@ -194,18 +194,15 @@ def process(logger, data_source_id, host, port):
value = result[0] value = result[0]
if point['object_type'] == 'ANALOG_VALUE': if point['object_type'] == 'ANALOG_VALUE':
analog_value_list.append({'data_source_id': data_source_id, analog_value_list.append({'point_id': point['id'],
'point_id': point['id'],
'is_trend': point['is_trend'], 'is_trend': point['is_trend'],
'value': Decimal(value) * point['ratio']}) 'value': Decimal(value) * point['ratio']})
elif point['object_type'] == 'ENERGY_VALUE': elif point['object_type'] == 'ENERGY_VALUE':
energy_value_list.append({'data_source_id': data_source_id, energy_value_list.append({'point_id': point['id'],
'point_id': point['id'],
'is_trend': point['is_trend'], 'is_trend': point['is_trend'],
'value': Decimal(value) * point['ratio']}) 'value': Decimal(value) * point['ratio']})
elif point['object_type'] == 'DIGITAL_VALUE': elif point['object_type'] == 'DIGITAL_VALUE':
digital_value_list.append({'data_source_id': data_source_id, digital_value_list.append({'point_id': point['id'],
'point_id': point['id'],
'is_trend': point['is_trend'], 'is_trend': point['is_trend'],
'value': int(value) * int(point['ratio'])}) 'value': int(value) * int(point['ratio'])})