Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-22 e8770eec36cb7294899ee96f0f66028e9358caf8

 src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java

@@ -167,10 +167,6 @@
            @RequestParam(required = false) String callId,
            @RequestParam(required = false) String remoteHost
    ){
        System.out.println(request.getScheme());
        System.out.println(request.getLocalAddr());
        System.out.println(request.getRemoteAddr());
        System.out.println(request.getRequestURI());
        MediaServerItem mediaServerItem;
        if (mediaServerId == null) {
            mediaServerItem = mediaServerService.getDefaultMediaServer();
@@ -184,7 +180,7 @@
                remoteHost = request.getScheme() + "://" + request.getLocalAddr() + ":" + mediaServerItem.getRecordAssistPort();
            }
        }
        return cloudRecordService.addTask(app, stream, mediaServerItem, startTime, endTime, callId, remoteHost);
        return cloudRecordService.addTask(app, stream, mediaServerItem, startTime, endTime, callId, remoteHost, mediaServerId != null);
    }

    @ResponseBody
@@ -201,7 +197,10 @@
            @RequestParam(required = false) String mediaServerId,
            @RequestParam(required = false) Boolean isEnd
    ){
        return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
       if (ObjectUtils.isEmpty(mediaServerId)) {
           mediaServerId = null;
       }
       return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
    }

    @ResponseBody