changes
This commit is contained in:
@ -1,7 +1,7 @@
|
|||||||
;mqtt.broker = tcp://172.16.2.15:1883
|
mqtt.broker = tcp://172.16.2.15:1883
|
||||||
mqtt.broker = tcp://eupenstrasse20.dynamic.hottis.de:2883
|
;mqtt.broker = tcp://eupenstrasse20.dynamic.hottis.de:2883
|
||||||
mqtt.username = tron
|
;mqtt.username = tron
|
||||||
mqtt.password = geheim123
|
;mqtt.password = geheim123
|
||||||
|
|
||||||
mbus.dataparser.1 = light,Light,de.hottis.measurementCollector.FinderOnePhasePowerMeter
|
mbus.dataparser.1 = light,Light,de.hottis.measurementCollector.FinderOnePhasePowerMeter
|
||||||
mbus.dataparser.2 = computer,Computer,de.hottis.measurementCollector.FinderOnePhasePowerMeter
|
mbus.dataparser.2 = computer,Computer,de.hottis.measurementCollector.FinderOnePhasePowerMeter
|
||||||
|
5
pom.xml
5
pom.xml
@ -18,6 +18,11 @@
|
|||||||
<version>3.8.1</version>
|
<version>3.8.1</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>quick-json</groupId>
|
||||||
|
<artifactId>quick-json</artifactId>
|
||||||
|
<version>1.0.2.3</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.hottis.common</groupId>
|
<groupId>de.hottis.common</groupId>
|
||||||
<artifactId>HottisLibJava</artifactId>
|
<artifactId>HottisLibJava</artifactId>
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package de.hottis.measurementCollector;
|
package de.hottis.measurementCollector;
|
||||||
|
|
||||||
|
import de.hottis.smarthomelib.ADataObject;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
package de.hottis.measurementCollector;
|
package de.hottis.measurementCollector;
|
||||||
|
|
||||||
|
import de.hottis.common.HottisCommonException;
|
||||||
|
import de.hottis.common.MyQueue;
|
||||||
|
import de.hottis.smarthomelib.ADataObject;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
@ -10,8 +13,8 @@ import org.apache.logging.log4j.Logger;
|
|||||||
public abstract class AMessageParser {
|
public abstract class AMessageParser {
|
||||||
final protected Logger logger = LogManager.getRootLogger();
|
final protected Logger logger = LogManager.getRootLogger();
|
||||||
|
|
||||||
private String topic;
|
private final String topic;
|
||||||
private MyQueue<ADataObject> queue;
|
private final MyQueue<ADataObject> queue;
|
||||||
protected Properties config;
|
protected Properties config;
|
||||||
|
|
||||||
public AMessageParser(String topic, Properties config, MyQueue<ADataObject> queue) {
|
public AMessageParser(String topic, Properties config, MyQueue<ADataObject> queue) {
|
||||||
@ -28,7 +31,7 @@ public abstract class AMessageParser {
|
|||||||
return this.topic;
|
return this.topic;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void enqueue(List<ADataObject> itemList) throws MeasurementCollectorException {
|
public void enqueue(List<ADataObject> itemList) throws HottisCommonException {
|
||||||
for (ADataObject ado : itemList) {
|
for (ADataObject ado : itemList) {
|
||||||
queue.enqueue(ado);
|
queue.enqueue(ado);
|
||||||
logger.debug("message enqueued");
|
logger.debug("message enqueued");
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package de.hottis.measurementCollector;
|
package de.hottis.measurementCollector;
|
||||||
|
|
||||||
|
import de.hottis.smarthomelib.ADataObject;
|
||||||
|
import de.hottis.smarthomelib.ElectricEnergyDataObject;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package de.hottis.measurementCollector;
|
package de.hottis.measurementCollector;
|
||||||
|
|
||||||
|
import de.hottis.smarthomelib.ADataObject;
|
||||||
|
import de.hottis.smarthomelib.ElectricEnergyDataObject;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package de.hottis.measurementCollector;
|
package de.hottis.measurementCollector;
|
||||||
|
|
||||||
|
import de.hottis.smarthomelib.ADataObject;
|
||||||
|
import de.hottis.smarthomelib.TemperatureDataObject;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -14,6 +14,8 @@ import org.openmuc.jmbus.VariableDataStructure;
|
|||||||
|
|
||||||
import com.json.parsers.JSONParser;
|
import com.json.parsers.JSONParser;
|
||||||
import com.json.parsers.JsonParserFactory;
|
import com.json.parsers.JsonParserFactory;
|
||||||
|
import de.hottis.common.MyQueue;
|
||||||
|
import de.hottis.smarthomelib.ADataObject;
|
||||||
|
|
||||||
public class MBusParser extends AMessageParser {
|
public class MBusParser extends AMessageParser {
|
||||||
static final String DATA_PARSER_PROP = "mbus.dataparser";
|
static final String DATA_PARSER_PROP = "mbus.dataparser";
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
package de.hottis.measurementCollector;
|
package de.hottis.measurementCollector;
|
||||||
|
|
||||||
|
import de.hottis.common.JmsTopic;
|
||||||
|
import de.hottis.smarthomelib.ADataObject;
|
||||||
|
import java.io.FileInputStream;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@ -15,7 +18,9 @@ public class MeasurementCollector {
|
|||||||
logger.info("MeasurementCollector starting");
|
logger.info("MeasurementCollector starting");
|
||||||
|
|
||||||
final Properties config = new Properties();
|
final Properties config = new Properties();
|
||||||
config.load(MeasurementCollector.class.getClassLoader().getResourceAsStream(PROPS_FILENAME));
|
try (FileInputStream propsFileInputStream = new FileInputStream(PROPS_FILENAME)) {
|
||||||
|
config.load(propsFileInputStream);
|
||||||
|
}
|
||||||
logger.debug("Configuration loaded");
|
logger.debug("Configuration loaded");
|
||||||
|
|
||||||
MqttReceiver mqttReceiver = new MqttReceiver(config);
|
MqttReceiver mqttReceiver = new MqttReceiver(config);
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
package de.hottis.measurementCollector;
|
||||||
|
|
||||||
|
import de.hottis.common.HottisCommonException;
|
||||||
|
|
||||||
|
public class MeasurementCollectorException extends HottisCommonException {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
public MeasurementCollectorException(String msg, Throwable cause) {
|
||||||
|
super(msg, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MeasurementCollectorException(String msg) {
|
||||||
|
super(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user