From 7aa8444e676775a4541498a3c13ccc25546d2344 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 十月 2023 18:25:36 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 2
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 21 ++++++++++
/dev/null | 51 -------------------------
web_src/src/components/CloudRecordDetail.vue | 4 +-
4 files changed, 24 insertions(+), 54 deletions(-)
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 a4f3b5e..c0aacc5 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 @@
String requesterId = SipUtils.getUserIdFromFromHeader(request);
CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
if (requesterId == null || channelId == null) {
- logger.info("鏃犳硶浠嶧romHeader鐨凙ddress涓幏鍙栧埌骞冲彴id锛岃繑鍥�400");
+ logger.info("鏃犳硶浠庤姹備腑鑾峰彇鍒板钩鍙癷d锛岃繑鍥�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 78621bf..0d79675 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 @@
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 = "娴両D", 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 6e2aca3..0000000
--- 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<RecordInfo> 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 c32f598..207fbef 100755
--- a/web_src/src/components/CloudRecordDetail.vue
+++ b/web_src/src/components/CloudRecordDetail.vue
@@ -37,11 +37,11 @@
<div class="record-list-box" :style="recordListStyle">
<ul v-if="detailFiles.length >0" class="infinite-list record-list" v-infinite-scroll="infiniteScroll" >
<li v-for="(item,index) in detailFiles" :key="index" class="infinite-list-item record-list-item" >
- <el-tag v-if="choosedFile !== item.filename" @click="chooseFile(item)">
+ <el-tag v-if="choosedFile !== item.fileName" @click="chooseFile(item)">
<i class="el-icon-video-camera" ></i>
{{ getFileShowName(item) }}
</el-tag>
- <el-tag type="danger" v-if="choosedFile === item.filename">
+ <el-tag type="danger" v-if="choosedFile === item.fileName">
<i class="el-icon-video-camera" ></i>
{{ getFileShowName(item) }}
</el-tag>
--
Gitblit v1.8.0