From 488b9158fc873d228c2c0106050ece8272a49653 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 25 十二月 2024 10:36:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMonitorDeviceController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMonitorDeviceController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMonitorDeviceController.java
index b9e10b7..fcbcd18 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMonitorDeviceController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMonitorDeviceController.java
@@ -6,7 +6,10 @@
import com.sinata.system.domain.query.MwMonitorDeviceQuery;
import com.sinata.system.domain.vo.MwMonitorDeviceVO;
import com.sinata.system.service.MwMonitorDeviceService;
+import com.sinata.system.service.biz.MonitorDeviceApiNewService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
@@ -19,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
+import java.util.Map;
/**
* <p>
@@ -35,6 +39,7 @@
@RequestMapping("/backend/mwMonitorDevice")
public class MwMonitorDeviceController {
private final MwMonitorDeviceService mwMonitorDeviceService;
+ private final MonitorDeviceApiNewService monitorDeviceApiNewService;
/**
* 监控设备分页列表
@@ -98,4 +103,33 @@
mwMonitorDeviceService.removeById(id);
return R.ok();
}
+
+ /**
+ * 实时监控列表
+ *
+ * @param query
+ * @return
+ */
+ @ApiOperation("实时监控列表")
+ @PostMapping("/monitor/page")
+ public R<PageDTO<MwMonitorDeviceVO>> monitorPageList(@Valid @RequestBody MwMonitorDeviceQuery query) {
+ return R.ok(mwMonitorDeviceService.pageMonitorPage(query));
+ }
+
+ /**
+ * 获取视频服务器设备播放路径
+ *
+ * @param id
+ * @param channelNum
+ * @return
+ */
+ @ApiOperation("获取视频服务器设备播放路径")
+ @GetMapping("/getDeviceUrl")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceNumber", value = "设备编号"),
+ @ApiImplicitParam(name = "channelNum", value = "通道号")
+ })
+ public R<Map<String, Object>> getDeviceUrl(String deviceNumber, Integer channelNum) {
+ return R.ok(monitorDeviceApiNewService.getDeviceUrl(deviceNumber, channelNum));
+ }
}
--
Gitblit v1.7.1