提交 f719a1c3 authored 作者: wangqiang's avatar wangqiang

rpc sub

上级 6641cda0
...@@ -70,7 +70,8 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall ...@@ -70,7 +70,8 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
private static final String DEVICE_TELEMETRY_TOPIC = "devices/telemetry"; private static final String DEVICE_TELEMETRY_TOPIC = "devices/telemetry";
private static final String DEVICE_ATTRIBUTES_TOPIC = "devices/attrs"; private static final String DEVICE_ATTRIBUTES_TOPIC = "devices/attrs";
private static final String DEVICE_RPC_TOPIC = "devices/rpc"; private static final String DEVICE_RPC_RES_TOPIC = "devices/rpc/req";
private static final String DEVICE_RPC_TOPIC = DEVICE_RPC_RES_TOPIC + "/+";
private static final String DEVICE_EVENT_TOPIC = "devices/event"; private static final String DEVICE_EVENT_TOPIC = "devices/event";
private static final String DEVICE_GET_ATTRIBUTES_REQUEST_TOPIC = "devices/attrs/req/1"; private static final String DEVICE_GET_ATTRIBUTES_REQUEST_TOPIC = "devices/attrs/req/1";
private static final String DEVICE_GET_ATTRIBUTES_RESPONSE_PLUS_TOPIC = "devices/attrs/res/+"; private static final String DEVICE_GET_ATTRIBUTES_RESPONSE_PLUS_TOPIC = "devices/attrs/res/+";
...@@ -303,15 +304,15 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall ...@@ -303,15 +304,15 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
onAttributesUpdate(message); onAttributesUpdate(message);
} else if (topic.equals(DEVICE_GET_ATTRIBUTES_RESPONSE_PLUS_TOPIC)) { } else if (topic.equals(DEVICE_GET_ATTRIBUTES_RESPONSE_PLUS_TOPIC)) {
onDeviceAttributesResponse(message); onDeviceAttributesResponse(message);
} else if (topic.equals(DEVICE_RPC_TOPIC)) { } else if (topic.startsWith(DEVICE_RPC_RES_TOPIC)) {
onRpcCommand(message); onRpcCommand(message);
} else if (topic.equals(DEVICE_ATTRIBUTES_TOPIC)) { } else if (topic.startsWith(DEVICE_ATTRIBUTES_TOPIC)) {
onGatewayAttributesUpdate(message); onGatewayAttributesUpdate(message);
} else if (topic.equals(DEVICE_GET_ATTRIBUTES_RESPONSE_TOPIC)) { } else if (topic.equals(DEVICE_GET_ATTRIBUTES_RESPONSE_TOPIC)) {
onGatewayAttributesGet(message); onGatewayAttributesGet(message);
} }
} catch (Exception e) { } catch (Exception e) {
log.warn("Failed to process arrived message!", message); log.warn("Failed to process arrived message:{}!", message, e);
} }
}); });
...@@ -677,9 +678,9 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall ...@@ -677,9 +678,9 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
} catch (Exception e) { } catch (Exception e) {
log.error("获取Mac地址注册设备信息异常", e); log.error("获取Mac地址注册设备信息异常", e);
} }
//MqttClientSecurityConfiguration mqttClientSecurityConfiguration = new MqttClientSecurityConfiguration(); MqttClientSecurityConfiguration mqttClientSecurityConfiguration = new MqttClientSecurityConfiguration();
//mqttClientSecurityConfiguration.setAccessToken("D6qjl0xNnDMtgSPMczGt"); mqttClientSecurityConfiguration.setAccessToken("D6qjl0xNnDMtgSPMczGt");
//return mqttClientSecurityConfiguration; return mqttClientSecurityConfiguration;
//return null; //return null;
} }
......
apq: apq:
iot-gateway: 192.168.124.29:7002 iot-gateway: 192.168.124.19:7002
PC_HOST: 192.168.124.29 PC_HOST: 192.168.124.29
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论