websocket 车速推送, 添加推流状态字段

src/main/java/org/springblade/modules/business/service/impl/PublishService.java

@@ -73,6 +73,7 @@ public class PublishService {
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
+                    times++;
                 }
             }
         });

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(Upordown(), Sname(), Weizhi())");
 
         // 组织返回数据
         Map<String, Object> resultMap = new HashMap<>();
@@ -192,7 +192,7 @@ public class CarInfoTask {
             resultMap.put("scenicData", busLine.getScenic());
             resultMap.put("busNo", info.getBusno());
             resultMap.put("speed", info.getSpeed());
-            BusLine busLineByName = stationHintService.getBusLineByName(nextSite.getSname(),nextSite.getWeizhi());
+            BusLine busLineByName = stationHintService.getBusLineByName(nextSite.getSname(), nextSite.getWeizhi());
             Long busLineId = busLineByName.getId();
             List<imgVo> imgList = proBusLineImgService.getImgByid(busLineId);
             resultMap.put("imgData", imgList);
@@ -212,6 +212,9 @@ public class CarInfoTask {
         websocketService.broadcast(message);
     }
 
+    /**
+     * 每秒向web推送当前推流车辆的车速和推流状态信息
+     */
     @Scheduled(cron = "0/1 * * * * ?")
     public void getCarSpeed() {
         String carNo = CarInfoCache.getPushCarNo();
@@ -222,6 +225,7 @@ public class CarInfoTask {
 
         Map<String, String> speedMap = new HashMap<>();
         speedMap.put("speed", info.getSpeed());
+        speedMap.put("status", CarInfoCache.getPushStatus());
 
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("msgType", SPEED);

src/main/resources/application-dev.yml

@@ -2,20 +2,20 @@
 spring:
   redis:
     ##redis 单机环境配置
-#    host: 127.0.0.1
+    host: 127.0.0.1
-    host: 192.168.72.129
+#    host: 192.168.72.129
     port: 6379
     password:
     database: 0
     ssl: false
   datasource:
     # MySql
-#    url: jdbc:mysql://127.0.0.1:3306/yt_bus_live?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:3306/yt_bus_live?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-#    username: root
-#    password: 123456
-    url: jdbc:mysql://192.168.72.129:3306/yt_bus_live?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: 123456
+#    url: jdbc:mysql://192.168.72.129:3306/yt_bus_live?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+#    username: root
+#    password: root
 
 #blade配置
 blade: