Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -142,12 +142,12 @@ public class CameraUtil {
      */
     public static String getPlayFlv(String cameraCode, String channel, boolean flay, String format) {
         if (!ObjectUtils.isEmpty(format) && "WS-FLV".equals(format)) {
-            return wsUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+            return wsUrl + "/ws/" + channel + "/" + cameraCode;
         }
         if (!flay) {
-            return bakUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
+            return bakUrl + "/hdl/" + channel + "/" + cameraCode;
         }
-        return webUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
+        return webUrl + "/hdl/" + channel + "/" + cameraCode;
     }
 
     public static String getPlayFlv(String cameraCode, String channel, String format) {