소스 검색

实时流协议修改

gao.qiang 1 년 전
부모
커밋
90554f4019

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

@@ -404,7 +404,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 camera.eq(BaseCameraManagement::getLineDir, msgAlarm.getLineDir());
                 camera.eq(BaseCameraManagement::getRailwayCode, msgAlarm.getRailwayCode());
                 camera.eq(BaseCameraManagement::getOnline, 2);
-                camera.like(BaseCameraManagement::getEnableOrNot, 1);
+                camera.eq(BaseCameraManagement::getEnableOrNot, 1);
                 if (StringUtils.isNotEmpty(cameraCode)){
                     wrapper.eq("camera_code", cameraCode);
                 }

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

@@ -229,7 +229,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         if (!flay) {
             return bakUrl + "/hdl/" + cameraCode + "/" + channel + ".flv";
         }
-        return httpUrl + "/hdl/" + cameraCode + "/" + channel + ".flv";
+        return wsUrl + "/ws/" + cameraCode + "/" + channel + ".flv";
 
 
 //        if (!flay) {