流媒体ip地址修改

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

@@ -1600,7 +1600,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 "    \"date\":\"" + date + "\"\n" +
                 "}";
 
-        String jsonStr = HttpUtils.sendPost("http://10.48.36.47:9080" + "/recordpro/api/query/records", param);
+        String jsonStr = HttpUtils.sendPost(httpUrl + "/recordpro/api/query/records", param);
         log.info("-----getQueryRecords-------jsonStr----" + jsonStr);
         JSONObject jsonObj = JSON.parseObject(jsonStr);
         log.info("-----getQueryRecords-------jsonObj----" + jsonObj);

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

@@ -59,10 +59,10 @@ public class CaneraConfig {
     @Value("${artemis.appSecret:QoGESFXOYrC68ixIS7wo}")
     private String appSecret;
 
-    @Value("${base.rtmpUrl:rtmp://10.48.36.47:1935}")
+    @Value("${base.rtmpUrl:rtmp://10.48.31.84:1935}")
     private String rtmpUrl;
 
-    @Value("${base.httpUrl:http://10.48.36.47:9080}")
+    @Value("${base.httpUrl:http://10.48.31.84:9080}")
     public String httpUrl;
 
     @Value("${base.httpUrls:http://10.48.36.48:9080}")

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

@@ -721,32 +721,33 @@ public class BaseCameraManagementController extends BaseController {
         LambdaQueryWrapper<MsgAlarm> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MsgAlarm::getAlarmId, alarmId);
         MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper);
-        LambdaQueryWrapper<BaseRailwayManagement> wrapperRailway = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(msgAlarm.getRailwayCode())) {
-            wrapperRailway.eq(BaseRailwayManagement::getRailwayCode, msgAlarm.getRailwayCode());
-        }
-        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapperRailway);
-        if (StringUtils.isEmptySunhh(baseRailwayManagement)) {
-            return AjaxResult.error("报警线路编码：" + msgAlarm.getRailwayCode() + "不存在！");
-        }
-        // 查询里程位置最近的相机
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
-        if (!StringUtils.isEmptySunhh(msgAlarm.getRailwayCode())) {
-            lw.eq(BaseCameraManagement::getRailwayCode, msgAlarm.getRailwayCode());
-        }
-        if (!StringUtils.isEmptySunhh(msgAlarm.getAlarmMile())) {
-            lw.le(BaseCameraManagement::getBeginMile, msgAlarm.getAlarmMile());
-            lw.gt(BaseCameraManagement::getEndMile, msgAlarm.getAlarmMile());
-        }
-        lw.eq(BaseCameraManagement::getLineDir, msgAlarm.getLineDir());
-//        lw.eq(BaseCameraManagement::getOnline, 2);
-        lw.eq(BaseCameraManagement::getEnableOrNot, 1);
-        List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(lw);
-        if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
-            String url = cameraUtil.streamConversion(baseCameraManagementList.get(0).getCameraCode());
-            return new AjaxResult(200, "ok", url);
+//        LambdaQueryWrapper<BaseRailwayManagement> wrapperRailway = new LambdaQueryWrapper<>();
+//        if (!ObjectUtils.isEmpty(msgAlarm.getRailwayCode())) {
+//            wrapperRailway.eq(BaseRailwayManagement::getRailwayCode, msgAlarm.getRailwayCode());
+//        }
+//        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapperRailway);
+//        if (StringUtils.isEmptySunhh(baseRailwayManagement)) {
+//            return AjaxResult.error("报警线路编码：" + msgAlarm.getRailwayCode() + "不存在！");
+//        }
+//        // 查询里程位置最近的相机
+//        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
+//        if (!StringUtils.isEmptySunhh(msgAlarm.getRailwayCode())) {
+//            lw.eq(BaseCameraManagement::getRailwayCode, msgAlarm.getRailwayCode());
+//        }
+//        if (!StringUtils.isEmptySunhh(msgAlarm.getAlarmMile())) {
+//            lw.le(BaseCameraManagement::getBeginMile, msgAlarm.getAlarmMile());
+//            lw.gt(BaseCameraManagement::getEndMile, msgAlarm.getAlarmMile());
+//        }
+//        lw.eq(BaseCameraManagement::getLineDir, msgAlarm.getLineDir());
+////        lw.eq(BaseCameraManagement::getOnline, 2);
+//        lw.eq(BaseCameraManagement::getEnableOrNot, 1);
+//        List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(lw);
+//        if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
+//            String url = cameraUtil.streamConversion(baseCameraManagementList.get(0).getCameraCode());
+        if (!ObjectUtils.isEmpty(msgAlarm)){
+            return new AjaxResult(200, "ok", msgAlarm.getReleasedUrl());
         } else {
-            return AjaxResult.error("报警里程范围内：" + msgAlarm.getAlarmMile() + "没有可查看的相机！");
+            return AjaxResult.error("未生成报警视频");
         }
     }
 

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

@@ -21,16 +21,16 @@ base:
   imgUrl: http://123.139.243.142:18082/picbucket
   ffmpegPath: /usr/bin/ffmpeg
   filePath: /opt/streams/record/flv/
-  webUrl: http://10.48.36.47:9080
-  bakUrl: http://10.48.36.47:9080
-  wsUrl: ws://10.48.36.47:9080
-  historyUrl: http://10.48.36.47:9080
-  httpUrl: http://10.48.36.47:9080
-  httpUrls: http://10.48.36.48:9080
+  webUrl: http://10.48.31.84:9080
+  bakUrl: http://10.48.31.84:9080
+  wsUrl: ws://10.48.31.84:9080
+  historyUrl: http://10.48.31.84:9080
+  httpUrl: http://10.48.31.84:9080
+  httpUrls: http://10.48.31.85:9080
   recordUrl: http://123.139.243.142:18084
   env: 1
   hkUrl: http://10:122:1:22:1443
-  rtmpUrl: rtmp://10.48.36.47:1935
+  rtmpUrl: rtmp://10.48.31.84:1935
   bakUrlRtsp: http://123.139.243.142:18083
 
 server:

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

@@ -21,16 +21,16 @@ base:
   imgUrl: http://123.139.243.142:18082/picbucket
   ffmpegPath: /usr/bin/ffmpeg
   filePath: /opt/streams/record/flv/
-  webUrl: http://10.48.36.47:9080
-  bakUrl: http://10.48.36.47:9080
-  wsUrl: ws://10.48.36.47:9080
-  historyUrl: http://10.48.36.47:9080
-  httpUrl: http://10.48.36.47:9080
-  httpUrls: http://10.48.36.48:9080
+  webUrl: http://10.48.31.84:9080
+  bakUrl: http://10.48.31.84:9080
+  wsUrl: ws://10.48.31.84:9080
+  historyUrl: http://10.48.31.84:9080
+  httpUrl: http://10.48.31.84:9080
+  httpUrls: http://10.48.31.85:9080
   recordUrl: http://123.139.243.142:18084
   env: 1
   hkUrl: http://10:122:1:22:1443
-  rtmpUrl: rtmp://10.48.36.47:1935
+  rtmpUrl: rtmp://10.48.31.84:1935
   bakUrlRtsp: http://123.139.243.142:18083
 
 server: