From 24417203f06b25bf3059b357b4818714a1eb9e7c Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Wed, 30 Jul 2025 10:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E5=B8=83?=
 =?UTF-8?q?=E9=98=B2=E6=92=A4=E9=98=B2=E8=B0=83=E7=94=A8=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/controller/DeviceControl.java    |  8 ++++----
 web/src/api/device.js                                | 12 ++++++++++--
 web/src/views/device/list.vue                        |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceControl.java
index 43a10e1e2..6170cb1b9 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceControl.java
@@ -1,6 +1,6 @@
 /**
  * 设备控制命令API接口
- * 
+ *
  * @author lawrencehj
  * @date 2021年2月1日
  */
@@ -70,16 +70,16 @@ public class DeviceControl {
 
 	@Operation(summary = "布防/撤防", security = @SecurityRequirement(name = JwtUtils.HEADER))
 	@Parameter(name = "deviceId", description = "设备国标编号", required = true)
-	@Parameter(name = "guardCmdStr", description = "命令， 可选值：SetGuard（布防），ResetGuard（撤防）", required = true)
+	@Parameter(name = "guardCmd", description = "命令， 可选值：SetGuard（布防），ResetGuard（撤防）", required = true)
 	@GetMapping("/guard")
-	public DeferredResult<WVPResult<String>> guardApi(String deviceId, String guardCmdStr) {
+	public DeferredResult<WVPResult<String>> guardApi(String deviceId, String guardCmd) {
 		if (log.isDebugEnabled()) {
 			log.debug("布防/撤防API调用");
 		}
 		Device device = deviceService.getDeviceByDeviceId(deviceId);
 		Assert.notNull(device, "设备不存在");
 		DeferredResult<WVPResult<String>> result = new DeferredResult<>();
-		deviceService.guard(device, guardCmdStr, (code, msg, data) -> {
+		deviceService.guard(device, guardCmd, (code, msg, data) -> {
 			result.setResult(new WVPResult<>(code, msg, data));
 		});
 		result.onTimeout(() -> {
diff --git a/web/src/api/device.js b/web/src/api/device.js
index 10516dac9..5a60b2ba4 100644
--- a/web/src/api/device.js
+++ b/web/src/api/device.js
@@ -47,14 +47,22 @@ export function updateDeviceTransport(deviceId, streamMode) {
 export function setGuard(deviceId) {
   return request({
     method: 'get',
-    url: `/api/device/control/guard/${deviceId}/SetGuard`
+    url: `/api/device/control/guard`,
+    params: {
+      deviceId: deviceId,
+      guardCmd: 'SetGuard'
+    }
   })
 }
 
 export function resetGuard(deviceId) {
   return request({
     method: 'get',
-    url: `/api/device/control/guard/${deviceId}/ResetGuard`
+    url: `/api/device/control/guard`,
+    params: {
+      deviceId: deviceId,
+      guardCmd: 'ResetGuard'
+    }
   })
 }
 
diff --git a/web/src/views/device/list.vue b/web/src/views/device/list.vue
index 14a303559..8c6ab0bf3 100755
--- a/web/src/views/device/list.vue
+++ b/web/src/views/device/list.vue
@@ -362,7 +362,7 @@ export default {
         })
     },
     resetGuard: function(itemData) {
-      this.$store.dispatch('device/ResetGuard', itemData.deviceId)
+      this.$store.dispatch('device/resetGuard', itemData.deviceId)
         .then((data) => {
           this.$message.success({
             showClose: true,