root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 2 Wiki Activity

hiking模块和datacenter补充提交

Browse Source
This commit is contained in:
punchhhh 2025-01-23 10:09:43 +08:00
parent 01e2a51b57
commit 789fb438c8
4 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/CameraApi.java
View File

@ -62,11 +62,11 @@ public class CameraApi {
@Operation(summary = "获取监控点预览流URL") @Operation(summary = "获取监控点预览流URL")
public Map<String, Object> selectPreviewUrlByCameraIndexCode(String cameraIndexCode, Integer streamType, String protocol, Integer transmode, String expand, String streamform) { public Map<String, Object> selectPreviewUrlByCameraIndexCode(String cameraIndexCode, Integer streamType, String protocol, Integer transmode, String expand, String streamform) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
// String previewUrl = cameraService.getPreviewUrl(cameraIndexCode, streamType, protocol, transmode, expand, streamform); String previewUrl = cameraService.getPreviewUrl(cameraIndexCode, streamType, protocol, transmode, expand, streamform);
// result.put("previewUrl", previewUrl); result.put("previewUrl", previewUrl);
result.put("previewUrl", ""); // result.put("previewUrl", "");
result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " streamType:" + streamType + " protocol:" + protocol + " transmode:" + transmode + " expand:" + expand + " streamform:" + streamform); // result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " streamType:" + streamType + " protocol:" + protocol + " transmode:" + transmode + " expand:" + expand + " streamform:" + streamform);
result.put("status", "success"); // result.put("status", "success");
return result; return result;
} }
@ -74,11 +74,11 @@ public class CameraApi {
@Operation(summary = "获取监控点回放流URL") @Operation(summary = "获取监控点回放流URL")
public Map<String, Object> selectPlayBackUrlByCameraIndexCode(String cameraIndexCode, Integer recordLocation, String protocol, Integer transmode, String beginTime, String endTime, String uuid, String expand, String streamform, Integer lockType) { public Map<String, Object> selectPlayBackUrlByCameraIndexCode(String cameraIndexCode, Integer recordLocation, String protocol, Integer transmode, String beginTime, String endTime, String uuid, String expand, String streamform, Integer lockType) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
// String playBack = cameraService.getPlayBackUrl(cameraIndexCode,recordLocation, protocol, transmode, beginTime, endTime, uuid, expand, streamform,lockType); String playBack = cameraService.getPlayBackUrl(cameraIndexCode,recordLocation, protocol, transmode, beginTime, endTime, uuid, expand, streamform,lockType);
// result.put("previewUrl", playBack); result.put("previewUrl", playBack);
// result.put("playBackUrl", ""); // 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("传入的参数", "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("status", "success");
return result; return result;
} }
@ -98,11 +98,11 @@ public class CameraApi {
@Operation(summary = "云台控制") @Operation(summary = "云台控制")
public Map<String, Object> controlling(String cameraIndexCode, Integer action, String command, Integer speed, Integer presetIndex) { public Map<String, Object> controlling(String cameraIndexCode, Integer action, String command, Integer speed, Integer presetIndex) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
// String controllingResult = cameraService.controlling(cameraIndexCode,action, command, speed, presetIndex); String controllingResult = cameraService.controlling(cameraIndexCode,action, command, speed, presetIndex);
// result.put("selZoomResult", controllingResult); result.put("selZoomResult", controllingResult);
result.put("controllingResult", ""); // result.put("controllingResult", "");
result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " action:" + action + " command:" + command + " speed:" + speed + " presetIndex:" + presetIndex); // result.put("传入的参数", "cameraIndexCode:" + cameraIndexCode + " action:" + action + " command:" + command + " speed:" + speed + " presetIndex:" + presetIndex);
result.put("status", "success"); // result.put("status", "success");
return result; return result;
} }
@ -117,14 +117,6 @@ public class CameraApi {
return result; return result;
} }
@GetMapping("/rtspTest")
@Operation(summary = "rtsp推流测试")
public Map<String, Object> rtspTest() {
Map<String, Object> result = new HashMap<>();
result.put("rtsp_url", "rtsp://192.168.1.7/stream");
return result;
}
@GetMapping("/selectCameraIndexCodeByCameraName") @GetMapping("/selectCameraIndexCodeByCameraName")
@Operation(summary = "根据监控点名称获取监控点编码") @Operation(summary = "根据监控点名称获取监控点编码")
@DS("hiking") @DS("hiking")

4
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDO.java
View File

@ -173,11 +173,11 @@ public class CameraDO extends BaseDO {
/** /**
* 经度 * 经度
*/ */
private BigDecimal longitude; private String longitude;
/** /**
* 纬度 * 纬度
*/ */
private BigDecimal latitude; private String latitude;
/** /**
* 海拔高度 * 海拔高度
*/ */

3
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDTO.java
View File

@ -9,6 +9,9 @@ public class CameraDTO {
@Schema(description = "监控点ID") @Schema(description = "监控点ID")
private Long id; private Long id;
@Schema(description = "监控点唯一编码")
private String cameraIndexCode;
@Schema(description = "监控点名称") @Schema(description = "监控点名称")
private String cameraName; private String cameraName;

4
ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/camera/CameraApi.java
View File

@ -25,9 +25,9 @@ public interface CameraApi {
@GetMapping(PREFIX + "/selectPreviewUrlByCameraIndexCode") @GetMapping(PREFIX + "/selectPreviewUrlByCameraIndexCode")
@Operation(summary = "获取监控点预览流URL") @Operation(summary = "获取监控点预览流URL")
public CommonResult<String> selectPreviewUrlByCameraIndexCode(@RequestParam String cameraIndexCode); public CommonResult<String> selectPreviewUrlByCameraIndexCode(@RequestParam String cameraIndexCode, Integer streamType, String protocol, Integer transmode, String expand, String streamform);
@GetMapping(PREFIX + "/selectPlayBackUrlByCameraIndexCode") @GetMapping(PREFIX + "/selectPlayBackUrlByCameraIndexCode")
@Operation(summary = "获取监控点回放流URL") @Operation(summary = "获取监控点回放流URL")
public CommonResult<String> selectPlayBackUrlByCameraIndexCode(@RequestParam String cameraIndexCode, String beginTime,String endTime); public CommonResult<String> selectPlayBackUrlByCameraIndexCode(@RequestParam String cameraIndexCode, Integer recordLocation, String protocol, Integer transmode, String beginTime, String endTime, String uuid, String expand, String streamform, Integer lockType);
} }