From cc6d89c58889eb5355fce480d79ff6a9e57510b4 Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Mon, 11 Aug 2025 03:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0=E7=BB=8F?=
 =?UTF-8?q?=E5=BA=A6=E5=92=8C=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zkmedia/ZKLmediaController.java           | 33 ++++++++++---------
 .../dromara/sis/domain/SisDeviceManage.java   | 10 ++++++
 .../sis/domain/bo/SisDeviceManageBo.java      | 10 ++++++
 .../sis/domain/vo/SisDeviceManageVo.java      | 11 +++++++
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/zkmedia/ZKLmediaController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/zkmedia/ZKLmediaController.java
index fc214650..56368e29 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/zkmedia/ZKLmediaController.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/zkmedia/ZKLmediaController.java
@@ -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);
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
index 4ad5765b..db2f9f84 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
@@ -90,4 +90,14 @@ public class SisDeviceManage extends BaseEntity {
      */
     private Boolean isComparison;
 
+    /**
+     * 设备经度
+     */
+    private Double lon;
+
+    /**
+     * 设备维度
+     */
+    private Double lat;
+
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
index aa10a140..dd747269 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
@@ -88,6 +88,16 @@ public class SisDeviceManageBo extends BaseEntity {
      */
     private Boolean isComparison;
 
+    /**
+     * 设备经度
+     */
+    private Double lon;
+
+    /**
+     * 设备维度
+     */
+    private Double lat;
+
     private String tenantId;
 
 }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
index 17429d5f..e5955b28 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
@@ -100,4 +100,15 @@ public class SisDeviceManageVo implements Serializable {
      * 是否支持人脸比对
      */
     private Boolean isComparison;
+
+    /**
+     * 设备经度
+     */
+    private Double lon;
+
+    /**
+     * 设备维度
+     */
+    private Double lat;
+
 }