guzijian / wvp-GB28181-pro · Commits

Commit bf1be52e7f4777f1be4823dbee6f356a2bb697b9

Authored by 648540858
2 parents e5cba602 a4b15e84

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @bf1be52
... ... @@ -359,7 +359,7 @@ public class PlayController {
359 359 message.setKey(key);
360 360 message.setId(uuid);
361 361  
362   - String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + "jpg";
  362 + String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + ".jpg";
363 363 playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> {
364 364 if (code == InviteErrorCode.SUCCESS.getCode()) {
365 365 message.setData(data);
... ...
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
  View file @bf1be52
... ... @@ -42,7 +42,7 @@ public class LogController {
42 42 * @return
43 43 */
44 44 @GetMapping("/all")
45   - @Operation(summary = "分页查询报警")
  45 + @Operation(summary = "分页查询日志")
46 46 @Parameter(name = "query", description = "查询内容", required = true)
47 47 @Parameter(name = "page", description = "当前页", required = true)
48 48 @Parameter(name = "count", description = "每页查询数量", required = true)
... ... @@ -84,7 +84,7 @@ public class LogController {
84 84 * 清空日志
85 85 *
86 86 */
87   - @Operation(summary = "停止视频回放")
  87 + @Operation(summary = "清空日志")
88 88 @DeleteMapping("/clear")
89 89 public void clear() {
90 90 logService.clear();
... ...