From db3240d918212b9f6f87fdb7704040f0107b456f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 05 六月 2023 11:10:15 +0800
Subject: [PATCH] 优化截图获取接口
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/SnapPath.java | 50 +++++++++++++++++++++++++
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 3 +
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 6 ++-
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 13 +++++-
src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java | 2
5 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index e6134f6..efba170 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -1133,9 +1133,10 @@
// 璇锋眰鎴浘
logger.info("[璇锋眰鎴浘]: " + fileName);
zlmresTfulUtils.getSnap(mediaServerItemInuse, streamUrl, 15, 1, path, fileName);
+ String filePath = path + File.separator + fileName;
File snapFile = new File(path + File.separator + fileName);
if (snapFile.exists()) {
- errorCallback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), snapFile.getAbsoluteFile());
+ errorCallback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), filePath);
}else {
errorCallback.run(InviteErrorCode.FAIL.getCode(), InviteErrorCode.FAIL.getMsg(), null);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java
index 7e2b512..e2e3879 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java
@@ -6,7 +6,7 @@
public enum ErrorCode {
SUCCESS(0, "鎴愬姛"),
ERROR100(100, "澶辫触"),
- ERROR400(400, "鍙傛暟涓嶅叏鎴栬�呴敊璇�"),
+ ERROR400(400, "鍙傛暟鎴栨柟娉曢敊璇�"),
ERROR404(404, "璧勬簮鏈壘鍒�"),
ERROR403(403, "鏃犳潈闄愭搷浣�"),
ERROR401(401, "璇风櫥褰曞悗閲嶆柊璇锋眰"),
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SnapPath.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SnapPath.java
new file mode 100644
index 0000000..ce34d72
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SnapPath.java
@@ -0,0 +1,50 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "鎴浘鍦板潃淇℃伅")
+public class SnapPath {
+
+ @Schema(description = "鐩稿鍦板潃")
+ private String path;
+
+ @Schema(description = "缁濆鍦板潃")
+ private String absoluteFilePath;
+
+ @Schema(description = "璇锋眰鍦板潃")
+ private String url;
+
+
+ public static SnapPath getInstance(String path, String absoluteFilePath, String url) {
+ SnapPath snapPath = new SnapPath();
+ snapPath.setPath(path);
+ snapPath.setAbsoluteFilePath(absoluteFilePath);
+ snapPath.setUrl(url);
+ return snapPath;
+ }
+
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public String getAbsoluteFilePath() {
+ return absoluteFilePath;
+ }
+
+ public void setAbsoluteFilePath(String absoluteFilePath) {
+ this.absoluteFilePath = absoluteFilePath;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index 0ff8ba1..06dfb00 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -466,10 +466,12 @@
@Operation(summary = "璇锋眰鎴浘")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
- public void getSnap(HttpServletResponse resp, @PathVariable String deviceId, @PathVariable String channelId) {
+ @Parameter(name = "mark", description = "鏍囪瘑", required = false)
+ public void getSnap(HttpServletResponse resp, @PathVariable String deviceId, @PathVariable String channelId, @RequestParam(required = false) String mark) {
try {
- final InputStream in = Files.newInputStream(new File("snap" + File.separator + deviceId + "_" + channelId + ".jpg").toPath());
+
+ final InputStream in = Files.newInputStream(new File("snap" + File.separator + deviceId + "_" + channelId + (mark == null? ".jpg": ("_" + mark + ".jpg"))).toPath());
resp.setContentType(MediaType.IMAGE_PNG_VALUE);
IOUtils.copy(in, resp.getOutputStream());
} catch (IOException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index e95622c..200a7d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -26,6 +26,7 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.SnapPath;
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
@@ -40,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
+import java.io.File;
import java.text.ParseException;
import java.util.List;
import java.util.UUID;
@@ -342,7 +344,7 @@
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/snap")
- public DeferredResult<String> getSnap(String deviceId, String channelId) {
+ public DeferredResult<String> getSnap(HttpServletRequest request, String deviceId, String channelId) {
if (logger.isDebugEnabled()) {
logger.debug("鑾峰彇鎴浘: {}/{}", deviceId, channelId);
}
@@ -355,11 +357,16 @@
RequestMessage message = new RequestMessage();
message.setKey(key);
message.setId(uuid);
+ String nowForUrl = DateUtil.getNowForUrl();
+ String fileName = deviceId + "_" + channelId + "_" + nowForUrl + ".jpg";
- String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + ".jpg";
playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> {
if (code == InviteErrorCode.SUCCESS.getCode()) {
- message.setData(data);
+ File snapFile = new File((String)data);
+ String fileNameForUrl = deviceId + "/" + channelId + "?mark=" + nowForUrl;
+ String uri = request.getRequestURL().toString().replace(request.getRequestURI(), "/api/device/query/snap/" + fileNameForUrl);
+ SnapPath snapPath = SnapPath.getInstance((String) data, snapFile.getAbsolutePath(), uri);
+ message.setData(snapPath);
}else {
message.setData(WVPResult.fail(code, msg));
}
--
Gitblit v1.8.0