Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Sliced and Table FTP Connector when ts is present #1582

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed Sliced and Table FTP Connector when ts is present #1582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions thingsboard_gateway/connectors/ftp/ftp_uplink_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ def _get_required_data(self, left_symbol, right_symbol):
def _convert_table_view_data(self, config, data):
dict_result, get_device_name_from_data, get_device_type_from_data = self._get_required_data('${', '}')
try:
arr = data.split(self.__config['delimiter'])
for data_type in self.__data_types:
values = {}
ts = None
for information in self.__config[data_type]:
arr = data.split(self.__config['delimiter'])

key_index = information['key']
val_index = information['value']

Expand All @@ -61,10 +62,13 @@ def _convert_table_view_data(self, config, data):
if '${' in information['value'] and '}' in information['value']:
val_index = config['headers'].index(re.sub(r'[^\w]', '', information['value']))

dict_result[self.__data_types[data_type]].append({
arr[key_index] if isinstance(key_index, int) else key_index:
arr[val_index] if isinstance(val_index, int) else val_index
})
key = arr[key_index] if isinstance(key_index, int) else key_index
val = arr[val_index] if isinstance(val_index, int) else val_index

if data_type == 'timeseries' and key == 'ts':
ts = int(val)
else:
values[key] = val

if get_device_name_from_data:
index = config['headers'].index(re.sub(r'[^\w]', '', self.__config['devicePatternName']))
Expand All @@ -73,6 +77,12 @@ def _convert_table_view_data(self, config, data):
index = config['headers'].index(re.sub(r'[^\w]', '', self.__config['devicePatternType']))
dict_result['deviceType'] = arr[index]

for item in values:
if data_type == 'timeseries' and ts is not None:
dict_result[self.__data_types[data_type]].append({'ts': ts, 'values': {item: values[item]}})
else:
dict_result[self.__data_types[data_type]].append({item: values[item]})

except Exception as e:
StatisticsService.count_connector_message(self._log.name, 'convertersMsgDropped')
self._log.error('Error in converter, for config: \n%s\n and message: \n%s\n %s', dumps(self.__config), data,
Expand All @@ -98,21 +108,32 @@ def _get_key_or_value(key, arr):
def _convert_slices_view_data(self, data):
dict_result, get_device_name_from_data, get_device_type_from_data = self._get_required_data('[', ']')
try:
arr = data.split(self.__config['delimiter'])
for data_type in self.__data_types:
values = {}
ts = None
for information in self.__config[data_type]:
arr = data.split(self.__config['delimiter'])

val = self._get_key_or_value(information['value'], arr)
key = self._get_key_or_value(information['key'], arr)

dict_result[self.__data_types[data_type]].append({key: val})
if data_type == 'timeseries' and key == 'ts':
ts = int(val)
else:
values[key] = val

if get_device_name_from_data:
if self.__config['devicePatternName'] == information['value']:
dict_result['deviceName'] = val
if get_device_type_from_data:
if self.__config['devicePatternType'] == information['value']:
dict_result['deviceType'] = val

for item in values:
if data_type == 'timeseries' and ts is not None:
dict_result[self.__data_types[data_type]].append({'ts': ts, 'values': {item: values[item]}})
else:
dict_result[self.__data_types[data_type]].append({item: values[item]})

except Exception as e:
StatisticsService.count_connector_message(self._log.name, 'convertersMsgDropped')
self._log.error('Error in converter, for config: \n%s\n and message: \n%s\n %s', dumps(self.__config), data,
Expand Down