From daac0010b16fc03ef72b6b0712b5ba38dde2801d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 19 十月 2023 17:52:19 +0800
Subject: [PATCH] 优化云端录像定时清理
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 74 ++++++++++
src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java | 12 +
src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java | 43 +++++
sql/初始化.sql | 31 ++--
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java | 11 +
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 2
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 33 +++-
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 88 ++++++++----
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 4
src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java | 25 ++
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 5
sql/2.6.9更新.sql | 13 +
src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java | 73 ++++++++++
13 files changed, 340 insertions(+), 74 deletions(-)
diff --git "a/sql/2.6.9\346\233\264\346\226\260.sql" "b/sql/2.6.9\346\233\264\346\226\260.sql"
index 103dcbb..6532d32 100644
--- "a/sql/2.6.9\346\233\264\346\226\260.sql"
+++ "b/sql/2.6.9\346\233\264\346\226\260.sql"
@@ -5,7 +5,7 @@
add auto_push_channel bool default false
alter table wvp_stream_proxy
- add stream_key varying(255)
+ add stream_key character varying(255)
create table wvp_cloud_record (
id serial primary key,
@@ -18,8 +18,17 @@
file_name character varying(255),
folder character varying(255),
file_path character varying(255),
- collect_type character varying(255),
+ collect bool default false,
+ reserve bool default false,
file_size integer,
time_len integer,
constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
);
+
+alter table wvp_media_server
+ add record_path character varying(255);
+
+alter table wvp_media_server
+ add record_date integer default 7;
+
+
diff --git "a/sql/\345\210\235\345\247\213\345\214\226.sql" "b/sql/\345\210\235\345\247\213\345\214\226.sql"
index 4395d03..42798e4 100644
--- "a/sql/\345\210\235\345\247\213\345\214\226.sql"
+++ "b/sql/\345\210\235\345\247\213\345\214\226.sql"
@@ -164,6 +164,8 @@
create_time character varying(50),
update_time character varying(50),
hook_alive_interval integer,
+ record_path character varying(255),
+ record_date integer default 7,
constraint uk_media_server_unique_ip_http_port unique (ip, http_port)
);
@@ -267,20 +269,21 @@
constraint uk_stream_push_app_stream unique (app, stream)
);
create table wvp_cloud_record (
- id serial primary key,
- app character varying(255),
- stream character varying(255),
- call_id character varying(255),
- start_time integer,
- end_time integer,
- media_server_id character varying(50),
- file_name character varying(255),
- folder character varying(255),
- file_path character varying(255),
- collect_type character varying(255),
- file_size integer,
- time_len integer,
- constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
+ id serial primary key,
+ app character varying(255),
+ stream character varying(255),
+ call_id character varying(255),
+ start_time integer,
+ end_time integer,
+ media_server_id character varying(50),
+ file_name character varying(255),
+ folder character varying(255),
+ file_path character varying(255),
+ collect bool default false,
+ reserve bool default false,
+ file_size integer,
+ time_len integer,
+ constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
);
create table wvp_user (
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java b/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
new file mode 100644
index 0000000..abd5dfb
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java
@@ -0,0 +1,73 @@
+package com.genersoft.iot.vmp.conf;
+
+
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
+import com.genersoft.iot.vmp.vmanager.cloudRecord.CloudRecordController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 褰曞儚鏂囦欢瀹氭椂鍒犻櫎
+ */
+@Component
+public class CloudRecordTimer {
+
+ private final static Logger logger = LoggerFactory.getLogger(CloudRecordTimer.class);
+
+ @Autowired
+ private IMediaServerService mediaServerService;
+
+ @Autowired
+ private CloudRecordServiceMapper cloudRecordServiceMapper;
+
+ @Autowired
+ private AssistRESTfulUtils assistRESTfulUtils;
+
+ /**
+ * 瀹氭椂鏌ヨ寰呭垹闄ょ殑褰曞儚鏂囦欢
+ */
+ @Scheduled(cron = "0 0 0 * * ?") //姣忓ぉ鐨�0鐐规墽琛�
+ public void execute(){
+ // 鑾峰彇閰嶇疆浜哸ssist鐨勬祦濯掍綋鑺傜偣
+ List<MediaServerItem> mediaServerItemList = mediaServerService.getAllWithAssistPort();
+ if (mediaServerItemList.isEmpty()) {
+ return;
+ }
+ long result = 0;
+ for (MediaServerItem mediaServerItem : mediaServerItemList) {
+
+ Calendar lastCalendar = Calendar.getInstance();
+ if (mediaServerItem.getRecordDate() > 0) {
+ lastCalendar.setTime(new Date());
+ // 鑾峰彇淇濆瓨鐨勬渶鍚庢埅鑷虫棩鏈燂紝鍥犱负姣忎釜鑺傜偣閮芥湁涓�涓棩鏈燂紝涔熷氨鏄敮鎸佹瘡涓妭鐐硅缃笉鍚岀殑淇濆瓨鏃ユ湡锛�
+ lastCalendar.add(Calendar.DAY_OF_MONTH, -mediaServerItem.getRecordDate());
+ Long lastDate = lastCalendar.getTimeInMillis();
+ // 鑾峰彇鍒版埅鑷虫棩鏈熶箣鍓嶇殑褰曞儚鏂囦欢鍒楄〃锛屾枃浠跺垪琛ㄦ弧瓒虫湭琚敹钘忓拰淇濇寔鐨勩�傝繖涓や釜瀛楁鐩墠鍏辫兘涓�鑷达紝
+ // 涓烘垜鑷繁涓氬姟绯荤粺鐩稿叧鐨勪唬鐮侊紝澶у浣跨敤鐨勬椂鍊欑洿鎺ヤ娇鐢ㄦ敹钘忥紙collect锛夎繖涓�涓被鍨嬪嵆鍙�
+ List<String> filePathList = cloudRecordServiceMapper.queryRecordFilePathListForDelete(lastDate, mediaServerItem.getId());
+ if (filePathList.isEmpty()) {
+ continue;
+ }
+ // 鍏堣皟鐢╝ssist鍒犻櫎纾佺洏鏂囦欢锛屽垹闄ゆ垚鍔熷悗鍐嶅垹闄ゆ暟鎹簱璁板綍
+ JSONObject jsonObject = assistRESTfulUtils.deleteFiles(mediaServerItem, filePathList);
+ if (jsonObject != null && jsonObject.getInteger("code") == 0 && jsonObject.getInteger("data") > 0) {
+ result += jsonObject.getInteger("data");
+ cloudRecordServiceMapper.deleteByFileList(filePathList, mediaServerItem.getId());
+ }
+ }
+ }
+ logger.info("[褰曞儚鏂囦欢瀹氭椂娓呯悊] 鍏辨竻鐞唟}涓繃鏈熷綍鍍忔枃浠�", result);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
index f018eae..fd63ce6 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
@@ -29,8 +29,6 @@
private OkHttpClient client;
-
-
public interface RequestCallback{
void run(JSONObject response);
}
@@ -271,4 +269,13 @@
return sendGet(mediaServerItem, "api/record/file/download/task/list", param, null);
}
+ public JSONObject addCollect(MediaServerItem mediaServerItem, JSONObject jsonObject) {
+ return sendPost(mediaServerItem, "api/record/file/collection/add", jsonObject, null, 30);
+ }
+
+ public JSONObject deleteFiles(MediaServerItem mediaServerItem, List<String> filePathList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("filePathList", filePathList);
+ return sendPost(mediaServerItem, "api/record/file/delete", jsonObject, null, 15*60);
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
index 066a677..7cbb2ae 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
@@ -80,8 +80,13 @@
@Schema(description = "鏄惁鏄粯璁LM")
private boolean defaultServer;
- @Schema(description = "褰撳墠浣跨敤鍒扮殑绔彛")
- private int currentPort;
+ @Schema(description = "褰曞儚瀛樺偍璺緞")
+ private String recordPath;
+
+ @Schema(description = "褰曞儚瀛樺偍鏃堕暱")
+ private int recordDate;
+
+
public MediaServerItem() {
@@ -269,14 +274,6 @@
this.updateTime = updateTime;
}
- public int getCurrentPort() {
- return currentPort;
- }
-
- public void setCurrentPort(int currentPort) {
- this.currentPort = currentPort;
- }
-
public boolean isStatus() {
return status;
}
@@ -308,4 +305,20 @@
public void setSendRtpPortRange(String sendRtpPortRange) {
this.sendRtpPortRange = sendRtpPortRange;
}
+
+ public String getRecordPath() {
+ return recordPath;
+ }
+
+ public void setRecordPath(String recordPath) {
+ this.recordPath = recordPath;
+ }
+
+ public int getRecordDate() {
+ return recordDate;
+ }
+
+ public void setRecordDate(int recordDate) {
+ this.recordDate = recordDate;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
index 10a58c6..1c1dba3 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.service;
import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
@@ -40,4 +39,15 @@
* 鏌ヨ鍚堝苟浠诲姟鍒楄〃
*/
JSONArray queryTask(String taskId, String mediaServerId, Boolean isEnd);
+
+ /**
+ * 鏀惰棌瑙嗛锛屾敹钘忕殑瑙嗛杩囨湡涓嶄細鍒犻櫎
+ */
+ void changeCollect(String type, boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId, String collectType);
+
+ /**
+ * 娣诲姞鎸囧畾褰曞儚鏀惰棌
+ */
+ void changeCollectById(Integer recordId, String collectType, boolean result);
+
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
index c5f1196..941cf6f 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -93,4 +93,6 @@
*/
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
+ List<MediaServerItem> getAllWithAssistPort();
+
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java b/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
index 364ec29..897dc9a 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
@@ -57,9 +57,14 @@
private String folder;
/**
- * 鏀惰棌绫诲瀷锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
+ * 鏀惰棌锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
*/
- private String collectType;
+ private Boolean collect;
+
+ /**
+ * 淇濈暀锛屾敹钘忕殑鏂囦欢涓嶇Щ闄�
+ */
+ private Boolean reserve;
/**
* 鏂囦欢澶у皬
@@ -182,11 +187,19 @@
this.timeLen = timeLen;
}
- public String getCollectType() {
- return collectType;
+ public Boolean getCollect() {
+ return collect;
}
- public void setCollectType(String collectType) {
- this.collectType = collectType;
+ public void setCollect(Boolean collect) {
+ this.collect = collect;
+ }
+
+ public Boolean getReserve() {
+ return reserve;
+ }
+
+ public void setReserve(Boolean reserve) {
+ this.reserve = reserve;
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
index 5af3d64..1a8adb1 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
@@ -3,8 +3,6 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
-import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -19,14 +17,13 @@
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.unit.DataUnit;
import java.time.*;
-import java.time.temporal.TemporalAccessor;
import java.util.*;
@Service
@@ -167,4 +164,73 @@
}
return result.getJSONArray("data");
}
+
+ @Override
+ public void changeCollect(String type, boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId, String collectType) {
+ // 寮�濮嬫椂闂村拰缁撴潫鏃堕棿鍦ㄦ暟鎹簱涓兘鏄互绉掍负鍗曚綅鐨�
+ Long startTimeStamp = null;
+ Long endTimeStamp = null;
+ if (startTime != null ) {
+ if (!DateUtil.verification(startTime, DateUtil.formatter)) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "寮�濮嬫椂闂存牸寮忛敊璇紝姝ｇ‘鏍煎紡涓猴細 " + DateUtil.formatter);
+ }
+ startTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime);
+
+ }
+ if (endTime != null ) {
+ if (!DateUtil.verification(endTime, DateUtil.formatter)) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "缁撴潫鏃堕棿鏍煎紡閿欒锛屾纭牸寮忎负锛� " + DateUtil.formatter);
+ }
+ endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
+
+ }
+
+ List<MediaServerItem> mediaServerItems;
+ if (!ObjectUtils.isEmpty(mediaServerId)) {
+ mediaServerItems = new ArrayList<>();
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ if (mediaServerItem == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版祦濯掍綋: " + mediaServerId);
+ }
+ mediaServerItems.add(mediaServerItem);
+ } else {
+ mediaServerItems = null;
+ }
+
+ List<CloudRecordItem> all = cloudRecordServiceMapper.getList(null, app, stream, startTimeStamp, endTimeStamp,
+ callId, mediaServerItems);
+ if (all.isEmpty()) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板緟鏀惰棌鐨勮棰�");
+ }
+ int limitCount = 50;
+ if (all.size() > limitCount) {
+ for (int i = 0; i < all.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > all.size()) {
+ toIndex = all.size();
+ }
+ if ("collect".equals(collectType)) {
+ cloudRecordServiceMapper.updateCollectList(result, all.subList(i, toIndex));
+ }else if ("reserve".equals(collectType)) {
+ cloudRecordServiceMapper.updateReserveList(result, all.subList(i, toIndex));
+ }
+
+ }
+ }else {
+ if ("collect".equals(collectType)) {
+ cloudRecordServiceMapper.updateCollectList(result, all);
+ }else if ("reserve".equals(collectType)) {
+ cloudRecordServiceMapper.updateReserveList(result, all);
+ }
+ }
+ }
+
+ @Override
+ public void changeCollectById(Integer recordId, String collectType, boolean result) {
+ if ("collect".equals(collectType)) {
+ cloudRecordServiceMapper.changeCollectById(result, recordId);
+ }else if ("reserve".equals(collectType)) {
+ cloudRecordServiceMapper.changeReserveById(result, recordId);
+ }
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 4759d3a..889909a 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -752,4 +752,9 @@
result.setGbSend(redisCatchStorage.getGbSendCount(mediaServerItem.getId()));
return result;
}
+
+ @Override
+ public List<MediaServerItem> getAllWithAssistPort() {
+ return mediaServerMapper.queryAllWithAssistPort();
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
index 49ba89e..f8ceaf4 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
@@ -2,10 +2,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
import java.util.List;
@@ -78,4 +75,42 @@
@Param("startTimeStamp")Long startTimeStamp, @Param("endTimeStamp")Long endTimeStamp,
@Param("callId")String callId, List<MediaServerItem> mediaServerItemList);
+ @Update(" <script>" +
+ "update wvp_cloud_record set collect = #{collect} where file_path in " +
+ " <foreach collection='cloudRecordItemList' item='item' open='(' separator=',' close=')' > #{item.filePath}</foreach>" +
+ " </script>")
+ void updateCollectList(@Param("collect") boolean collect, List<CloudRecordItem> cloudRecordItemList);
+
+ @Delete(" <script>" +
+ "delete from wvp_cloud_record where media_server_id=#{mediaServerId} file_path in " +
+ " <foreach collection='filePathList' item='item' open='(' separator=',' close=')' > #{item}</foreach>" +
+ " </script>")
+ void deleteByFileList(List<String> filePathList, @Param("mediaServerId") String mediaServerId);
+
+
+ @Select(" <script>" +
+ "select file_path" +
+ " from wvp_cloud_record " +
+ " where collect = false and reserve = false " +
+ " <if test= 'endTimeStamp != null '> and start_time <= #{endTimeStamp}</if>" +
+ " <if test= 'callId != null '> and call_id = #{callId}</if>" +
+ " <if test= 'mediaServerId != null ' > and media_server_id = #{mediaServerId} </if>" +
+ " </script>")
+ List<String> queryRecordFilePathListForDelete(@Param("endTimeStamp")Long endTimeStamp, String mediaServerId);
+
+ @Update(" <script>" +
+ "update wvp_cloud_record set reserve = #{reserve} where file_path in " +
+ " <foreach collection='cloudRecordItems' item='item' open='(' separator=',' close=')' > #{item.filePath}</foreach>" +
+ " </script>")
+ void updateReserveList(@Param("reserve") boolean reserve,List<CloudRecordItem> cloudRecordItems);
+
+ @Update(" <script>" +
+ "update wvp_cloud_record set collect = #{collect} where id = #{recordId} " +
+ " </script>")
+ void changeCollectById(@Param("collect") boolean collect, @Param("recordId") Integer recordId);
+
+ @Update(" <script>" +
+ "update wvp_cloud_record set reserve = #{reserve} where id = #{recordId} " +
+ " </script>")
+ void changeReserveById(@Param("reserve") boolean reserve, Integer recordId);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
index 13d5365..77f4f19 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
@@ -130,4 +130,8 @@
@Select("SELECT * FROM wvp_media_server WHERE default_server=true")
MediaServerItem queryDefault();
+
+ @Select("SELECT * FROM wvp_media_server WHERE record_assist_port > 0")
+ List<MediaServerItem> queryAllWithAssistPort();
+
}
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 cb731cd..48ff15a 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
@@ -1,19 +1,16 @@
package com.genersoft.iot.vmp.vmanager.cloudRecord;
import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
-import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.ICloudRecordService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
-import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -36,11 +33,6 @@
@RequestMapping("/api/cloud/record")
public class CloudRecordController {
- @Autowired
- private ZLMServerFactory zlmServerFactory;
-
- @Autowired
- private SendRtpPortManager sendRtpPortManager;
private final static Logger logger = LoggerFactory.getLogger(CloudRecordController.class);
@@ -50,14 +42,6 @@
@Autowired
private IMediaServerService mediaServerService;
- @Autowired
- private UserSetting userSetting;
-
- @Autowired
- private DynamicTask dynamicTask;
-
- @Autowired
- private RedisTemplate<Object, Object> redisTemplate;
@ResponseBody
@GetMapping("/date/list")
@@ -68,8 +52,8 @@
@Parameter(name = "month", description = "鏈堬紝缃┖鍒欐煡璇㈠綋鏈�", required = false)
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D锛岀疆绌哄垯鏌ヨ鍏ㄩ儴", required = false)
public List<String> openRtpServer(
- @RequestParam String app,
- @RequestParam String stream,
+ @RequestParam(required = true) String app,
+ @RequestParam(required = true) String stream,
@RequestParam(required = false) int year,
@RequestParam(required = false) int month,
@RequestParam(required = false) String mediaServerId
@@ -108,8 +92,8 @@
@Parameter(name = "query", description = "妫�绱㈠唴瀹�", required = false)
@Parameter(name = "app", description = "搴旂敤鍚�", required = false)
@Parameter(name = "stream", description = "娴両D", required = false)
- @Parameter(name = "page", description = "褰撳墠椤�", required = false)
- @Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = false)
+ @Parameter(name = "page", description = "褰撳墠椤�", required = true)
+ @Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�(yyyy-MM-dd HH:mm:ss)", required = false)
@Parameter(name = "endTime", description = "缁撴潫鏃堕棿(yyyy-MM-dd HH:mm:ss)", required = false)
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D锛岀疆绌哄垯鏌ヨ鍏ㄩ儴娴佸獟浣�", required = false)
@@ -162,16 +146,16 @@
@ResponseBody
@GetMapping("/task/add")
@Operation(summary = "娣诲姞鍚堝苟浠诲姟")
- @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
- @Parameter(name = "stream", description = "娴両D", required = true)
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = false)
+ @Parameter(name = "stream", description = "娴両D", required = false)
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
@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(required = true) String app,
- @RequestParam(required = true) String stream,
+ @RequestParam(required = false) String app,
+ @RequestParam(required = false) String stream,
@RequestParam(required = false) String mediaServerId,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@@ -198,19 +182,61 @@
@ResponseBody
@GetMapping("/collect/add")
@Operation(summary = "娣诲姞鏀惰棌")
- @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
- @Parameter(name = "stream", description = "娴両D", required = true)
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = false)
+ @Parameter(name = "stream", description = "娴両D", required = false)
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
@Parameter(name = "startTime", description = "閴存潈ID", required = false)
@Parameter(name = "endTime", description = "閴存潈ID", required = false)
@Parameter(name = "callId", description = "閴存潈ID", required = false)
- @Parameter(name = "collectType", description = "鏀惰棌绫诲瀷", required = false)
- public JSONArray addCollect(
- @RequestParam(required = false) String taskId,
+ @Parameter(name = "collectType", description = "鏀惰棌绫诲瀷, collect/reserve", required = false)
+ public void addCollect(
+ @RequestParam(required = false) String app,
+ @RequestParam(required = false) String stream,
@RequestParam(required = false) String mediaServerId,
- @RequestParam(required = false) Boolean isEnd
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime,
+ @RequestParam(required = false) String callId,
+ @RequestParam(required = false) String collectType,
+ @RequestParam(required = false) Integer recordId
){
- return cloudRecordService.queryTask(taskId, mediaServerId, isEnd);
+ if (!"collect".equals(collectType) && !"reserve".equals(collectType)) {
+ collectType = "collect";
+ }
+ if (recordId != null) {
+ cloudRecordService.changeCollectById(recordId, collectType, true);
+ }else {
+ cloudRecordService.changeCollect(collectType, true, app, stream, mediaServerId, startTime, endTime, callId, collectType);
+ }
+ }
+
+ @ResponseBody
+ @GetMapping("/collect/delete")
+ @Operation(summary = "绉婚櫎鏀惰棌")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = false)
+ @Parameter(name = "stream", description = "娴両D", required = false)
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
+ @Parameter(name = "startTime", description = "閴存潈ID", required = false)
+ @Parameter(name = "endTime", description = "閴存潈ID", required = false)
+ @Parameter(name = "callId", description = "閴存潈ID", required = false)
+ @Parameter(name = "collectType", description = "鏀惰棌绫诲瀷, collect/reserve", required = false)
+ public void deleteCollect(
+ @RequestParam(required = false) String app,
+ @RequestParam(required = false) String stream,
+ @RequestParam(required = false) String mediaServerId,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime,
+ @RequestParam(required = false) String callId,
+ @RequestParam(required = false) String collectType,
+ @RequestParam(required = false) Integer recordId
+ ){
+ if (!"collect".equals(collectType) && !"reserve".equals(collectType)) {
+ collectType = "collect";
+ }
+ if (recordId != null) {
+ cloudRecordService.changeCollectById(recordId, collectType, false);
+ }else {
+ cloudRecordService.changeCollect(collectType, false, app, stream, mediaServerId, startTime, endTime, callId, collectType);
+ }
}
--
Gitblit v1.8.0