事件解析调整
This commit is contained in:
@@ -409,7 +409,6 @@ public class MqttMessageHandler {
|
||||
AutoDataDto dataDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), AutoDataDto.class);
|
||||
switch (dataDto.getMsg().getDataAttr()) {
|
||||
//暂态事件、录波处理
|
||||
//todo 后期告警可能也是在这处理,通过是告警还是事件来区分暂态和稳态
|
||||
case 0:
|
||||
log.info("处理事件");
|
||||
log.info("事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
|
||||
|
||||
@@ -84,12 +84,13 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
|
||||
CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
|
||||
record.setOfflineTime(LocalDateTime.now());
|
||||
onlineLogsService.updateById(record);
|
||||
//立马发起接入请求
|
||||
String version = csTopicService.getVersion(nDid);
|
||||
log.info("装置掉线立马发送接入请求,接入失败则进入定时接入任务");
|
||||
csDeviceService.devAccess(nDid,version);
|
||||
//接入再次失败,则定时发起接入请求
|
||||
try {
|
||||
//装置掉线等待10分钟,发起接入请求
|
||||
String version = csTopicService.getVersion(nDid);
|
||||
log.info("装置掉线10分钟发送接入请求,接入失败则进入定时接入任务");
|
||||
Thread.sleep(600000);
|
||||
csDeviceService.devAccess(nDid,version);
|
||||
//接入再次失败,则定时发起接入请求
|
||||
Thread.sleep(1000);
|
||||
Integer status = csEquipmentDeliveryService.queryEquipmentByndid(nDid).getRunStatus();
|
||||
if (!Objects.isNull(status) && Objects.equals(status,AccessEnum.OFFLINE.getCode())){
|
||||
@@ -104,7 +105,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
|
||||
//记录日志
|
||||
logDto.setOperate("装置掉线,定时发送接入请求,装置为:" + nDid + ",请求的时间戳为:" + System.currentTimeMillis());
|
||||
csLogsFeignClient.addUserLog(logDto);
|
||||
}, 1, 3600, TimeUnit.SECONDS);
|
||||
}, 1, 600, TimeUnit.SECONDS);
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
|
||||
Reference in New Issue
Block a user