From 44d1dd9c8ffaffe0c4cccbad0258438a5c9702b7 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 七月 2026 18:49:56 +0800
Subject: [PATCH] 监控
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VideoMonitorController.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VideoMonitorController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VideoMonitorController.java
index 692ea3c..5362ef6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VideoMonitorController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VideoMonitorController.java
@@ -213,28 +213,24 @@
}
private void fillLiveAddress(VideoMonitorDeviceVO vo, TDevice device) {
+ int channelNo = 1;
try {
- JSONObject result = ezvizOpenApiUtils.getLiveAddress(
- device.getDeviceSerial(),
- device.getValidateCode(),
- 1
- );
- if (isEzvizSuccess(result)) {
- vo.setAccessToken(ezvizOpenApiUtils.getAccessToken());
- vo.setChannelNo(1);
- vo.setLiveAddress(resolveVideoUrl(result));
- if (StringUtils.hasText(vo.getLiveAddress())) {
- vo.setOnlineStatus(1);
- vo.setStatusMsg("在线");
- }
- } else {
- vo.setStatusMsg(ezvizErrorMessage("获取直播地址失败", result));
+ vo.setAccessToken(ezvizOpenApiUtils.getAccessToken());
+ vo.setChannelNo(channelNo);
+ vo.setLiveAddress(buildEzopenLiveAddress(device.getDeviceSerial(), channelNo));
+ if (Integer.valueOf(1).equals(vo.getOnlineStatus())) {
+ vo.setStatusMsg("在线");
}
} catch (Exception e) {
- vo.setStatusMsg("获取直播地址失败：" + e.getMessage());
+ vo.setLiveAddress(null);
+ vo.setStatusMsg("获取直播凭证失败：" + e.getMessage());
}
}
+ private String buildEzopenLiveAddress(String deviceSerial, Integer channelNo) {
+ return String.format("ezopen://open.ys7.com/%s/%d.live", deviceSerial, channelNo);
+ }
+
private AjaxResult buildEzvizResult(JSONObject result, String defaultMessage) {
if (isEzvizSuccess(result)) {
return AjaxResult.success(result);
--
Gitblit v1.7.1