From 789fb438c83269344f616f4087e2f7b18dd31234 Mon Sep 17 00:00:00 2001 From: punchhhh <87906027+punchhhh@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:09:43 +0800 Subject: [PATCH] =?UTF-8?q?hiking=E6=A8=A1=E5=9D=97=E5=92=8Cdatacenter?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/controller/CameraApi.java | 36 ++++++++----------- .../controller/app/camera/vo/CameraDO.java | 4 +-- .../controller/app/camera/vo/CameraDTO.java | 3 ++ .../module/hiking/api/camera/CameraApi.java | 4 +-- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/CameraApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/CameraApi.java index a3927a034..a45e3e73a 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/CameraApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/CameraApi.java @@ -62,11 +62,11 @@ public class CameraApi { @Operation(summary = "获取监控点预览流URL") public Map selectPreviewUrlByCameraIndexCode(String cameraIndexCode, Integer streamType, String protocol, Integer transmode, String expand, String streamform) { Map result = new HashMap<>(); -// String previewUrl = cameraService.getPreviewUrl(cameraIndexCode, streamType, protocol, transmode, expand, streamform); -// result.put("previewUrl", previewUrl); - result.put("previewUrl", ""); - result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " streamType:" + streamType + " protocol:" + protocol + " transmode:" + transmode + " expand:" + expand + " streamform:" + streamform); - result.put("status", "success"); + String previewUrl = cameraService.getPreviewUrl(cameraIndexCode, streamType, protocol, transmode, expand, streamform); + result.put("previewUrl", previewUrl); +// result.put("previewUrl", ""); +// result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " streamType:" + streamType + " protocol:" + protocol + " transmode:" + transmode + " expand:" + expand + " streamform:" + streamform); +// result.put("status", "success"); return result; } @@ -74,11 +74,11 @@ public class CameraApi { @Operation(summary = "获取监控点回放流URL") public Map selectPlayBackUrlByCameraIndexCode(String cameraIndexCode, Integer recordLocation, String protocol, Integer transmode, String beginTime, String endTime, String uuid, String expand, String streamform, Integer lockType) { Map result = new HashMap<>(); -// String playBack = cameraService.getPlayBackUrl(cameraIndexCode,recordLocation, protocol, transmode, beginTime, endTime, uuid, expand, streamform,lockType); -// result.put("previewUrl", playBack); + String playBack = cameraService.getPlayBackUrl(cameraIndexCode,recordLocation, protocol, transmode, beginTime, endTime, uuid, expand, streamform,lockType); + result.put("previewUrl", playBack); // result.put("playBackUrl", ""); - result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " recordLocation:" + recordLocation + " protocol:" + protocol + " transmode:" + transmode + " beginTime:" + beginTime + " endTime:" + endTime + " uuid:" + uuid + " expand:" + expand + " streamform:" + streamform + " lockType:" + lockType); - result.put("status", "success"); +// result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " recordLocation:" + recordLocation + " protocol:" + protocol + " transmode:" + transmode + " beginTime:" + beginTime + " endTime:" + endTime + " uuid:" + uuid + " expand:" + expand + " streamform:" + streamform + " lockType:" + lockType); +// result.put("status", "success"); return result; } @@ -98,11 +98,11 @@ public class CameraApi { @Operation(summary = "云台控制") public Map controlling(String cameraIndexCode, Integer action, String command, Integer speed, Integer presetIndex) { Map result = new HashMap<>(); -// String controllingResult = cameraService.controlling(cameraIndexCode,action, command, speed, presetIndex); -// result.put("selZoomResult", controllingResult); - result.put("controllingResult", ""); - result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " action:" + action + " command:" + command + " speed:" + speed + " presetIndex:" + presetIndex); - result.put("status", "success"); + String controllingResult = cameraService.controlling(cameraIndexCode,action, command, speed, presetIndex); + result.put("selZoomResult", controllingResult); +// result.put("controllingResult", ""); +// result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " action:" + action + " command:" + command + " speed:" + speed + " presetIndex:" + presetIndex); +// result.put("status", "success"); return result; } @@ -117,14 +117,6 @@ public class CameraApi { return result; } - @GetMapping("/rtspTest") - @Operation(summary = "rtsp推流测试") - public Map rtspTest() { - Map result = new HashMap<>(); - result.put("rtsp_url", "rtsp://192.168.1.7/stream"); - return result; - } - @GetMapping("/selectCameraIndexCodeByCameraName") @Operation(summary = "根据监控点名称获取监控点编码") @DS("hiking") diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDO.java index c850f4643..e05c4d3e3 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDO.java @@ -173,11 +173,11 @@ public class CameraDO extends BaseDO { /** * 经度 */ - private BigDecimal longitude; + private String longitude; /** * 纬度 */ - private BigDecimal latitude; + private String latitude; /** * 海拔高度 */ diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDTO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDTO.java index 54c944648..955435a53 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDTO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDTO.java @@ -9,6 +9,9 @@ public class CameraDTO { @Schema(description = "监控点ID") private Long id; + @Schema(description = "监控点唯一编码") + private String cameraIndexCode; + @Schema(description = "监控点名称") private String cameraName; diff --git a/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/camera/CameraApi.java b/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/camera/CameraApi.java index 7cf1637a4..45542489f 100644 --- a/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/camera/CameraApi.java +++ b/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/camera/CameraApi.java @@ -25,9 +25,9 @@ public interface CameraApi { @GetMapping(PREFIX + "/selectPreviewUrlByCameraIndexCode") @Operation(summary = "获取监控点预览流URL") - public CommonResult selectPreviewUrlByCameraIndexCode(@RequestParam String cameraIndexCode); + public CommonResult selectPreviewUrlByCameraIndexCode(@RequestParam String cameraIndexCode, Integer streamType, String protocol, Integer transmode, String expand, String streamform); @GetMapping(PREFIX + "/selectPlayBackUrlByCameraIndexCode") @Operation(summary = "获取监控点回放流URL") - public CommonResult selectPlayBackUrlByCameraIndexCode(@RequestParam String cameraIndexCode, String beginTime,String endTime); + public CommonResult selectPlayBackUrlByCameraIndexCode(@RequestParam String cameraIndexCode, Integer recordLocation, String protocol, Integer transmode, String beginTime, String endTime, String uuid, String expand, String streamform, Integer lockType); }