changes
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,12 +1,16 @@
|
||||
package de.hottis.MeasurementCollector;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
|
||||
public abstract class AMessageParser {
|
||||
private String topic;
|
||||
private ConcurrentLinkedQueue<List<ADataObject>> queue;
|
||||
|
||||
public AMessageParser(String topic) {
|
||||
public AMessageParser(String topic, ConcurrentLinkedQueue<List<ADataObject>> queue) {
|
||||
this.topic = topic;
|
||||
this.queue = queue;
|
||||
}
|
||||
|
||||
public String getTopic() {
|
||||
|
@ -3,6 +3,7 @@ package de.hottis.MeasurementCollector;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
|
||||
import org.openmuc.jmbus.DataRecord;
|
||||
import org.openmuc.jmbus.MBusMessage;
|
||||
@ -20,8 +21,8 @@ public class MBusParser extends AMessageParser {
|
||||
private final FinderOnePhasePowerMeter finderOnePhasePowerMeter;
|
||||
private final FinderThreePhasePowerMeter finderThreePhasePowerMeter;
|
||||
|
||||
public MBusParser() {
|
||||
super(TOPIC);
|
||||
public MBusParser(ConcurrentLinkedQueue<List<ADataObject>> queue) {
|
||||
super(TOPIC, queue);
|
||||
JsonParserFactory jsonParserFactory = JsonParserFactory.getInstance();
|
||||
jsonParser = jsonParserFactory.newJsonParser();
|
||||
hottisFourChannelThermometer = new HottisFourChannelThermometer();
|
||||
|
@ -1,6 +1,8 @@
|
||||
package de.hottis.MeasurementCollector;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
|
||||
public class MeasurementCollector {
|
||||
static final String PROPS_FILENAME = "measurementCollector.props";
|
||||
@ -18,7 +20,9 @@ public class MeasurementCollector {
|
||||
// TestParser testParser = new TestParser();
|
||||
// mqttReceiver.registerParser(testParser);
|
||||
|
||||
MBusParser mbusParser = new MBusParser();
|
||||
ConcurrentLinkedQueue<List<ADataObject>> queue = new ConcurrentLinkedQueue<List<ADataObject>>();
|
||||
|
||||
MBusParser mbusParser = new MBusParser(queue);
|
||||
mqttReceiver.registerParser(mbusParser);
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user