Преглед изворни кода

add build.bat command for build pj and changed config

master
matthew.ng пре 2 година
родитељ
комит
14cf887b2e
4 измењених фајлова са 20 додато и 6 уклоњено
  1. +1
    -0
      build.bat
  2. +6
    -1
      src/main/java/com/ffii/towngas/config/MqttConsumerCallBack.java
  3. +12
    -4
      src/main/java/com/ffii/towngas/config/MqttConsumerConfig.java
  4. +1
    -1
      src/main/resources/application-mqtt-config.yml

+ 1
- 0
build.bat Прегледај датотеку

@@ -0,0 +1 @@
gradlew clean build -x test

+ 6
- 1
src/main/java/com/ffii/towngas/config/MqttConsumerCallBack.java Прегледај датотеку

@@ -10,6 +10,7 @@ import com.google.gson.Gson;
public class MqttConsumerCallBack implements MqttCallback {

private Gson gson = new Gson();
private boolean firstMessageReceived = false;

@Override
public void connectionLost(Throwable throwable) {
@@ -18,8 +19,12 @@ public class MqttConsumerCallBack implements MqttCallback {

@Override
public void messageArrived(String topic, MqttMessage message) throws Exception {
if (!firstMessageReceived) {
// Skip the first message
firstMessageReceived = true;
return;
}
String payload = new String(message.getPayload());

MqttRawData mqttRawData = gson.fromJson(payload, MqttRawData.class);
mqttRawData.setTopic(topic);
mqttRawData.setQos(message.getQos());


+ 12
- 4
src/main/java/com/ffii/towngas/config/MqttConsumerConfig.java Прегледај датотеку

@@ -11,6 +11,9 @@ import org.springframework.context.annotation.Configuration;

@Configuration
public class MqttConsumerConfig {

private boolean connected = false;

@Value("${spring.mqtt.username}")
private String username;

@@ -47,13 +50,15 @@ public class MqttConsumerConfig {
options.setKeepAliveInterval(20);
options.setWill("willTopic", (clientId + "Disconnected").getBytes(), 0, false);
client.setCallback(new MqttConsumerCallBack());
System.out.println("Start Connection");
client.connect(options);
System.out.println("End Connection");
int[] qos = { 1, 1 };
// Topics
String[] topics = { "topic1", "topic2" };
client.subscribe(topics, qos);
System.out.println("Subscribing to topic \"" + defaultTopic + "\" for client instance \"" + client.getClientId()
+ "\" using QoS " + qos[0]);
String[] defaultTopics = defaultTopic.split(",");
client.subscribe(defaultTopics, qos);
// Set the connected flag
connected = true;
} catch (MqttException e) {
e.printStackTrace();
}
@@ -68,6 +73,9 @@ public class MqttConsumerConfig {
}

public void subscribe(String topic, int qos) {
if (!connected) {
return;
}
try {
client.subscribe(topic, qos);
} catch (MqttException e) {


+ 1
- 1
src/main/resources/application-mqtt-config.yml Прегледај датотеку

@@ -6,4 +6,4 @@ spring:
client:
id: cfghiftghigyui
default:
topic: topic
topic: topic1, topic2

Loading…
Откажи
Сачувај