代码修改

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

@@ -288,15 +288,14 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                  */
                 CamerasVo camerasVo = new CamerasVo();
                 camerasVo.setCameraIndexCode(cameraCode);
-                camerasVo.setStreamType(0);
-                camerasVo.setTransmode(1);
-                camerasVo.setProtocol("rtsp");
-                camerasVo.setExpand("streamform=rtp");
                 previewURLs(camerasVo, channel);
                 return getPlayFlv(cameraCode, channel, true);
             }
         } else {
-            return "流媒体目前没有RTSP协议的流";
+            CamerasVo camerasVo = new CamerasVo();
+            camerasVo.setCameraIndexCode(cameraCode);
+            previewURLs(camerasVo, channel);
+            return getPlayFlv(cameraCode, channel, true);
         }
 //        return getPlayFlv(cameraCode, channel, true);
     }

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

@@ -488,42 +488,42 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("根据相机ID获取相机台账管理信息")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) throws InterruptedException {
-//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-//        LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-//        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-//            queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-//        }
-//        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-////        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
-////        baseCameraManagement.setDeptName(sysDept.getDeptName());
-//        baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
-//            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-//            baseCameraManagement.setInstallMiles(mils);
-//        }
-//        String end = "";
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
-//            end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-//            baseCameraManagement.setEndMiles(end);
-//        }
-//        String begin = "";
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
-//            begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-//            baseCameraManagement.setBeginMiles(begin);
-//        }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
-//            baseCameraManagement.setInstallMileBD(new BigDecimal(baseCameraManagement.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
-//        }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
-//            baseCameraManagement.setBeginMileBD(new BigDecimal(baseCameraManagement.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
-//        }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
-//            baseCameraManagement.setEndMileBD(new BigDecimal(baseCameraManagement.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
-//        }
-//        baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
-//        baseCameraManagement.setMilesRange(begin + "-" + end);
-//        baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
-//        return AjaxResult.success(baseCameraManagement);
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+            queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+        }
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+//        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+//        baseCameraManagement.setDeptName(sysDept.getDeptName());
+        baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+            baseCameraManagement.setInstallMiles(mils);
+        }
+        String end = "";
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+            end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            baseCameraManagement.setEndMiles(end);
+        }
+        String begin = "";
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+            begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            baseCameraManagement.setBeginMiles(begin);
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+            baseCameraManagement.setInstallMileBD(new BigDecimal(baseCameraManagement.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+            baseCameraManagement.setBeginMileBD(new BigDecimal(baseCameraManagement.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+            baseCameraManagement.setEndMileBD(new BigDecimal(baseCameraManagement.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+        }
+        baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
+        baseCameraManagement.setMilesRange(begin + "-" + end);
+        baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
+        return AjaxResult.success(baseCameraManagement);
 //        String cameraPreviewURL = GetCameraPreviewURL.getPreviewURLs();
 //        log.info("-------------------------------->>>>>" + cameraPreviewURL);
 //        JSONObject outJson = JSONObject.parse(cameraPreviewURL);
@@ -536,8 +536,8 @@ public class BaseCameraManagementController extends BaseController {
 //        String msg = HttpUtils.sendGet("http://10.48.36.47:9080/rtsp/api/pull?target=" + urls + "&streamPath=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006&save=0");
 ////        String msg = HttpUtils.sendGet("http://10.48.36.47:9080/api/gateway/stop?stream=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006");
 //        return AjaxResult.success(msg);
-        CompletableFuture.runAsync(() -> cameraUtil.playbackURLs(new ArrayList<String>(),"5"));
-        return AjaxResult.success("ok");
+//        CompletableFuture.runAsync(() -> cameraUtil.playbackURLs(new ArrayList<String>(),"5"));
+//        return AjaxResult.success("ok");
     }
 
     /**