From aeeb61d141c0245232e9e1e4cc71e4f309e9d096 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 五月 2024 17:47:43 +0800
Subject: [PATCH] 合并271分支
---
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
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 e55534d..ecf3a8d 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
@@ -75,22 +75,22 @@
if (ObjectUtils.isEmpty(month)) {
month = calendar.get(Calendar.MONTH) + 1;
}
- List<MediaServer> mediaServerItems;
+ List<MediaServer> mediaServers;
if (!ObjectUtils.isEmpty(mediaServerId)) {
- mediaServerItems = new ArrayList<>();
- MediaServer mediaServerItem = mediaServerService.getOne(mediaServerId);
- if (mediaServerItem == null) {
+ mediaServers = new ArrayList<>();
+ MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
+ if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版祦濯掍綋: " + mediaServerId);
}
- mediaServerItems.add(mediaServerItem);
+ mediaServers.add(mediaServer);
} else {
- mediaServerItems = mediaServerService.getAllOnlineList();
+ mediaServers = mediaServerService.getAllOnlineList();
}
- if (mediaServerItems.isEmpty()) {
+ if (mediaServers.isEmpty()) {
return new ArrayList<>();
}
- return cloudRecordService.getDateList(app, stream, year, month, mediaServerItems);
+ return cloudRecordService.getDateList(app, stream, year, month, mediaServers);
}
@ResponseBody
@@ -120,18 +120,18 @@
logger.info("[浜戠褰曞儚] 鏌ヨ app->{}, stream->{}, mediaServerId->{}, page->{}, count->{}, startTime->{}, endTime->{}, callId->{}",
app, stream, mediaServerId, page, count, startTime, endTime, callId);
- List<MediaServer> mediaServerItems;
+ List<MediaServer> mediaServers;
if (!ObjectUtils.isEmpty(mediaServerId)) {
- mediaServerItems = new ArrayList<>();
- MediaServer mediaServerItem = mediaServerService.getOne(mediaServerId);
- if (mediaServerItem == null) {
+ mediaServers = new ArrayList<>();
+ MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
+ if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版祦濯掍綋: " + mediaServerId);
}
- mediaServerItems.add(mediaServerItem);
+ mediaServers.add(mediaServer);
} else {
- mediaServerItems = mediaServerService.getAllOnlineList();
+ mediaServers = mediaServerService.getAllOnlineList();
}
- if (mediaServerItems.isEmpty()) {
+ if (mediaServers.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "褰撳墠鏃犳祦濯掍綋");
}
if (query != null && ObjectUtils.isEmpty(query.trim())) {
@@ -152,7 +152,7 @@
if (callId != null && ObjectUtils.isEmpty(callId.trim())) {
callId = null;
}
- return cloudRecordService.getList(page, count, query, app, stream, startTime, endTime, mediaServerItems, callId);
+ return cloudRecordService.getList(page, count, query, app, stream, startTime, endTime, mediaServers, callId);
}
@ResponseBody
@@ -175,20 +175,20 @@
@RequestParam(required = false) String callId,
@RequestParam(required = false) String remoteHost
){
- MediaServer mediaServerItem;
+ MediaServer mediaServer;
if (mediaServerId == null) {
- mediaServerItem = mediaServerService.getDefaultMediaServer();
+ mediaServer = mediaServerService.getDefaultMediaServer();
}else {
- mediaServerItem = mediaServerService.getOne(mediaServerId);
+ mediaServer = mediaServerService.getOne(mediaServerId);
}
- if (mediaServerItem == null) {
+ if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
}else {
if (remoteHost == null) {
- remoteHost = request.getScheme() + "://" + mediaServerItem.getIp() + ":" + mediaServerItem.getRecordAssistPort();
+ remoteHost = request.getScheme() + "://" + mediaServer.getIp() + ":" + mediaServer.getRecordAssistPort();
}
}
- return cloudRecordService.addTask(app, stream, mediaServerItem, startTime, endTime, callId, remoteHost, mediaServerId != null);
+ return cloudRecordService.addTask(app, stream, mediaServer, startTime, endTime, callId, remoteHost, mediaServerId != null);
}
@ResponseBody
@@ -309,18 +309,18 @@
logger.info("[涓嬭浇鎸囧畾褰曞儚鏂囦欢鐨勫帇缂╁寘] 鏌ヨ app->{}, stream->{}, mediaServerId->{}, startTime->{}, endTime->{}, callId->{}",
app, stream, mediaServerId, startTime, endTime, callId);
- List<MediaServerItem> mediaServerItems;
+ List<MediaServer> mediaServers;
if (!ObjectUtils.isEmpty(mediaServerId)) {
- mediaServerItems = new ArrayList<>();
- MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
- if (mediaServerItem == null) {
+ mediaServers = new ArrayList<>();
+ MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
+ if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版祦濯掍綋: " + mediaServerId);
}
- mediaServerItems.add(mediaServerItem);
+ mediaServers.add(mediaServer);
} else {
- mediaServerItems = mediaServerService.getAll();
+ mediaServers = mediaServerService.getAll();
}
- if (mediaServerItems.isEmpty()) {
+ if (mediaServers.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "褰撳墠鏃犳祦濯掍綋");
}
if (query != null && ObjectUtils.isEmpty(query.trim())) {
@@ -344,7 +344,7 @@
if (stream != null && callId != null) {
response.addHeader( "Content-Disposition", "attachment;filename=" + stream + "_" + callId + ".zip" );
}
- List<CloudRecordItem> cloudRecordItemList = cloudRecordService.getAllList(query, app, stream, startTime, endTime, mediaServerItems, callId, ids);
+ List<CloudRecordItem> cloudRecordItemList = cloudRecordService.getAllList(query, app, stream, startTime, endTime, mediaServers, callId, ids);
if (ObjectUtils.isEmpty(cloudRecordItemList)) {
return;
}
@@ -412,18 +412,18 @@
logger.info("[浜戠褰曞儚] 鏌ヨURL app->{}, stream->{}, mediaServerId->{}, page->{}, count->{}, startTime->{}, endTime->{}, callId->{}",
app, stream, mediaServerId, page, count, startTime, endTime, callId);
- List<MediaServerItem> mediaServerItems;
+ List<MediaServer> mediaServers;
if (!ObjectUtils.isEmpty(mediaServerId)) {
- mediaServerItems = new ArrayList<>();
- MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
- if (mediaServerItem == null) {
+ mediaServers = new ArrayList<>();
+ MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
+ if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版祦濯掍綋: " + mediaServerId);
}
- mediaServerItems.add(mediaServerItem);
+ mediaServers.add(mediaServer);
} else {
- mediaServerItems = mediaServerService.getAll();
+ mediaServers = mediaServerService.getAll();
}
- if (mediaServerItems.isEmpty()) {
+ if (mediaServers.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "褰撳墠鏃犳祦濯掍綋");
}
if (query != null && ObjectUtils.isEmpty(query.trim())) {
@@ -444,15 +444,15 @@
if (callId != null && ObjectUtils.isEmpty(callId.trim())) {
callId = null;
}
- MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
- if (mediaServerItem == null) {
+ MediaServer mediaServer = mediaServerService.getDefaultMediaServer();
+ if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版祦濯掍綋鑺傜偣");
}
if (remoteHost == null) {
remoteHost = request.getScheme() + "://" + request.getLocalAddr() + ":" +
- (request.getScheme().equals("https")? mediaServerItem.getHttpSSlPort() : mediaServerItem.getHttpPort());
+ (request.getScheme().equals("https")? mediaServer.getHttpSSlPort() : mediaServer.getHttpPort());
}
- PageInfo<CloudRecordItem> cloudRecordItemPageInfo = cloudRecordService.getList(page, count, query, app, stream, startTime, endTime, mediaServerItems, callId);
+ PageInfo<CloudRecordItem> cloudRecordItemPageInfo = cloudRecordService.getList(page, count, query, app, stream, startTime, endTime, mediaServers, callId);
PageInfo<CloudRecordUrl> cloudRecordUrlPageInfo = new PageInfo<>();
if (!ObjectUtils.isEmpty(cloudRecordItemPageInfo)) {
cloudRecordUrlPageInfo.setPageNum(cloudRecordItemPageInfo.getPageNum());
--
Gitblit v1.8.0