Merge branch 'main' into main2

648540858

2023-02-10 ec95a429859e2819772231e70dcd80cb976c81d2

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -265,13 +265,13 @@
         throw new ControllerException(ErrorCode.ERROR400.getCode(), "未找到通道： " + channelId);
      }

      return playService.audioBroadcast(device, channelId);
      return playService.audioBroadcastInfo(device, channelId);

   }

   @GetMapping("/1111")
   public void broadcastApi1() {
      MediaServerItem defaultMediaServer = mediaServerService.getMediaServerForMinimumLoad();
      MediaServerItem defaultMediaServer = mediaServerService.getMediaServerForMinimumLoad(null);
      Device device = storager.queryVideoDevice("34020000001320090001");
      playService.talk(defaultMediaServer, device, "34020000001370000001", null, null, null);