From f7c0627d6dbb5134468fddd789af872f1ccf4c46 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Wed, 24 May 2023 09:36:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9websocket=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8E,=20=E5=88=A4=E6=96=AD=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=8E=A8=E6=B5=81=E8=BD=A6=E8=BD=BD=E6=9C=BA=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yzh/commons/util/BusinessCacheUtil.java    |  5 +++++
 .../websocket/WsChannelInboundHandler.java     |  5 +++++
 .../yzh/web/service/SendCommandService.java    | 18 +++++++++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/commons/src/main/java/org/yzh/commons/util/BusinessCacheUtil.java b/commons/src/main/java/org/yzh/commons/util/BusinessCacheUtil.java
index 9aec951..66b5a45 100644
--- a/commons/src/main/java/org/yzh/commons/util/BusinessCacheUtil.java
+++ b/commons/src/main/java/org/yzh/commons/util/BusinessCacheUtil.java
@@ -101,6 +101,11 @@ public class BusinessCacheUtil {
         return Integer.parseInt(times);
     }
 
+    /**
+     * 设置1078推送为空的次数缓存
+     *
+     * @return
+     */
     public static void setPushEmptyTimes(int times) {
         businessCache.put(CACHE_KEY_PUSH_EMPTY_TIMES, String.valueOf(times));
     }
diff --git a/jtt808-server/src/main/java/io/github/yezhihao/netmc/websocket/WsChannelInboundHandler.java b/jtt808-server/src/main/java/io/github/yezhihao/netmc/websocket/WsChannelInboundHandler.java
index 97ef399..e06c356 100644
--- a/jtt808-server/src/main/java/io/github/yezhihao/netmc/websocket/WsChannelInboundHandler.java
+++ b/jtt808-server/src/main/java/io/github/yezhihao/netmc/websocket/WsChannelInboundHandler.java
@@ -60,12 +60,17 @@ public class WsChannelInboundHandler extends SimpleChannelInboundHandler<TextWeb
             String clientId = content.split("-")[0].substring(1);
             String channelNo = content.split("-")[1];
 
+
             BusinessCacheUtil.set1078PushDevice(clientId);
+
+            // 重置1078推送为空的次数
             BusinessCacheUtil.setPushEmptyTimes(0);
+
             String curPush = BusinessCacheUtil.getCurrentPushDevice();
             int curPushChannel = BusinessCacheUtil.getCurrentPushChannel();
             log.debug(BusinessConstant.LOGGER_PREFIX + " : websocket接收 : 1078推流设备 = {} - {} ", clientId, channelNo);
 
+            // 如果1078推送的正在推流的设备 != 808记录的当前推流的设备, 调用接口通知慢直播服务, 当前推流车辆及推流状态信息
             if (!clientId.equals(curPush)) {
                 if (SendCommandUtil.getService() != null) {
                     log.info(BusinessConstant.LOGGER_PREFIX + " : websocket接收 : 原推流设备 = {} - {} ", curPush, curPushChannel);
diff --git a/jtt808-server/src/main/java/org/yzh/web/service/SendCommandService.java b/jtt808-server/src/main/java/org/yzh/web/service/SendCommandService.java
index 34c41d0..a4a22b9 100644
--- a/jtt808-server/src/main/java/org/yzh/web/service/SendCommandService.java
+++ b/jtt808-server/src/main/java/org/yzh/web/service/SendCommandService.java
@@ -79,7 +79,9 @@ public class SendCommandService {
      */
     public void sendToDevice() {
         if (sessionManager.all() == null || sessionManager.all().size() == 0) {
-            log.info(BusinessConstant.LOGGER_PREFIX + " : 自定义推流方法 sendToDevice : 当前无在线设备, 直接返回 ");
+            // 当前无在线设备, 直接返回, 通知给慢直播设备离线
+            log.info(BusinessConstant.LOGGER_PREFIX + " : 自定义推流方法 sendToDevice : 当前无在线设备, 直接返回, 通知给慢直播设备离线 ");
+            noticeCarStatus(null, null, BusinessConstant.LIVE_STATUS_OFFLINE);
             return;
         }
 
@@ -207,6 +209,20 @@ public class SendCommandService {
      * @param status
      */
     public void noticeCarStatus(String clientId, Integer channelNo, String status) {
+        // 若1078通知在线, 但此时无在线设备, 不再更新状态
+        if (BusinessConstant.LIVE_STATUS_ONLINE.equals(status) && (sessionManager.all() == null || sessionManager.all().size() == 0)) {
+            log.info(BusinessConstant.LOGGER_PREFIX + " : 自定义推流方法 noticeCarStatus : 当前无在线设备, 将设备强制置为离线, 推送给慢直播服务");
+            clientId = null;
+            status = BusinessConstant.LIVE_STATUS_OFFLINE;
+        }
+
+        // 若当前推流状态为离线, 且要更新的状态为等待, 直接返回. 离线状态不用切换等待状态
+        if (BusinessConstant.LIVE_STATUS_OFFLINE.equals(BusinessCacheUtil.getPushStatus())
+                && BusinessConstant.LIVE_STATUS_WAITING.equals(status)) {
+            log.info(BusinessConstant.LOGGER_PREFIX + " : 自定义推流方法 noticeCarStatus : 离线状态不用切换等待状态");
+            return;
+        }
+
         channelNo = channelNo == null ? BusinessConstant.DEFAULT_CHANNEL_NO : channelNo;
 
         // 更新推流车辆和推流状态