Merge branch 'master' into 'dev'

Master



See merge request !1

@@ -126,4 +126,22 @@ public class LiveMonitorRoomController {
         log.info("-->【云审片平台】获取房间详情,参数:id:{} ", id);
         return liveMonitorRoomService.getLMRoomDetail(id);
     }
+
+    /*
+      * 停止房间收录
+     */
+    @GetMapping("stopRecord")
+    public ResultBean stopRecord(@RequestParam(value = "id",required = true)Long id){
+        log.info("-->【云审片平台】停止房间收录,参数:id:{} ", id);
+        return liveMonitorRoomService.stopRecord(id);
+    }
+    /*
+      * 启动房间收录
+     */
+    @GetMapping("startRecord")
+    public ResultBean startRecord(@RequestParam(value = "id",required = true)Long id){
+        log.info("-->【云审片平台】启动房间收录,参数:id:{} ", id);
+        return liveMonitorRoomService.startRecord(id);
+    }
+
 }

@@ -40,4 +40,15 @@ public class LiveMonitorRoom {
     /** 直播名称 */
     private String liveName;
 
+    /**
+     * 收录状态 0-未收录 1-已收录 2 停止
+     */
+    private String recordStatus;
+
+    /**
+     * 收录操作时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime recordTime;
+
 }
\ No newline at end of file

@@ -33,4 +33,10 @@ public interface LiveMonitorRoomService extends IService<LiveMonitorRoom> {
 
     ResultBean taskDetail(Long id);
 
+
+    ResultBean startRecord(Long id);
+
+
+    ResultBean stopRecord(Long id);
+
 }

@@ -355,6 +355,52 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
     }
 
 
+    @Override
+    public ResultBean startRecord(Long id) {
+
+        LiveMonitorRoom monitorRoom = getById(id);
+
+        if(monitorRoom == null){
+            return ResultBean.error("房间不存在");
+        }
+
+        String recordStatus = monitorRoom.getRecordStatus();
+        if(recordStatus == null || Objects.equals("1",recordStatus)){
+            return ResultBean.error("房间在已在收录中");
+        }
+        monitorRoom.setRoomStatus("1");
+
+        //请求收录服务
+
+
+
+        monitorRoom.setUpdatedTime(LocalDateTime.now());
+        saveOrUpdate(monitorRoom);
+
+        return ResultBean.ok("操作成功");
+    }
+
+    @Override
+    public ResultBean stopRecord(Long id) {
+        LiveMonitorRoom monitorRoom = getById(id);
+
+        if(monitorRoom == null){
+            return ResultBean.error("房间不存在");
+        }
+
+        String recordStatus = monitorRoom.getRecordStatus();
+        if(recordStatus == null || Objects.equals("2",recordStatus)){
+            return ResultBean.error("房间在已在停止收录");
+        }
+        monitorRoom.setRoomStatus("2");
+
+        //请求收录服务
+
 
 
+        monitorRoom.setUpdatedTime(LocalDateTime.now());
+        saveOrUpdate(monitorRoom);
+
+        return ResultBean.ok("操作成功");
+    }
 }

@@ -39,4 +39,15 @@ public class LMRoomListVo {
     private String mixOutputUrl;
     /** 直播名称 */
     private String liveName;
+
+    /**
+     * 收录状态 0-未收录 1-已收录 2 停止
+     */
+    private String recordStatus;
+
+    /**
+     * 收录操作时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime recordTime;
 }

@@ -13,6 +13,9 @@
         `updated_by`,
         `updated_time`,
         `mix_output_url`,
+        `record_status`,
+        `record_time`,
+        `mix_output_url`,
         `live_name`
         FROM
         `crp_live_monitor_room`