DataParsers loaded from configuration, DataObjectQueue introduced
This commit is contained in:
@ -1,9 +1,12 @@
|
||||
package de.hottis.MeasurementCollector;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
import java.util.Properties;
|
||||
|
||||
import org.openmuc.jmbus.DataRecord;
|
||||
import org.openmuc.jmbus.MBusMessage;
|
||||
@ -13,71 +16,80 @@ import com.json.parsers.JSONParser;
|
||||
import com.json.parsers.JsonParserFactory;
|
||||
|
||||
public class MBusParser extends AMessageParser {
|
||||
static final String DATA_PARSER_PROP = "mbus.dataparser";
|
||||
|
||||
static final String TOPIC = "IoT/Measurement/MeterbusHub";
|
||||
|
||||
private final JSONParser jsonParser;
|
||||
private final HottisFourChannelThermometer hottisFourChannelThermometer;
|
||||
private final FinderOnePhasePowerMeter finderOnePhasePowerMeter;
|
||||
private final FinderThreePhasePowerMeter finderThreePhasePowerMeter;
|
||||
|
||||
public MBusParser(ConcurrentLinkedQueue<List<ADataObject>> queue) {
|
||||
super(TOPIC, queue);
|
||||
|
||||
private HashMap<String, ADataParser> dataParsers;
|
||||
|
||||
public MBusParser(Properties config, DataObjectQueue queue) {
|
||||
super(TOPIC, config, queue);
|
||||
JsonParserFactory jsonParserFactory = JsonParserFactory.getInstance();
|
||||
jsonParser = jsonParserFactory.newJsonParser();
|
||||
hottisFourChannelThermometer = new HottisFourChannelThermometer();
|
||||
finderOnePhasePowerMeter = new FinderOnePhasePowerMeter();
|
||||
finderThreePhasePowerMeter = new FinderThreePhasePowerMeter();
|
||||
dataParsers = new HashMap<String, ADataParser>();
|
||||
}
|
||||
|
||||
public void registerConfiguredDataParsers() throws MeasurementCollectorException {
|
||||
try {
|
||||
@SuppressWarnings("unchecked")
|
||||
Enumeration<String> propNames = (Enumeration<String>) config.propertyNames();
|
||||
while (propNames.hasMoreElements()) {
|
||||
String propName = propNames.nextElement();
|
||||
if (propName.startsWith(DATA_PARSER_PROP)) {
|
||||
String[] parserConfigElements = config.get(propName).toString().split(",");
|
||||
String nameInMsg = parserConfigElements[0];
|
||||
String nameInDatabase = parserConfigElements[1];
|
||||
String dataParserClassName = parserConfigElements[2];
|
||||
|
||||
Class<?> klass = Class.forName(dataParserClassName);
|
||||
Constructor<?> constructor = klass.getConstructor(String.class);
|
||||
ADataParser dataParser = (ADataParser) constructor.newInstance(nameInDatabase);
|
||||
|
||||
dataParsers.put(nameInMsg, dataParser);
|
||||
System.out.println(dataParserClassName + " registered for " + nameInMsg + ", " + nameInDatabase);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new MeasurementCollectorException("Exception when registering configured data parsers", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(LocalDateTime timestamp, String msgPayload) {
|
||||
try {
|
||||
@SuppressWarnings("rawtypes")
|
||||
Map payloadMap = jsonParser.parseJson(msgPayload);
|
||||
@SuppressWarnings("rawtypes")
|
||||
String name = (String)(((Map)(payloadMap.get("metadata"))).get("name"));
|
||||
@SuppressWarnings("rawtypes")
|
||||
String mbusMsgTxt = (String)(((Map)(payloadMap.get("data"))).get("telegram"));
|
||||
String [] octetsTxt = mbusMsgTxt.split(" ");
|
||||
byte [] octets = new byte[octetsTxt.length];
|
||||
for (int i = 0; i < octetsTxt.length; i++) {
|
||||
octets[i] = (byte)(Integer.parseInt(octetsTxt[i], 16) & 0xff);
|
||||
}
|
||||
|
||||
|
||||
MBusMessage mbusMsg = MBusMessage.decode(octets, octets.length);
|
||||
VariableDataStructure variableDataStructure = mbusMsg.getVariableDataResponse();
|
||||
variableDataStructure.decode();
|
||||
List<DataRecord> dataRecords = variableDataStructure.getDataRecords();
|
||||
|
||||
//for (DataRecord dataRecord : dataRecords) {
|
||||
// System.out.println(dataRecord.getScaledDataValue() + " " + dataRecord.getUnit().getUnit());
|
||||
//}
|
||||
|
||||
List<ADataObject> measurementItems;
|
||||
switch (name) {
|
||||
case "thermom.":
|
||||
measurementItems = hottisFourChannelThermometer.parse(timestamp, name, dataRecords);
|
||||
break;
|
||||
case "light":
|
||||
case "computer":
|
||||
case "freezer":
|
||||
case "dryer":
|
||||
case "laundry":
|
||||
case "dishwasher":
|
||||
measurementItems = finderOnePhasePowerMeter.parse(timestamp, name.substring(0,1).toUpperCase() + name.substring(1).toLowerCase(), dataRecords);
|
||||
break;
|
||||
case "electricity":
|
||||
measurementItems = finderThreePhasePowerMeter.parse(timestamp, "Total", dataRecords);
|
||||
break;
|
||||
default:
|
||||
System.out.println("unknown name");
|
||||
measurementItems = null;
|
||||
|
||||
if (dataParsers.containsKey(name)) {
|
||||
List<ADataObject> measurementItems = dataParsers.get(name).parse(timestamp, dataRecords);
|
||||
|
||||
for (ADataObject ado : measurementItems) {
|
||||
System.out.println(ado);
|
||||
}
|
||||
|
||||
queue.add(measurementItems);
|
||||
System.out.println("Queue size: " + queue.size());
|
||||
} else {
|
||||
System.out.println("unknown name: " + name);
|
||||
}
|
||||
|
||||
for (ADataObject ado : measurementItems) {
|
||||
System.out.println(ado);
|
||||
}
|
||||
|
||||
queue.add(measurementItems);
|
||||
System.out.println("Queue size: " + queue.size());
|
||||
} catch (Exception e) {
|
||||
System.out.println("Exception when handling mbus message: " + e);
|
||||
}
|
||||
|
Reference in New Issue
Block a user