Commit 7aa8444e676775a4541498a3c13ccc25546d2344
1 parent
4d62f770
临时提交
Showing
4 changed files
with
24 additions
and
54 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
| @@ -137,7 +137,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements | @@ -137,7 +137,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements | ||
| 137 | String requesterId = SipUtils.getUserIdFromFromHeader(request); | 137 | String requesterId = SipUtils.getUserIdFromFromHeader(request); |
| 138 | CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME); | 138 | CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME); |
| 139 | if (requesterId == null || channelId == null) { | 139 | if (requesterId == null || channelId == null) { |
| 140 | - logger.info("无法从FromHeader的Address中获取到平台id，返回400"); | 140 | + logger.info("无法从请求中获取到平台id，返回400"); |
| 141 | // 参数不全， 发400，请求错误 | 141 | // 参数不全， 发400，请求错误 |
| 142 | try { | 142 | try { |
| 143 | responseAck(request, Response.BAD_REQUEST); | 143 | responseAck(request, Response.BAD_REQUEST); |
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
| @@ -140,5 +140,26 @@ public class CloudRecordController { | @@ -140,5 +140,26 @@ public class CloudRecordController { | ||
| 140 | return cloudRecordService.getList(page, count, app, stream, startTime, endTime, mediaServerItems); | 140 | return cloudRecordService.getList(page, count, app, stream, startTime, endTime, mediaServerItems); |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | + @ResponseBody | ||
| 144 | + @GetMapping("/task/add") | ||
| 145 | + @Operation(summary = "添加合并任务") | ||
| 146 | + @Parameter(name = "app", description = "应用名", required = true) | ||
| 147 | + @Parameter(name = "stream", description = "流ID", required = true) | ||
| 148 | + @Parameter(name = "startTime", description = "鉴权ID", required = false) | ||
| 149 | + @Parameter(name = "endTime", description = "鉴权ID", required = false) | ||
| 150 | + @Parameter(name = "callId", description = "鉴权ID", required = false) | ||
| 151 | + @Parameter(name = "remoteHost", description = "返回地址时的远程地址", required = false) | ||
| 152 | + public String addTask( | ||
| 153 | + @RequestParam String app, | ||
| 154 | + @RequestParam String stream, | ||
| 155 | + @RequestParam String startTime, | ||
| 156 | + @RequestParam String endTime, | ||
| 157 | + @RequestParam String callId, | ||
| 158 | + @RequestParam String remoteHost | ||
| 159 | + ){ | ||
| 160 | + return cloudRecordService.addTask(app, stream, startTime, endTime, callId, remoteHost); | ||
| 161 | + } | ||
| 162 | + | ||
| 163 | + | ||
| 143 | 164 | ||
| 144 | } | 165 | } |
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java deleted
100755 → 0
| 1 | -//package com.genersoft.iot.vmp.vmanager.record; | ||
| 2 | -// | ||
| 3 | -//import com.alibaba.fastjson2.JSONObject; | ||
| 4 | -//import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; | ||
| 5 | -//import com.genersoft.iot.vmp.service.IRecordInfoServer; | ||
| 6 | -//import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo; | ||
| 7 | -//import com.genersoft.iot.vmp.vmanager.bean.WVPResult; | ||
| 8 | -//import com.github.pagehelper.PageInfo; | ||
| 9 | -//import io.swagger.annotations.Api; | ||
| 10 | -//import io.swagger.annotations.ApiImplicitParam; | ||
| 11 | -//import io.swagger.annotations.ApiImplicitParams; | ||
| 12 | -//import io.swagger.annotations.ApiOperation; | ||
| 13 | -//import org.springframework.beans.factory.annotation.Autowired; | ||
| 14 | -//import org.springframework.web.bind.annotation.*; | ||
| 15 | -// | ||
| 16 | -//@Tag(name = "云端录像") | ||
| 17 | -// | ||
| 18 | -//@RestController | ||
| 19 | -//@RequestMapping("/api/record") | ||
| 20 | -//public class RecordController { | ||
| 21 | -// | ||
| 22 | -// @Autowired | ||
| 23 | -// private IRecordInfoServer recordInfoServer; | ||
| 24 | -// | ||
| 25 | -// //@ApiOperation("录像列表查询") | ||
| 26 | -// @ApiImplicitParams({ | ||
| 27 | -// @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class), | ||
| 28 | -// @ApiImplicitParam(name="count", value = "每页查询数量", required = true, dataTypeClass = Integer.class), | ||
| 29 | -// @ApiImplicitParam(name="query", value = "查询内容", dataTypeClass = String.class), | ||
| 30 | -// }) | ||
| 31 | -// @GetMapping(value = "/app/list") | ||
| 32 | -// @ResponseBody | ||
| 33 | -// public Object list(@RequestParam(required = false)Integer page, | ||
| 34 | -// @RequestParam(required = false)Integer count ){ | ||
| 35 | -// | ||
| 36 | -// PageInfo<RecordInfo> recordList = recordInfoServer.getRecordList(page - 1, page - 1 + count); | ||
| 37 | -// return recordList; | ||
| 38 | -// } | ||
| 39 | -// | ||
| 40 | -// //@ApiOperation("获取录像详情") | ||
| 41 | -// @ApiImplicitParams({ | ||
| 42 | -// @ApiImplicitParam(name="recordInfo", value = "录像记录", required = true, dataTypeClass = RecordInfo.class) | ||
| 43 | -// }) | ||
| 44 | -// @GetMapping(value = "/detail") | ||
| 45 | -// @ResponseBody | ||
| 46 | -// public JSONObject list(RecordInfo recordInfo, String time ){ | ||
| 47 | -// | ||
| 48 | -// | ||
| 49 | -// return null; | ||
| 50 | -// } | ||
| 51 | -//} |
web_src/src/components/CloudRecordDetail.vue
| @@ -37,11 +37,11 @@ | @@ -37,11 +37,11 @@ | ||
| 37 | <div class="record-list-box" :style="recordListStyle"> | 37 | <div class="record-list-box" :style="recordListStyle"> |
| 38 | <ul v-if="detailFiles.length >0" class="infinite-list record-list" v-infinite-scroll="infiniteScroll" > | 38 | <ul v-if="detailFiles.length >0" class="infinite-list record-list" v-infinite-scroll="infiniteScroll" > |
| 39 | <li v-for="(item,index) in detailFiles" :key="index" class="infinite-list-item record-list-item" > | 39 | <li v-for="(item,index) in detailFiles" :key="index" class="infinite-list-item record-list-item" > |
| 40 | - <el-tag v-if="choosedFile !== item.filename" @click="chooseFile(item)"> | 40 | + <el-tag v-if="choosedFile !== item.fileName" @click="chooseFile(item)"> |
| 41 | <i class="el-icon-video-camera" ></i> | 41 | <i class="el-icon-video-camera" ></i> |
| 42 | {{ getFileShowName(item) }} | 42 | {{ getFileShowName(item) }} |
| 43 | </el-tag> | 43 | </el-tag> |
| 44 | - <el-tag type="danger" v-if="choosedFile === item.filename"> | 44 | + <el-tag type="danger" v-if="choosedFile === item.fileName"> |
| 45 | <i class="el-icon-video-camera" ></i> | 45 | <i class="el-icon-video-camera" ></i> |
| 46 | {{ getFileShowName(item) }} | 46 | {{ getFileShowName(item) }} |
| 47 | </el-tag> | 47 | </el-tag> |