From 7aa8444e676775a4541498a3c13ccc25546d2344 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Fri, 13 Oct 2023 18:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/impl/InviteRequestProcessor.java | 2 +- .../cloudRecord/CloudRecordController.java | 21 ++++++++ .../vmp/vmanager/record/RecordController.java | 51 ------------------- web_src/src/components/CloudRecordDetail.vue | 4 +- 4 files changed, 24 insertions(+), 54 deletions(-) delete mode 100755 src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java index a4f3b5e7..c0aacc54 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java @@ -137,7 +137,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements String requesterId = SipUtils.getUserIdFromFromHeader(request); CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME); if (requesterId == null || channelId == null) { - logger.info("无法从FromHeader的Address中获取到平台id，返回400"); + logger.info("无法从请求中获取到平台id，返回400"); // 参数不全， 发400，请求错误 try { responseAck(request, Response.BAD_REQUEST); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java index 78621bfb..0d79675b 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java @@ -140,5 +140,26 @@ public class CloudRecordController { return cloudRecordService.getList(page, count, app, stream, startTime, endTime, mediaServerItems); } + @ResponseBody + @GetMapping("/task/add") + @Operation(summary = "添加合并任务") + @Parameter(name = "app", description = "应用名", required = true) + @Parameter(name = "stream", description = "流ID", required = true) + @Parameter(name = "startTime", description = "鉴权ID", required = false) + @Parameter(name = "endTime", description = "鉴权ID", required = false) + @Parameter(name = "callId", description = "鉴权ID", required = false) + @Parameter(name = "remoteHost", description = "返回地址时的远程地址", required = false) + public String addTask( + @RequestParam String app, + @RequestParam String stream, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam String callId, + @RequestParam String remoteHost + ){ + return cloudRecordService.addTask(app, stream, startTime, endTime, callId, remoteHost); + } + + } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java deleted file mode 100755 index 6e2aca37..00000000 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java +++ /dev/null @@ -1,51 +0,0 @@ -//package com.genersoft.iot.vmp.vmanager.record; -// -//import com.alibaba.fastjson2.JSONObject; -//import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; -//import com.genersoft.iot.vmp.service.IRecordInfoServer; -//import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo; -//import com.genersoft.iot.vmp.vmanager.bean.WVPResult; -//import com.github.pagehelper.PageInfo; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiImplicitParam; -//import io.swagger.annotations.ApiImplicitParams; -//import io.swagger.annotations.ApiOperation; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.*; -// -//@Tag(name = "云端录像") -// -//@RestController -//@RequestMapping("/api/record") -//public class RecordController { -// -// @Autowired -// private IRecordInfoServer recordInfoServer; -// -// //@ApiOperation("录像列表查询") -// @ApiImplicitParams({ -// @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class), -// @ApiImplicitParam(name="count", value = "每页查询数量", required = true, dataTypeClass = Integer.class), -// @ApiImplicitParam(name="query", value = "查询内容", dataTypeClass = String.class), -// }) -// @GetMapping(value = "/app/list") -// @ResponseBody -// public Object list(@RequestParam(required = false)Integer page, -// @RequestParam(required = false)Integer count ){ -// -// PageInfo recordList = recordInfoServer.getRecordList(page - 1, page - 1 + count); -// return recordList; -// } -// -// //@ApiOperation("获取录像详情") -// @ApiImplicitParams({ -// @ApiImplicitParam(name="recordInfo", value = "录像记录", required = true, dataTypeClass = RecordInfo.class) -// }) -// @GetMapping(value = "/detail") -// @ResponseBody -// public JSONObject list(RecordInfo recordInfo, String time ){ -// -// -// return null; -// } -//} diff --git a/web_src/src/components/CloudRecordDetail.vue b/web_src/src/components/CloudRecordDetail.vue index c32f5989..207fbef0 100755 --- a/web_src/src/components/CloudRecordDetail.vue +++ b/web_src/src/components/CloudRecordDetail.vue @@ -37,11 +37,11 @@