临时提交

src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java

@@ -13,6 +13,7 @@ import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
 import com.genersoft.iot.vmp.service.bean.ErrorCallback;
 import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.streamProxy.service.IStreamProxyService;
 import com.genersoft.iot.vmp.streamPush.service.IStreamPushPlayService;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.utils.HttpUtils;
@@ -70,6 +71,9 @@ public class CameraChannelController {
     @Autowired
     private IStreamPushPlayService streamPushPlayService;
 
+    @Autowired
+    private IStreamProxyService streamProxyService;
+
 
     @GetMapping(value = "/camera/list")
     @ResponseBody
@@ -550,4 +554,14 @@ public class CameraChannelController {
     public void stop(String app, String stream){
         streamPushPlayService.stop(app, stream);
     }
+
+    @GetMapping(value = "/camera/meeting/list")
+    @ResponseBody
+    @Operation(summary = "查询拉流代理", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "topGroupAlias", description = "分组别名")
+    public List<CameraChannel> queryMeetingChannelList(String topGroupAlias){
+        return channelService.queryMeetingChannelList(topGroupAlias);
+    }
+
+
 }

src/main/java/com/genersoft/iot/vmp/web/custom/conf/SignAuthenticationFilter.java

@@ -45,6 +45,10 @@ public class SignAuthenticationFilter extends OncePerRequestFilter {
             chain.doFilter(request, response);
             return;
         }
+//        if (request.getParameter("ccerty") != null) {
+//            chain.doFilter(request, response);
+//            return;
+//        }
         // 设置响应内容类型
         response.setContentType("application/json;charset=UTF-8");
 
@@ -150,9 +154,11 @@ public class SignAuthenticationFilter extends OncePerRequestFilter {
         }catch (Exception e) {
             log.info("[SY-接口验签] 读取body失败, 请求地址: {}  ", requestURI, e);
             response.setStatus(Response.OK);
-            PrintWriter out = response.getWriter();
-            out.println(getErrorResult(6017, "接口鉴权异常"));
-            out.close();
+            if (!response.isCommitted()) {
+                PrintWriter out = response.getWriter();
+                out.println(getErrorResult(6017, "接口鉴权异常"));
+                out.close();
+            }
             return;
         }
         chain.doFilter(request, response);

src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java

@@ -635,4 +635,12 @@ public class CameraChannelService implements CommandLineRunner {
     }
 
 
+    public List<CameraChannel> queryMeetingChannelList(String topGroupAlias) {
+        CameraGroup cameraGroup = groupMapper.queryGroupByAlias(topGroupAlias);
+        Assert.notNull(cameraGroup, "域不存在");
+        String business = cameraGroup.getDeviceId();
+        Assert.notNull(business, "域不存在");
+
+        return channelMapper.queryMeetingChannelList(business);
+    }
 }