Merge remote-tracking branch 'origin/dev' into dev

@@ -32,6 +32,7 @@ public class LiveMonitorRoomController {
     }
 
 
+
     /**
      * 审片间-列表页
      * @param lmRoomDto
@@ -44,6 +45,18 @@ public class LiveMonitorRoomController {
 
 
     /**
+     * 审片间维护-审片间任务
+     * @param lmRoomDto
+     * @return
+     */
+    @GetMapping("taskRoom")
+    PageBean taskPage(LMRoomDto lmRoomDto){
+        return liveMonitorRoomService.taskPage(lmRoomDto);
+    }
+
+
+
+    /**
      * 新增审片间
      * @param lmRoomParam
      * @return

@@ -18,6 +18,12 @@ public class CrpSetDate {
      */
     private String outputDir;
 
+
+    /**
+     * 高码输出地址
+     */
+    private String outputHigh;
+
     private String mixConfig;
 
 }

@@ -109,4 +109,9 @@ public class StreamTask {
      */
     private String mixConfig;
 
+    /**
+     * 高码输出地址
+     */
+    private String outputHigh;
+
 }
\ No newline at end of file

@@ -15,6 +15,8 @@ public interface LiveMonitorRoomService extends IService<LiveMonitorRoom> {
     PageBean editPage(LMRoomDto lmRoomDto);
 
 
+    PageBean taskPage(LMRoomDto lmRoomDto);
+
     ResultBean create(LMRoomParam lmRoomParam);
 
 

@@ -67,6 +67,41 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
     }
 
     @Override
+    public PageBean taskPage(LMRoomDto lmRoomDto) {
+        Page<LMRoomListVo> page = new Page<>(lmRoomDto.getPage(), lmRoomDto.getSize());
+
+
+        IPage<LMRoomListVo> resultPage = liveMonitorRoomMapper.findPageList(page, lmRoomDto);
+
+        List<LMRoomListVo> records = resultPage.getRecords();
+        List<Map<String, Object>> list = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(records)){
+
+                list = records.stream().map(record -> {
+                Map<String, Object> dataMap = JSON.parseObject(JSON.toJSONString(record), new TypeReference<Map<String, Object>>() {
+                });
+
+                LambdaQueryWrapper<StreamTask> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(StreamTask::getRoomId, record.getId());
+                wrapper.eq(StreamTask::getTaskType, "0");
+                wrapper.eq(StreamTask::getPlayType, "source");
+                String mixOutputUrl = record.getMixOutputUrl();
+                record.setMixOutputUrl(FileUtils.replacePUrl(mixOutputUrl, pIp, pProt));
+
+                List<StreamTask> taskList = monitorMarkService.list(wrapper);
+                if (!CollectionUtils.isEmpty(taskList)) {
+                    dataMap.put("streamTask", taskList.get(0));
+                }
+                return dataMap;
+            }).toList();
+
+        }
+
+
+        return new PageBean(Integer.parseInt(String.valueOf(resultPage.getPages())),resultPage.getTotal(),list);
+    }
+
+    @Override
     public PageBean editPage(LMRoomDto lmRoomDto) {
         Page<LMRoomListVo> page = new Page<>(lmRoomDto.getPage(), lmRoomDto.getSize());
 
@@ -238,6 +273,7 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
                 streamTask.setUpdatedBy(admin.getUsername());
                 streamTask.setOutputGroup(setVo.getOutputGroup());
                 streamTask.setOutputDir(setVo.getOutputDir());
+                streamTask.setOutputHigh(setVo.getOutputHigh());
                 streamTask.setMixConfig(setVo.getMixConfig());
                 monitorMarkService.updateById(streamTask);
             });
@@ -269,6 +305,8 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
             for (StreamTask streamTask : taskList) {
                 String taskId = streamTask.getTaskId();
                 String outputDirCheck = streamTask.getOutputDir();
+                String outputHighCheck = streamTask.getOutputHigh();
+
 
                 Map<String, Object> streamTaskMap = JSON.parseObject(JSON.toJSONString(streamTask), new TypeReference<Map<String, Object>>() {
                 });
@@ -307,6 +345,14 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
                                             outputDirMap.put("checked", false);
                                             outputDirMap.put("outGroupNo", outGroupNo);
 
+                                            outputDirMap.put("checkedHigh", false);
+
+                                            if(StringUtils.isNotBlank(outputHighCheck)){
+                                                if(outputDir.equals(outputHighCheck)){
+                                                    outputDirMap.put("checkedHigh", true);
+                                                }
+                                            }
+
                                             if(outputDir.equals(outputDirCheck)){
                                                 outputDirMap.put("checked", true);
                                             }