From e7412d916a107505a5bae4f6d50faff57356a9c7 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 6 Nov 2024 10:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E3=80=81=E4=BC=98=E5=8C=96=E4=BA=8B=E4=BB=B6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/RedisKeyExpirationListener.java       | 14 +++++++++-----
 .../zlevent/service/impl/EventServiceImpl.java     |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
index dfe0cc5..9f9e4a2 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
@@ -147,9 +147,13 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) {
         synchronized (lock) {
-            NoticeUserDto dto = sendOffLine(nDid);
-            sendMessageUtil.sendEventToUser(dto);
-            addLogs(dto);
+            //判断是否推送消息
+            boolean devModel = equipmentFeignClient.judgeDevModel(nDid).getData();
+            if (devModel) {
+                NoticeUserDto dto = sendOffLine(nDid);
+                sendMessageUtil.sendEventToUser(dto);
+                addLogs(dto);
+            }
             String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
             ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(() -> {
                 log.info(nDid + "执行重连定时任务...");
@@ -171,7 +175,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
                             logDto.setResult(0);
                             //一个小时未连接上，则推送告警消息
                             MAX_WARNING_TIMES++;
-                            if (MAX_WARNING_TIMES == 30) {
+                            if (MAX_WARNING_TIMES == 30 && devModel) {
                                 NoticeUserDto dto2 = sendConnectFail(nDid);
                                 sendMessageUtil.sendEventToUser(dto2);
                                 addLogs(dto2);
@@ -187,7 +191,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
                 } else {
                     //一个小时未连接上，则推送告警消息
                     MAX_WARNING_TIMES++;
-                    if (MAX_WARNING_TIMES == 30) {
+                    if (MAX_WARNING_TIMES == 30 && devModel) {
                         NoticeUserDto dto2 = sendConnectFail(nDid);
                         sendMessageUtil.sendEventToUser(dto2);
                         addLogs(dto2);
diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
index 868ef59..0ed80bf 100644
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
@@ -110,7 +110,7 @@ public class EventServiceImpl implements IEventService {
                     csEvent.setType(1);
                 }  else if (Objects.equals(item.getType(),"1")){
                     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.setLevel(Integer.parseInt(item.getType()));