From 04d3700961b227c8636fedf18f51cc8c74d01c19 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Sun, 14 May 2023 20:54:10 +0800
Subject: [PATCH] bug fix

---
 src/main/java/org/springblade/modules/job/CarInfoTask.java    | 4 ++--
 .../modules/websocket/handler/WebsocketHandler.java           | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/job/CarInfoTask.java b/src/main/java/org/springblade/modules/job/CarInfoTask.java
index cdf3b84..247eb30 100644
--- a/src/main/java/org/springblade/modules/job/CarInfoTask.java
+++ b/src/main/java/org/springblade/modules/job/CarInfoTask.java
@@ -171,7 +171,7 @@ public class CarInfoTask {
             nextSite = preSite;
         }
         BusLine busLine = BusLineCache.getBusLine(info.getUpordown(), nextSite.getSname(), nextSite.getWeizhi());
-        log.info("================BusLineCache.getBusLine(Upordown(), Sname(), Weizhi())");
+        log.info("================ BusLineCache.getBusLine(" + info.getUpordown() + ", " + nextSite.getSname() + ", " + nextSite.getWeizhi() + ")");
 
         // 组织返回数据
         Map<String, Object> resultMap = new HashMap<>();
@@ -182,7 +182,7 @@ public class CarInfoTask {
             resultMap.put("articleData", "");
             resultMap.put("activityData", "");
             resultMap.put("scenicData", "");
-            resultMap.put("imgData", "");
+            resultMap.put("imgData", new ArrayList<>());
             resultMap.put("busNo", "");
             resultMap.put("speed", "");
         } else {
diff --git a/src/main/java/org/springblade/modules/websocket/handler/WebsocketHandler.java b/src/main/java/org/springblade/modules/websocket/handler/WebsocketHandler.java
index c3ee9a1..2641b24 100644
--- a/src/main/java/org/springblade/modules/websocket/handler/WebsocketHandler.java
+++ b/src/main/java/org/springblade/modules/websocket/handler/WebsocketHandler.java
@@ -67,6 +67,7 @@ public class WebsocketHandler extends TextWebSocketHandler {
         System.out.println("Received message from client: " + message.getPayload());
         TextMessage msg = new TextMessage(message.getPayload());
 
+        // 若为返回的接收的推送推流状态结果, 更新到redis, 否则, 原样返回给客户端
         if (Func.isNotBlank(msg.getPayload())) {
             // {"msgType":"status","data":{"status":"ok"}}
             JSONObject jsonObject = JSON.parseObject(msg.getPayload());
@@ -76,6 +77,8 @@ public class WebsocketHandler extends TextWebSocketHandler {
                     redisTemplate.opsForValue().set("websocket-status-return", BusinessConstant.BOOLEAN_STR_TRUE, 5, TimeUnit.SECONDS);
                 }
             }
+        } else {
+            session.sendMessage(msg);
         }
     }
 }