Merge pull request 'hiking模块和datacenter补充提交' (#93) from cgt into master

Reviewed-on: http://101.43.112.107:3000/root/ludu-cloud/pulls/93

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<String, Object> selectPreviewUrlByCameraIndexCode(String cameraIndexCode, Integer streamType, String protocol, Integer transmode, String expand, String streamform) {
         Map<String, Object> 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<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<>();
-//        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<String, Object> controlling(String cameraIndexCode, Integer action, String command, Integer speed, Integer presetIndex) {
         Map<String, Object> 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<String, Object> rtspTest() {
-        Map<String, Object> result = new HashMap<>();
-        result.put("rtsp_url", "rtsp://192.168.1.7/stream");
-        return result;
-    }
-
     @GetMapping("/selectCameraIndexCodeByCameraName")
     @Operation(summary = "根据监控点名称获取监控点编码")
     @DS("hiking")

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;
     /**
      * 海拔高度
      */

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;
 

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<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")
     @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);
 }