审片间接口优化

zhongdaoyi@wondertek.com.cn
Commit be558f9f80552f671edbe19214b8dcc6ec37a3c0 be558f9f 1 parent 6ac0b5c7
Showing 5 changed files with 123 additions and 9 deletions
src/main/java/com/wondertek/controller/LiveMonitorRoomController.java
src/main/java/com/wondertek/dto/CrpRoomSetDto.java
src/main/java/com/wondertek/dto/CrpSetDate.java
src/main/java/com/wondertek/service/LiveMonitorRoomService.java
src/main/java/com/wondertek/service/impl/LiveMonitorRoomServiceImpl.java
--- a/src/main/java/com/wondertek/controller/LiveMonitorRoomController.java
View file @be558f9
+++ b/src/main/java/com/wondertek/controller/LiveMonitorRoomController.java
View file @be558f9
 package com.wondertek.controller;
+import com.wondertek.dto.CrpRoomSetDto;
 import com.wondertek.dto.LMRoomDto;
 import com.wondertek.dto.LMRoomParam;
 import com.wondertek.service.LiveMonitorRoomService;
+import com.wondertek.util.JSONUtils;
 import com.wondertek.util.PageBean;
 import com.wondertek.util.ResultBean;
 import jakarta.annotation.Resource;
@@ -48,6 +50,7 @@ public class LiveMonitorRoomController {
      */
     @PostMapping("create")
     ResultBean create(@RequestBody LMRoomParam lmRoomParam){
+        log.info("-->【云审片平台】新增审片间,参数:{}", JSONUtils.obj2json(lmRoomParam));
         return liveMonitorRoomService.create(lmRoomParam);
     }
@@ -59,19 +62,46 @@ public class LiveMonitorRoomController {
      */
     @PostMapping("update")
     ResultBean update(@RequestBody LMRoomParam lmRoomParam){
+        log.info("-->【云审片平台】更新审片间,参数:{}", JSONUtils.obj2json(lmRoomParam));
         return liveMonitorRoomService.update(lmRoomParam);
     }
+    /**
+     * 更新审片间
+     * @param
+     * @return
+     */
+    @PostMapping("setting")
+    ResultBean setting(@RequestBody CrpRoomSetDto crpRoomSetDto){
+
+        log.info("-->【云审片平台】审片间配置主备,参数:{}", JSONUtils.obj2json(crpRoomSetDto));
+        return liveMonitorRoomService.setting(crpRoomSetDto);
+    }
+
+
+    /**
+     * 更新审片间状态
+     * @param
+     * @return
+     */
     @GetMapping("setStatus")
     ResultBean updateStatus(@RequestParam(value = "id",required = true)Long id,
                             @RequestParam(value = "status",required = true)String status){
+
+        log.info("-->【云审片平台】更新审片间状态,参数:id:{} status:{}", id, status);
         return liveMonitorRoomService.updateStatus(id, status);
     }
+    /**
+     * 删除审片间
+     * @param id
+     * @return
+     */
     @GetMapping("remove")
     ResultBean delete(@RequestParam(value = "id",required = true)Long id ){
+        log.info("-->【云审片平台】删除审片间,参数:id:{} ", id);
         return liveMonitorRoomService.delete(id);
     }
@@ -82,6 +112,7 @@ public class LiveMonitorRoomController {
      */
     @GetMapping("taskDetail")
     ResultBean taskDetail(@RequestParam(value = "id",required = true)Long id){
+        log.info("-->【云审片平台】获取任务详情,参数:id:{} ", id);
         return liveMonitorRoomService.taskDetail(id);
     }
@@ -92,6 +123,7 @@ public class LiveMonitorRoomController {
      */
     @GetMapping("getLMRoomDetail")
     ResultBean getLMRoomDetail(@RequestParam(value = "id",required = true)Long id){
+        log.info("-->【云审片平台】获取房间详情,参数:id:{} ", id);
         return liveMonitorRoomService.getLMRoomDetail(id);
     }
 }
--- a/src/main/java/com/wondertek/dto/CrpRoomSetDto.java 0 → 100644
View file @be558f9
+++ b/src/main/java/com/wondertek/dto/CrpRoomSetDto.java 0 → 100644
View file @be558f9
+package com.wondertek.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CrpRoomSetDto {
+
+    private String name;
+
+    private Long id;
+
+    private List<CrpSetDate> setlist;
+}
--- a/src/main/java/com/wondertek/dto/CrpSetDate.java 0 → 100644
View file @be558f9
+++ b/src/main/java/com/wondertek/dto/CrpSetDate.java 0 → 100644
View file @be558f9
+package com.wondertek.dto;
+
+import lombok.Data;
+
+@Data
+public class CrpSetDate {
+
+    private Long id;
+
+
+    /** 输出组序号（标识输出分组） */
+    private String outputGroup;
+
+
+    /**
+     * 输出目录地址
+     * <p>存储转码后文件的路径（最大长度1024字符）</p>
+     */
+    private String outputDir;
+
+    private String mixConfig;
+
+}
--- a/src/main/java/com/wondertek/service/LiveMonitorRoomService.java
View file @be558f9
+++ b/src/main/java/com/wondertek/service/LiveMonitorRoomService.java
View file @be558f9
@@ -2,6 +2,7 @@ package com.wondertek.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.wondertek.dto.BackupMaterialDto;
+import com.wondertek.dto.CrpRoomSetDto;
 import com.wondertek.dto.LMRoomDto;
 import com.wondertek.dto.LMRoomParam;
 import com.wondertek.entity.LiveMonitorRoom;
@@ -22,6 +23,9 @@ public interface LiveMonitorRoomService extends IService<LiveMonitorRoom> {
     ResultBean update(LMRoomParam lmRoomParam);
+
+    ResultBean setting(CrpRoomSetDto crpRoomSetDto);
+
     ResultBean updateStatus(Long id, String status);
     ResultBean delete(Long id);
--- a/src/main/java/com/wondertek/service/impl/LiveMonitorRoomServiceImpl.java
View file @be558f9
+++ b/src/main/java/com/wondertek/service/impl/LiveMonitorRoomServiceImpl.java
View file @be558f9
@@ -8,9 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wondertek.dto.CrpDataVo;
-import com.wondertek.dto.LMRoomDto;
-import com.wondertek.dto.LMRoomParam;
+import com.wondertek.dto.*;
+import com.wondertek.entity.Admin;
 import com.wondertek.entity.LiveMonitorRoom;
 import com.wondertek.entity.StreamTask;
 import com.wondertek.mapper.LiveMonitorRoomMapper;
@@ -37,6 +36,9 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
     @Resource
     private StreamTaskService monitorMarkService;
+    @Resource
+    private Admin admin;
+
     @Value("${transcode.getTaskDetail}")
     private String getTaskDetail;
@@ -62,7 +64,7 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
         LiveMonitorRoom liveMonitorRoom = new LiveMonitorRoom();
         liveMonitorRoom.setName(lmRoomParam.getName());
         liveMonitorRoom.setRoomStatus("0");
-        liveMonitorRoom.setCreatedBy("");
+        liveMonitorRoom.setCreatedBy(admin.getUsername());
         liveMonitorRoom.setCreatedTime(LocalDateTime.now());
         liveMonitorRoom.setLiveName(lmRoomParam.getLiveName());
         boolean b = saveOrUpdate(liveMonitorRoom);
@@ -79,7 +81,7 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
                 streamTask.setChannelId(crpDataVo.getChannelId());
                 streamTask.setRoomId(roomId);
                 streamTask.setTaskType(crpDataVo.getTaskType());
-                streamTask.setCreatedBy("");
+                streamTask.setCreatedBy(admin.getUsername());
                 streamTask.setCreatedTime(LocalDateTime.now());
                 return streamTask;
             }).toList();
@@ -111,10 +113,14 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
             dataList.forEach(crpDataVo -> {
                 Long sId = crpDataVo.getId();
                 StreamTask streamTask = monitorMarkService.getById(sId);
+
+                if (streamTask==null){
+                    return;
+                }
                 streamTask.setTaskId(crpDataVo.getTaskId());
                 streamTask.setChannelId(crpDataVo.getChannelId());
                 streamTask.setTaskType(crpDataVo.getTaskType());
-                streamTask.setCreatedBy("");
+                streamTask.setCreatedBy(admin.getUsername());
                 streamTask.setCreatedTime(LocalDateTime.now());
                 monitorMarkService.updateById(streamTask);
             });
@@ -138,6 +144,7 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
             return ResultBean.error("播控中房间不能禁用");
         }
         monitorRoom.setRoomStatus(status);
+        monitorRoom.setUpdatedBy(admin.getUsername());
         monitorRoom.setUpdatedTime(LocalDateTime.now());
         saveOrUpdate(monitorRoom);
@@ -160,11 +167,44 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
         }
         monitorRoom.setDel("1");
         monitorRoom.setUpdatedTime(LocalDateTime.now());
+        monitorRoom.setUpdatedBy(admin.getNickname());
         saveOrUpdate(monitorRoom);
         return ResultBean.ok("删除成功");
     }
+    @Override
+    public ResultBean setting(CrpRoomSetDto crpRoomSetDto) {
+
+        Long id = crpRoomSetDto.getId();
+
+        LiveMonitorRoom monitorRoom = getById(id);
+        if(monitorRoom == null){
+            return ResultBean.error("房间不存在");
+        }
+        monitorRoom.setName(crpRoomSetDto.getName());
+        monitorRoom.setUpdatedTime(LocalDateTime.now());
+        saveOrUpdate(monitorRoom);
+        List<CrpSetDate> dataList = crpRoomSetDto.getSetlist();
+        //更新子任务信息
+        if(!CollectionUtils.isEmpty(dataList)){
+            dataList.forEach(setVo -> {
+                Long sId = setVo.getId();
+                StreamTask streamTask = monitorMarkService.getById(sId);
+                if (streamTask==null){
+                    return;
+                }
+                streamTask.setCreatedTime(LocalDateTime.now());
+                streamTask.setUpdatedBy(admin.getUsername());
+                streamTask.setOutputGroup(setVo.getOutputGroup());
+                streamTask.setOutputDir(setVo.getOutputDir());
+                streamTask.setMixConfig(setVo.getMixConfig());
+                monitorMarkService.updateById(streamTask);
+            });
+        }
+
+        return ResultBean.ok("修改成功");
+    }
     @Override
     public ResultBean taskDetail(Long id) {
@@ -265,7 +305,7 @@ public class LiveMonitorRoomServiceImpl extends ServiceImpl<LiveMonitorRoomMappe
         return ResultBean.ok(result);
     }
-    public static void main(String[] args) {
-        System.out.println(ResultBean.ok("result"));
-    }
+
+
+
 }