|
|
|
@ -58,13 +58,13 @@ public class HuaRuanMQTTServiceImpl { |
|
|
|
|
|
|
|
@Override |
|
|
|
public void messageArrived(String topic, MqttMessage message) { |
|
|
|
log.info("Message arrived from topic {}: {}", topic, new String(message.getPayload())); |
|
|
|
log.debug("Message arrived from topic {}: {}", topic, new String(message.getPayload())); |
|
|
|
handleIncomingMessage(topic, message); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void deliveryComplete(IMqttDeliveryToken token) { |
|
|
|
log.info("Delivery complete for message with token: {}", token.getMessageId()); |
|
|
|
log.debug("Delivery complete for message with token: {}", token.getMessageId()); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
@ -80,18 +80,18 @@ public class HuaRuanMQTTServiceImpl { |
|
|
|
String jsonStr = new String(message.getPayload()); |
|
|
|
// 机巢基础状态 |
|
|
|
if (topic.endsWith("/thing/property/nest")) { |
|
|
|
log.info("机巢基础状态: {}", nestCode); |
|
|
|
log.debug("机巢基础状态: {}", nestCode); |
|
|
|
HrNest hrNest = objectMapper.readValue(jsonStr, HrNest.class); |
|
|
|
hrNest.setNestCode(nestCode); |
|
|
|
batchProcessingService.addNest(hrNest); |
|
|
|
} |
|
|
|
// 机巢电池状态 |
|
|
|
else if (topic.endsWith("/thing/property/nest_battery")) { |
|
|
|
log.info("机巢电池状态: {}", nestCode); |
|
|
|
log.debug("机巢电池状态: {}", nestCode); |
|
|
|
} |
|
|
|
// 航站状态告警 |
|
|
|
else if (topic.endsWith("thing/service/nest/warn")) { |
|
|
|
log.info("航站状态告警: {}", nestCode); |
|
|
|
log.debug("航站状态告警: {}", nestCode); |
|
|
|
List<HrNestWarn> nestWarnList = objectMapper.readValue(jsonStr, new TypeReference<List<HrNestWarn>>() { |
|
|
|
}); |
|
|
|
for (HrNestWarn nestWarn : nestWarnList) { |
|
|
|
@ -106,18 +106,18 @@ public class HuaRuanMQTTServiceImpl { |
|
|
|
} |
|
|
|
// 无人机基础信息 |
|
|
|
else if (topic.endsWith("/thing/property/drone")) { |
|
|
|
log.info("无人机基础信息: {}", nestCode); |
|
|
|
log.debug("无人机基础信息: {}", nestCode); |
|
|
|
} |
|
|
|
// 无机人电池状态 |
|
|
|
else if (topic.endsWith("/thing/property/drone_battery")) { |
|
|
|
log.info("无人机电池状态: {}", nestCode); |
|
|
|
log.debug("无人机电池状态: {}", nestCode); |
|
|
|
HrDroneBattery droneBattery = objectMapper.readValue(jsonStr, HrDroneBattery.class); |
|
|
|
droneBattery.setNestCode(nestCode); |
|
|
|
droneBatteryService.insertDroneBattery(droneBattery); |
|
|
|
} |
|
|
|
// 无人机告警信息 |
|
|
|
else if (topic.endsWith("/thing/property/errmsg")) { |
|
|
|
log.info("无人机告警信息: {}", nestCode); |
|
|
|
log.debug("无人机告警信息: {}", nestCode); |
|
|
|
HrDroneWarn droneWarn = objectMapper.readValue(jsonStr, HrDroneWarn.class); |
|
|
|
HrWarn warn = new HrWarn(); |
|
|
|
warn.setNestCode(nestCode); |
|
|
|
@ -129,7 +129,7 @@ public class HuaRuanMQTTServiceImpl { |
|
|
|
} |
|
|
|
// 巡检任务执行过程 |
|
|
|
else if (topic.endsWith("/thing/property/task_process")) { |
|
|
|
log.info("巡检任务执行过程: {}", nestCode); |
|
|
|
log.debug("巡检任务执行过程: {}", nestCode); |
|
|
|
JSONObject jsonObject = JSONObject.parseObject(jsonStr); |
|
|
|
HrTaskProcess taskProcess = new HrTaskProcess(); |
|
|
|
taskProcess.setNestCode(nestCode); |
|
|
|
|