by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备增加经度和纬度

Browse Source
This commit is contained in:
15683799673
2025-08-11 03:00:54 +08:00
parent 8a6e499368
commit cc6d89c588
4 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/zkmedia/ZKLmediaController.java
View File

@@ -43,20 +43,6 @@ public class ZKLmediaController {
return R.fail();
}
/**
* 新增ffmpeg拉流代理
*
* @param data 创建拉流设备信息(如果外网不建议使用这种方式)
* @return 返回播放地址
*/
@PostMapping("/f/proxy")
public R<AddStreamProxyResp> addFfmpegStreamProxy(@RequestBody @Validated AddStreamProxy data) {
AddStreamProxyResp addStreamProxyResp = zlMediaKitService.addFfmpegStreamProxy(data);
if (addStreamProxyResp != null) {
return R.ok(addStreamProxyResp);
}
return R.fail();
}
/**
* 通过是设备ip和通道新增拉流代理
@@ -73,6 +59,21 @@ public class ZKLmediaController {
return R.fail();
}
/**
* 新增ffmpeg拉流代理
*
* @param data 创建拉流设备信息(如果外网不建议使用这种方式)
* @return 返回播放地址
*/
@PostMapping("/FFmpeg/proxy")
public R<AddStreamProxyResp> addFfmpegStreamProxy(@RequestBody @Validated AddStreamProxy data) {
AddStreamProxyResp addStreamProxyResp = zlMediaKitService.addFfmpegStreamProxy(data);
if (addStreamProxyResp != null) {
return R.ok(addStreamProxyResp);
}
return R.fail();
}
/**
* 通过是设备ip和通道新增ffmpeg拉流代理
@@ -80,8 +81,8 @@ public class ZKLmediaController {
* @param data 拉流参数
* @return 返回播放地址
*/
@PostMapping("/f/proxy")
public R<AddStreamProxyResp> addFfmpegStreamProxy(@RequestBody @Validated StreamPlay data) {
@PostMapping("/ffmpeg/proxy")
public R<AddStreamProxyResp> addFfmpegProxy(@RequestBody @Validated StreamPlay data) {
AddStreamProxyResp addStreamProxyResp = zlMediaKitService.addFfmpegStreamProxy(data);
if (addStreamProxyResp != null) {
return R.ok(addStreamProxyResp);

10
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
View File

@@ -90,4 +90,14 @@ public class SisDeviceManage extends BaseEntity {
*/
private Boolean isComparison;
/**
* 设备经度
*/
private Double lon;
/**
* 设备维度
*/
private Double lat;
}

10
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
View File

@@ -88,6 +88,16 @@ public class SisDeviceManageBo extends BaseEntity {
*/
private Boolean isComparison;
/**
* 设备经度
*/
private Double lon;
/**
* 设备维度
*/
private Double lat;
private String tenantId;
}

11
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
View File

@@ -100,4 +100,15 @@ public class SisDeviceManageVo implements Serializable {
* 是否支持人脸比对
*/
private Boolean isComparison;
/**
* 设备经度
*/
private Double lon;
/**
* 设备维度
*/
private Double lat;
}