Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

pull/981/head
648540858 2023-08-01 10:29:20 +08:00
parent e5cba6022f a4b15e84d7
commit bf1be52e7f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@ -359,7 +359,7 @@ public class PlayController {
message.setKey(key); message.setKey(key);
message.setId(uuid); message.setId(uuid);
String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + "jpg"; String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + ".jpg";
playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> { playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> {
if (code == InviteErrorCode.SUCCESS.getCode()) { if (code == InviteErrorCode.SUCCESS.getCode()) {
message.setData(data); message.setData(data);

4
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
View File

@ -42,7 +42,7 @@ public class LogController {
* @return * @return
*/ */
@GetMapping("/all") @GetMapping("/all")
@Operation(summary = "分页查询报警") @Operation(summary = "分页查询日志")
@Parameter(name = "query", description = "查询内容", required = true) @Parameter(name = "query", description = "查询内容", required = true)
@Parameter(name = "page", description = "当前页", required = true) @Parameter(name = "page", description = "当前页", required = true)
@Parameter(name = "count", description = "每页查询数量", required = true) @Parameter(name = "count", description = "每页查询数量", required = true)
@ -84,7 +84,7 @@ public class LogController {
* 清空日志 * 清空日志
* *
*/ */
@Operation(summary = "停止视频回放") @Operation(summary = "清空日志")
@DeleteMapping("/clear") @DeleteMapping("/clear")
public void clear() { public void clear() {
logService.clear(); logService.clear();