Browse Source

相机修改

hexiao 2 years ago
parent
commit
be995c843f

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -403,7 +403,7 @@ public class BaseCameraManagementController extends BaseController {
         if (org.apache.commons.lang3.StringUtils.isBlank(path)) {
         if (org.apache.commons.lang3.StringUtils.isBlank(path)) {
             throw new BaseException("当前相机无视频录像");
             throw new BaseException("当前相机无视频录像");
         }
         }
-        return new AjaxResult(200, "ok", serverConfig + path);
+        return new AjaxResult(200, "ok", serverConfig.getUrl() + path);
 //        return success(CameraUtil.historyPlayList(one.getChannel(), vo.getStartTime(), vo.getEntTime()));
 //        return success(CameraUtil.historyPlayList(one.getChannel(), vo.getStartTime(), vo.getEntTime()));
     }
     }
 
 

+ 2 - 2
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -53,7 +53,7 @@ public class CameraUtil {
     public static String historyPlay(List<String> fromVideoFileList, String ph) {
     public static String historyPlay(List<String> fromVideoFileList, String ph) {
         // 视频服务映射路径
         // 视频服务映射路径
 //        String NewfilePath = flvPath + ph;
 //        String NewfilePath = flvPath + ph;
-        String NewfilePath = BaseConfig.getProfile() + ph;
+        String NewfilePath = BaseConfig.getProfile() + "/" + ph;
         log.info("NewfilePath:{}", NewfilePath);
         log.info("NewfilePath:{}", NewfilePath);
         log.info("fromVideoFileList:{}", fromVideoFileList);
         log.info("fromVideoFileList:{}", fromVideoFileList);
         if (ObjectUtils.isEmpty(fromVideoFileList) || fromVideoFileList.size() <= 0) {
         if (ObjectUtils.isEmpty(fromVideoFileList) || fromVideoFileList.size() <= 0) {
@@ -69,7 +69,7 @@ public class CameraUtil {
         }).start();
         }).start();
         // windows可以 linux不行
         // windows可以 linux不行
 //        convetor(fromVideoFileList, NewfilePath);
 //        convetor(fromVideoFileList, NewfilePath);
-        return Constants.RESOURCE_PREFIX + ph;
+        return Constants.RESOURCE_PREFIX + "/" + ph;
 //        return mappingUrl + "record/flv/hazard/" + ph;
 //        return mappingUrl + "record/flv/hazard/" + ph;
     }
     }