Merge branch 'master' into 重构/1078

# Conflicts: # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java # 数据库/2.7.3/初始化-mysql-2.7.3.sql # 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
2024-12-19 23:19:09 +08:00
parent 4e48eb6cab 4757cbd34e
commit 51f126e571
60 changed files with 1899 additions and 208 deletions
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/recordPlan/RecordPlanController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/recordPlan/RecordPlanController.java
@@ -0,0 +1,150 @@
+package com.genersoft.iot.vmp.vmanager.recordPlan;
+
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
+import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
+import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService;
+import com.genersoft.iot.vmp.service.IRecordPlanService;
+import com.genersoft.iot.vmp.service.bean.RecordPlan;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.recordPlan.bean.RecordPlanParam;
+import com.github.pagehelper.PageInfo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Tag(name = "录制计划")
+@Slf4j
+@RestController
+@RequestMapping("/api/record/plan")
+public class RecordPlanController {
+
+    @Autowired
+    private IRecordPlanService recordPlanService;
+
+    @Autowired
+    private IDeviceChannelService deviceChannelService;
+
+
+    @ResponseBody
+    @PostMapping("/add")
+    @Operation(summary = "添加录制计划", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "plan", description = "计划", required = true)
+    public void add(@RequestBody RecordPlan plan) {
+        if (plan.getPlanItemList() == null || plan.getPlanItemList().isEmpty()) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "添加录制计划时，录制计划不可为空");
+        }
+        recordPlanService.add(plan);
+    }
+
+    @ResponseBody
+    @PostMapping("/link")
+    @Operation(summary = "通道关联录制计划", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "param", description = "通道关联录制计划", required = true)
+    public void link(@RequestBody RecordPlanParam param) {
+        if (param.getAllLink() != null) {
+            if (param.getAllLink()) {
+                recordPlanService.linkAll(param.getPlanId());
+            }else {
+                recordPlanService.cleanAll(param.getPlanId());
+            }
+            return;
+        }
+
+        if (param.getChannelIds() == null && param.getDeviceDbIds() == null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "通道ID和国标设备ID不可都为NULL");
+        }
+
+        List<Integer> channelIds = new ArrayList<>();
+        if (param.getChannelIds() != null) {
+            channelIds.addAll(param.getChannelIds());
+        }else {
+            List<Integer> chanelIdList = deviceChannelService.queryChaneIdListByDeviceDbIds(param.getDeviceDbIds());
+            if (chanelIdList != null && !chanelIdList.isEmpty()) {
+                channelIds = chanelIdList;
+            }
+        }
+        recordPlanService.link(channelIds, param.getPlanId());
+    }
+
+    @ResponseBody
+    @GetMapping("/get")
+    @Operation(summary = "查询录制计划", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "planId", description = "计划ID", required = true)
+    public RecordPlan get(Integer planId) {
+        if (planId == null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "计划ID不可为NULL");
+        }
+        return recordPlanService.get(planId);
+    }
+
+    @ResponseBody
+    @GetMapping("/query")
+    @Operation(summary = "查询录制计划列表", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "query", description = "检索内容", required = false)
+    @Parameter(name = "page", description = "当前页", required = true)
+    @Parameter(name = "count", description = "每页查询数量", required = true)
+    public PageInfo<RecordPlan> query(@RequestParam(required = false) String query, @RequestParam Integer page, @RequestParam Integer count) {
+        if (query != null && ObjectUtils.isEmpty(query.trim())) {
+            query = null;
+        }
+        return recordPlanService.query(page, count, query);
+    }
+
+    @Operation(summary = "分页查询级联平台的所有所有通道", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "page", description = "当前页", required = true)
+    @Parameter(name = "count", description = "每页条数", required = true)
+    @Parameter(name = "planId", description = "录制计划ID")
+    @Parameter(name = "channelType", description = "通道类型， 0：国标设备，1：推流设备，2：拉流代理")
+    @Parameter(name = "query", description = "查询内容")
+    @Parameter(name = "online", description = "是否在线")
+    @Parameter(name = "hasLink", description = "是否已经关联")
+    @GetMapping("/channel/list")
+    @ResponseBody
+    public PageInfo<CommonGBChannel> queryChannelList(int page, int count,
+                                                      @RequestParam(required = false) Integer planId,
+                                                      @RequestParam(required = false) String query,
+                                                      @RequestParam(required = false) Integer channelType,
+                                                      @RequestParam(required = false) Boolean online,
+                                                      @RequestParam(required = false) Boolean hasLink) {
+
+        Assert.notNull(planId, "录制计划ID不可为NULL");
+        if (org.springframework.util.ObjectUtils.isEmpty(query)) {
+            query = null;
+        }
+
+        return recordPlanService.queryChannelList(page, count, query, channelType,  online, planId, hasLink);
+    }
+
+    @ResponseBody
+    @PostMapping("/update")
+    @Operation(summary = "更新录制计划", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "plan", description = "计划", required = true)
+    public void update(@RequestBody RecordPlan plan) {
+        if (plan == null || plan.getId() == 0) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+        recordPlanService.update(plan);
+    }
+
+    @ResponseBody
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除录制计划", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "planId", description = "计划ID", required = true)
+    public void delete(Integer planId) {
+        if (planId == null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "计划IDID不可为NULL");
+        }
+        recordPlanService.delete(planId);
+    }
+
+}
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/recordPlan/bean/RecordPlanParam.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/recordPlan/bean/RecordPlanParam.java
@@ -0,0 +1,23 @@
+package com.genersoft.iot.vmp.vmanager.recordPlan.bean;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(description = "录制计划-添加/编辑参数")
+public class RecordPlanParam {
+
+    @Schema(description = "关联的通道ID")
+    private List<Integer> channelIds;
+
+    @Schema(description = "关联的设备ID，会为设备下的所有通道关联此录制计划，channelId存在是此项不生效，")
+    private List<Integer> deviceDbIds;
+
+    @Schema(description = "全部关联/全部取消关联")
+    private Boolean allLink;
+
+    @Schema(description = "录制计划ID, ID为空是删除关联的计划")
+    private Integer planId;
+}