From 63af4d6993bf9a73c768bcc85e43e4c59f96630d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 七月 2026 13:41:59 +0800
Subject: [PATCH] 监控
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VideoMonitorController.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 5689735..eb76710 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
@@ -41,7 +41,6 @@
@ApiOperation(value = "获取视频监控列表", tags = {"管理后台-视频监控"})
public AjaxResult<PageInfo<VideoMonitorDeviceVO>> pageList(VideoMonitorPageQuery query) {
Page<TDevice> page = deviceService.lambdaQuery()
- .eq(TDevice::getIssueStatus, 1)
.like(StringUtils.hasText(query.getDeviceName()), TDevice::getDeviceName, query.getDeviceName())
.eq(query.getPartnerType() != null, TDevice::getPartnerType, query.getPartnerType())
.eq(query.getPartnerId() != null, TDevice::getPartnerId, query.getPartnerId())
@@ -50,8 +49,12 @@
.page(Page.of(query.getPageCurr(), query.getPageSize()));
List<VideoMonitorDeviceVO> records = page.getRecords().stream()
- .map(this::toMonitorVO)
- .peek(this::fillOnlineStatus)
+ .map(device -> {
+ VideoMonitorDeviceVO vo = toMonitorVO(device);
+ fillOnlineStatus(vo);
+ fillLiveAddress(vo, device);
+ return vo;
+ })
.filter(item -> query.getOnlineStatus() == null || query.getOnlineStatus().equals(item.getOnlineStatus()))
.collect(Collectors.toList());
@@ -65,9 +68,9 @@
@GetMapping("/detail/{id}")
@ApiOperation(value = "获取视频监控详情", tags = {"管理后台-视频监控"})
public AjaxResult<VideoMonitorDeviceVO> detail(@PathVariable Integer id) {
- TDevice device = getIssuedDevice(id);
+ TDevice device = getDevice(id);
if (device == null) {
- return AjaxResult.error("设备不存在或未下发");
+ return AjaxResult.error("设备不存在");
}
VideoMonitorDeviceVO vo = toMonitorVO(device);
@@ -80,9 +83,9 @@
@PostMapping("/ptz")
@ApiOperation(value = "视频监控云台控制", tags = {"管理后台-视频监控"})
public AjaxResult ptz(@RequestBody VideoMonitorControlRequest request) {
- TDevice device = getIssuedDevice(request.getId());
+ TDevice device = getDevice(request.getId());
if (device == null) {
- return AjaxResult.error("设备不存在或未下发");
+ return AjaxResult.error("设备不存在");
}
JSONObject result = ezvizOpenApiUtils.ptzControl(
@@ -98,9 +101,9 @@
@PostMapping("/sceneSwitch")
@ApiOperation(value = "视频监控镜头开关", tags = {"管理后台-视频监控"})
public AjaxResult sceneSwitch(@RequestBody VideoMonitorControlRequest request) {
- TDevice device = getIssuedDevice(request.getId());
+ TDevice device = getDevice(request.getId());
if (device == null) {
- return AjaxResult.error("设备不存在或未下发");
+ return AjaxResult.error("设备不存在");
}
JSONObject result = ezvizOpenApiUtils.setSceneSwitch(
@@ -115,9 +118,9 @@
@PostMapping("/focus")
@ApiOperation(value = "视频监控焦距控制", tags = {"管理后台-视频监控"})
public AjaxResult focus(@RequestBody VideoMonitorControlRequest request) {
- TDevice device = getIssuedDevice(request.getId());
+ TDevice device = getDevice(request.getId());
if (device == null) {
- return AjaxResult.error("设备不存在或未下发");
+ return AjaxResult.error("设备不存在");
}
JSONObject result = ezvizOpenApiUtils.ptzControl(
@@ -136,9 +139,9 @@
@PostMapping("/playback")
@ApiOperation(value = "获取视频监控回放地址", tags = {"管理后台-视频监控"})
public AjaxResult<VideoMonitorDeviceVO> playback(@RequestBody VideoMonitorControlRequest request) {
- TDevice device = getIssuedDevice(request.getId());
+ TDevice device = getDevice(request.getId());
if (device == null) {
- return AjaxResult.error("设备不存在或未下发");
+ return AjaxResult.error("设备不存在");
}
JSONObject result;
@@ -168,12 +171,12 @@
return AjaxResult.success(vo);
}
- private TDevice getIssuedDevice(Integer id) {
+ private TDevice getDevice(Integer id) {
if (id == null) {
return null;
}
TDevice device = deviceService.getById(id);
- if (device == null || !Integer.valueOf(1).equals(device.getIssueStatus())) {
+ if (device == null) {
return null;
}
return device;
@@ -218,6 +221,10 @@
);
if (isEzvizSuccess(result)) {
vo.setLiveAddress(resolveVideoUrl(result));
+ if (StringUtils.hasText(vo.getLiveAddress())) {
+ vo.setOnlineStatus(1);
+ vo.setStatusMsg("在线");
+ }
} else {
vo.setStatusMsg(ezvizErrorMessage("获取直播地址失败", result));
}
--
Gitblit v1.7.1