mirror/thingsboard-gateway
1
0
Fork 0
mirror of https://github.com/thingsboard/thingsboard-gateway synced 2025-10-26 22:31:42 +08:00
Code Issues Releases Wiki Activity

Rewritten processing data to ThingsBoard, when telemetry or attributes in array.

Browse Source
This commit is contained in:
zbeacon
2019-11-14 13:25:23 +02:00
parent fdbeaba70e
commit fad8a4c19d
6 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
thingsboard_gateway/gateway/tb_gateway_service.py
View File

@@ -178,12 +178,31 @@ class TBGatewayService:
"current_event",
current_event["deviceName"])
if current_event.get("telemetry"):
data_to_send = loads('{"ts": %f,"values": %s}' % (int(time.time()*1000),
','.join(dumps(param) for param in current_event["telemetry"])))
log.debug(current_event)
telemetry = {}
if type(current_event["telemetry"]) == list:
for item in current_event["telemetry"]:
for key in item:
telemetry[key] = item[key]
else:
telemetry = current_event["telemetry"]
log.debug(telemetry)
data_to_send = loads('{"ts": %f,"values": %s}' % (int(time.time()*1000), dumps(telemetry)))
# data_to_send = loads('{"ts": %f,"values": {%s}}' % (int(time.time()*1000),
# ','.join(dumps(param) for param in current_event["telemetry"])))
self.__published_events.append(self.tb_client.client.gw_send_telemetry(current_event["deviceName"],
data_to_send))
if current_event.get("attributes"):
data_to_send = loads('%s' % (','.join(dumps(param) for param in current_event["attributes"])))
log.debug(current_event)
attributes = {}
if type(current_event["attributes"]) == list:
for item in current_event["attributes"]:
for key in item:
attributes[key] = item[key]
else:
attributes = current_event["attributes"]
log.debug(attributes)
data_to_send = loads('%s' % dumps(attributes))
self.__published_events.append(self.tb_client.client.gw_send_attributes(current_event["deviceName"],
data_to_send))
success = True