Merge remote-tracking branch 'origin/master'

@@ -39,7 +39,7 @@ public class LiveMonitorRoomController {
      */
      */
     @GetMapping("queryRoom")
     @GetMapping("queryRoom")
     PageBean editPage(LMRoomDto lmRoomDto){
     PageBean editPage(LMRoomDto lmRoomDto){
-        return liveMonitorRoomService.queryPage(lmRoomDto);
+        return liveMonitorRoomService.editPage(lmRoomDto);
     }
     }
 
 
 
 

@@ -4,6 +4,7 @@ import java.util.*;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,7 +53,28 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
 
 
     @Override
     @Override
     public PageBean editPage(LMRoomDto lmRoomDto) {
     public PageBean editPage(LMRoomDto lmRoomDto) {
-        return null;
+        Page<LMRoomListVo> page = new Page<>(lmRoomDto.getPage(), lmRoomDto.getSize());
+
+
+        IPage<LMRoomListVo> resultPage = liveMonitorRoomMapper.findPageList(page, lmRoomDto);
+
+        List<LMRoomListVo> records = resultPage.getRecords();
+        if(!CollectionUtils.isEmpty(records)){
+            for (LMRoomListVo record : records) {
+                //赋值source 的延迟时间
+                LambdaQueryWrapper<StreamTask> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(StreamTask::getRoomId,record.getId());
+                wrapper.eq(StreamTask::getTaskType,"0");
+                wrapper.eq(StreamTask::getPlayType,"play");
+                List<StreamTask> taskList = monitorMarkService.list(wrapper);
+                if(!CollectionUtils.isEmpty(taskList)){
+                    record.setDelayTime(taskList.get(0).getDelayTime());
+                }
+            }
+        }
+
+
+        return new PageBean(Integer.parseInt(String.valueOf(resultPage.getPages())),resultPage.getTotal(),resultPage.getRecords());
     }
     }
 
 
 
 

@@ -27,6 +27,13 @@ public class LMRoomListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updatedTime;
     private LocalDateTime updatedTime;
 
 
+    /**
+     * 延时设置（单位：秒）
+     * <p>表示音视频流处理的延迟时长</p>
+     */
+    private Integer delayTime;
+
+
 
 
     /** 多画输出流地址 */
     /** 多画输出流地址 */
     private String mixOutputUrl;
     private String mixOutputUrl;