From c25a99d60bef3d3bbd59fee895bd658928fd00db Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 10 一月 2024 16:17:29 +0800 Subject: [PATCH] 修复空指针异常 --- src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 90 ++++++++++++++++++++++++++++----------------- 1 files changed, 56 insertions(+), 34 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 cb731cd..41633cf 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, @@ -188,31 +172,69 @@ @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false) @Parameter(name = "isEnd", description = "鏄惁缁撴潫", required = false) public JSONArray queryTaskList( + @RequestParam(required = false) String app, + @RequestParam(required = false) String stream, + @RequestParam(required = false) String callId, @RequestParam(required = false) String taskId, @RequestParam(required = false) String mediaServerId, @RequestParam(required = false) Boolean isEnd ){ - return cloudRecordService.queryTask(taskId, mediaServerId, isEnd); + return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd); } @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 = "recordId", description = "褰曞儚璁板綍鐨処D锛岀敤浜庣簿鍑嗘敹钘忎竴涓棰戞枃浠�", required = false) + public int 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) Integer recordId ){ - return cloudRecordService.queryTask(taskId, mediaServerId, isEnd); + logger.info("[浜戠褰曞儚] 娣诲姞鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}", + app, stream, mediaServerId, startTime, endTime, callId, recordId); + if (recordId != null) { + return cloudRecordService.changeCollectById(recordId, true); + }else { + return cloudRecordService.changeCollect(true, app, stream, mediaServerId, startTime, endTime, callId); + } } - - + @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 = "recordId", description = "褰曞儚璁板綍鐨処D锛岀敤浜庣簿鍑嗙簿鍑嗙Щ闄や竴涓棰戞枃浠剁殑鏀惰棌", required = false) + public int 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) Integer recordId + ){ + logger.info("[浜戠褰曞儚] 绉婚櫎鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}", + app, stream, mediaServerId, startTime, endTime, callId, recordId); + if (recordId != null) { + return cloudRecordService.changeCollectById(recordId, false); + }else { + return cloudRecordService.changeCollect(false, app, stream, mediaServerId, startTime, endTime, callId); + } + } } -- Gitblit v1.8.0