心跳接口修改

business-service/src/main/java/com/ozs/service/impl/BaseCameraManagementServiceImpl.java

@@ -67,6 +67,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private BaseRailwayManagementMapper baseRailwayManagementMapper;
     @Autowired
     private ISysDictTypeService dictTypeService;
+    @Autowired
+    private CameraUtil cameraUtil;
 
     /**
      * 相机台账管理表导入
@@ -484,7 +486,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
             List<BaseCameraManagement> list = new ArrayList<>(baseCameraManagementList);
             for (BaseCameraManagement baseCameraManagement : list) {
-                String flv = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard());
+                String flv = cameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard());
                 BaseVehicleTerminalDto dto = new BaseVehicleTerminalDto();
                 dto.setUrl(flv);
                 dto.setCameraCode(baseCameraManagement.getCameraCode());

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -91,6 +91,7 @@ public class CameraUtil {
     private static String bakUrl;
     private static String bakUrlRtsp;
     private static String wsUrl;
+    private static String wsUrls;
     private static String httpUrl;
     private static String httpUrls;
     private static CmdCameraUtil cUtil;
@@ -240,6 +241,20 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * @param channel    相机通道
      * @return
      */
+    public static String getPlayFlv(String cameraCode, String channel, boolean flay,String state) {
+        if (state.contains("master")) {
+            return wsUrl + "/ws/" + cameraCode + "/" + channel + ".flv";
+        }else {
+            return wsUrls + "/ws/" + cameraCode + "/" + channel + ".flv";
+        }
+
+
+//        if (!flay) {
+//            return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+//        }
+//        return webUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+    }
+
     public static String getPlayFlv(String cameraCode, String channel, boolean flay) {
         if (!flay) {
             return bakUrl + "/hdl/" + cameraCode + "/" + channel + ".flv";
@@ -306,7 +321,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * @param channel
      * @return
      */
-    public static String getPlayFlv(String cameraCode, String channel) {
+    public  String getPlayFlv(String cameraCode, String channel) {
         int maxRetries = 3;
         int retryCount = 0;
         boolean success = false;
@@ -335,7 +350,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 }
                 boolean contains = pathList.contains(cameraCode + "/" + channel);
                 if (contains) {
-                    return getPlayFlv(cameraCode, channel, true);
+                    String cacheObject = redisCache.getCacheObject(cameraCode);
+                    return getPlayFlv(cameraCode, channel, true,cacheObject);
                 } else {
                     /**
                      *  jsonBody.put("cameraIndexCode", "01ea43e6676f4e47bd6c5cd9e02aa006");
@@ -347,19 +363,22 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                     CamerasVo camerasVo = new CamerasVo();
                     camerasVo.setCameraIndexCode(cameraCode);
                     previewURLs(camerasVo, channel);
-                    return getPlayFlv(cameraCode, channel, true);
+                    String cacheObject = redisCache.getCacheObject(cameraCode);
+                    return getPlayFlv(cameraCode, channel, true,cacheObject);
                 }
             } else {
                 CamerasVo camerasVo = new CamerasVo();
                 camerasVo.setCameraIndexCode(cameraCode);
                 previewURLs(camerasVo, channel);
-                return getPlayFlv(cameraCode, channel, true);
+                String cacheObject = redisCache.getCacheObject(cameraCode);
+                return getPlayFlv(cameraCode, channel, true,cacheObject);
             }
         } else {
             CamerasVo camerasVo = new CamerasVo();
             camerasVo.setCameraIndexCode(cameraCode);
             previewURLs(camerasVo, channel);
-            return getPlayFlv(cameraCode, channel, true);
+            String cacheObject = redisCache.getCacheObject(cameraCode);
+            return getPlayFlv(cameraCode, channel, true,cacheObject);
         }
     }
 
@@ -707,6 +726,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         cUtil = cmdCameraUtil;
         sc = serverConfig;
         wsUrl = caneraConfig.getWsUrl();
+        wsUrls = caneraConfig.getWsUrls();
         httpUrl = caneraConfig.getHttpUrl();
         httpUrls = caneraConfig.getHttpUrls();
         recordUrl = caneraConfig.getRecordUrl();
@@ -905,7 +925,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            return getPlayFlv(code, channel, true);
+            return getPlayFlv(code, channel, true,"master");
         } else {
             return "调用天网接口失败";
         }

business-service/src/main/java/com/ozs/utils/CaneraConfig.java

@@ -44,6 +44,9 @@ public class CaneraConfig {
     @Value("${base.wsUrl:http://124.70.58.209:18891}")
     private String wsUrl;
 
+    @Value("${base.wsUrl:http://124.70.58.209:18891}")
+    private String wsUrls;
+
     @Value("${base.recordUrl:http://123.139.243.142:18084}")
     private String recordUrl;
 

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -686,7 +686,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + cameraCode + "】不存在");
         }
-        return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, "channel"));
+        return new AjaxResult(200, "ok", cameraUtil.getPlayFlv(cameraCode, "channel"));
     }
 
     @GetMapping("/api/invite/{cameraCode}")
@@ -780,7 +780,7 @@ public class BaseCameraManagementController extends BaseController {
             if (list.size() > 5) {
                 playFlv = CameraUtil.getPlayFlv(cameraCode, one.getGraphicsCard(), false);
             } else {
-                playFlv = CameraUtil.getPlayFlv(cameraCode, one.getGraphicsCard());
+                playFlv = cameraUtil.getPlayFlv(cameraCode, one.getGraphicsCard());
             }
             list.add(playFlv);
         }
@@ -1020,7 +1020,7 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping(value = "/testURL")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult testURL() {
-        return AjaxResult.success(CameraUtil.getPlayFlv("live", "42010001541320000025"));
+        return AjaxResult.success(cameraUtil.getPlayFlv("live", "42010001541320000025"));
     }
 
     @GetMapping(value = "/getAlarmRecord")

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -69,7 +69,7 @@ public class BaseVehicleController extends BaseController {
     @Autowired
     private RedisCache redisCache;
     @Autowired
-    private HeartbeatUtils heartbeatUtils;
+    private CameraUtil cameraUtil;
 
     /**
      * 车载终端挂载列表
@@ -325,7 +325,7 @@ public class BaseVehicleController extends BaseController {
         if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
             List<String> list=new ArrayList<>();
             for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
-                String flv = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard());
+                String flv = cameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard());
                 list.add(flv);
             }
             return AjaxResult.success(list);

vehicle-sdk/src/main/resources/application.yml

@@ -24,6 +24,7 @@ base:
   webUrl: http://10.48.31.84:9080
   bakUrl: http://10.48.31.84:9080
   wsUrl: ws://10.48.31.84:9080
+  wsUrls: ws://10.48.31.85:9080
   historyUrl: http://10.48.31.84:9080
   httpUrl: http://10.48.31.84:9080
   httpUrls: http://10.48.31.85:9080