Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化消息推送、优化事件处理

Browse Source
This commit is contained in:
xy
2024-11-06 10:54:37 +08:00
parent 851404f62d
commit e7412d916a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
View File

@@ -147,9 +147,13 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) { private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) {
synchronized (lock) { synchronized (lock) {
NoticeUserDto dto = sendOffLine(nDid); //判断是否推送消息
sendMessageUtil.sendEventToUser(dto); boolean devModel = equipmentFeignClient.judgeDevModel(nDid).getData();
addLogs(dto); if (devModel) {
NoticeUserDto dto = sendOffLine(nDid);
sendMessageUtil.sendEventToUser(dto);
addLogs(dto);
}
String clientName = "NJCN-" + nDid.substring(nDid.length() - 6); String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(() -> { ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(() -> {
log.info(nDid + "执行重连定时任务..."); log.info(nDid + "执行重连定时任务...");
@@ -171,7 +175,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
logDto.setResult(0); logDto.setResult(0);
//一个小时未连接上，则推送告警消息 //一个小时未连接上，则推送告警消息
MAX_WARNING_TIMES++; MAX_WARNING_TIMES++;
if (MAX_WARNING_TIMES == 30) { if (MAX_WARNING_TIMES == 30 && devModel) {
NoticeUserDto dto2 = sendConnectFail(nDid); NoticeUserDto dto2 = sendConnectFail(nDid);
sendMessageUtil.sendEventToUser(dto2); sendMessageUtil.sendEventToUser(dto2);
addLogs(dto2); addLogs(dto2);
@@ -187,7 +191,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
} else { } else {
//一个小时未连接上，则推送告警消息 //一个小时未连接上，则推送告警消息
MAX_WARNING_TIMES++; MAX_WARNING_TIMES++;
if (MAX_WARNING_TIMES == 30) { if (MAX_WARNING_TIMES == 30 && devModel) {
NoticeUserDto dto2 = sendConnectFail(nDid); NoticeUserDto dto2 = sendConnectFail(nDid);
sendMessageUtil.sendEventToUser(dto2); sendMessageUtil.sendEventToUser(dto2);
addLogs(dto2); addLogs(dto2);

2
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
View File

@@ -110,7 +110,7 @@ public class EventServiceImpl implements IEventService {
csEvent.setType(1); csEvent.setType(1);
} else if (Objects.equals(item.getType(),"1")){ } else if (Objects.equals(item.getType(),"1")){
csEvent.setType(2); csEvent.setType(2);
lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("0").toString(); //lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get(appEventMessage.getId()).toString();
csEvent.setClDid(appEventMessage.getMsg().getClDid()); csEvent.setClDid(appEventMessage.getMsg().getClDid());
} }
csEvent.setLevel(Integer.parseInt(item.getType())); csEvent.setLevel(Integer.parseInt(item.getType()));