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

648540858
2 parents e5cba602 a4b15e84
Showing 2 changed files with 3 additions and 3 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
@@ -359,7 +359,7 @@ public class PlayController {
 		message.setKey(key);
 		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) -> {
 			if (code == InviteErrorCode.SUCCESS.getCode()) {
 				message.setData(data);
@@ -42,7 +42,7 @@ public class LogController {
      * @return
      */
     @GetMapping("/all")
-    @Operation(summary = "分页查询报警")
+    @Operation(summary = "分页查询日志")
     @Parameter(name = "query", description = "查询内容", required = true)
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)
@@ -84,7 +84,7 @@ public class LogController {
      *  清空日志
      *
      */
-    @Operation(summary = "停止视频回放")
+    @Operation(summary = "清空日志")
     @DeleteMapping("/clear")
     public void clear() {
         logService.clear();