neben/cemmetering-preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: neben:0.0.3
Branches Tags
neben:master
neben:1.0.2 neben:1.0.1 neben:1.0.0 neben:0.1.1 neben:0.1.0 neben:0.0.7 neben:0.0.6 neben:0.0.5 neben:0.0.4 neben:0.0.3 neben:0.0.2 neben:0.0.1
..
compare: neben:0.0.6
Branches Tags
neben:master
neben:1.0.2 neben:1.0.1 neben:1.0.0 neben:0.1.1 neben:0.1.0 neben:0.0.7 neben:0.0.6 neben:0.0.5 neben:0.0.4 neben:0.0.3 neben:0.0.2 neben:0.0.1

3 Commits
0.0.3 ... 0.0.6

Author SHA1 Message Date
Wolfgang Hottgenroth
41ea343be2 another fix 2023-05-23 13:28:14 +02:00
Wolfgang Hottgenroth
f8f9449c99 another fix 2023-05-23 13:26:48 +02:00
Wolfgang Hottgenroth
ab35b815fb fix 2023-05-23 13:19:49 +02:00
1 changed files with 5 additions and 5 deletions
Expand all files Collapse all files

10
src/preprocess.py
View File

@ -63,7 +63,7 @@ class DbOp(object):
'unit': res[2] 'unit': res[2]
} }
logger.debug(f"{variable=}") logger.debug(f"{variable=}")
return application return variable
except Exception as e: except Exception as e:
logger.error(f"Error getting variable: {e}") logger.error(f"Error getting variable: {e}")
raise VariableNotFoundException(appId, converterId, deviceId, variableId) raise VariableNotFoundException(appId, converterId, deviceId, variableId)
@ -79,7 +79,7 @@ class DbOp(object):
with conn.cursor() as cur: with conn.cursor() as cur:
cur.execute(""" cur.execute("""
insert into measurement_t (time, application, variable, value, unit) insert into measurement_t (time, application, variable, value, unit)
values (now(), %(application)s, %(variable)s, %(value)s, %(unit)s values (now(), %(application)s, %(variable)s, %(value)s, %(unit)s)
""", """,
{ {
'application': measurement['application'], 'application': measurement['application'],
@ -104,10 +104,10 @@ def splitTopic(topic):
deviceId = 'mains', deviceId = 'mains',
variableId = r[0] variableId = r[0]
elif (len(r) == 2): elif (len(r) == 2):
(deviceId, variableid) = r (deviceId, variableId) = r
else: else:
raise InvalidTopicException(topic) raise InvalidTopicException(topic)
return (appId, converterId, deviceId, variableid) return (appId, converterId, deviceId, variableId)
def mqttOnConnectCallback(client, userdata, flags, rc): def mqttOnConnectCallback(client, userdata, flags, rc):
logger.info("mqtt connected") logger.info("mqtt connected")
@ -124,7 +124,7 @@ def mqttOnMessageCallback(client, userdata, message):
(appId, converterId, deviceId, variableId) = splitTopic(topic) (appId, converterId, deviceId, variableId) = splitTopic(topic)
dbh = DbOp(config) dbh = DbOp(config)
variable = dbh.getVariable(appId, converterId, deviceId, variableid) variable = dbh.getVariable(appId, converterId, deviceId, variableId)
measurement = { measurement = {
"application": variable["application"], "application": variable["application"],
"variable": variable["variable"], "variable": variable["variable"],