From 4b9c188e7b569dfb1a9ac51404dbddce5c89b9ef Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Mon, 17 Aug 2026 18:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mqt=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=91=E9=80=81=E5=BB=B6=E8=BF=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SurvDeviceDeployController.java           | 20 +++++++++++--------
 .../org/jeecg/common/dto/RelayQueryDTO.java   | 11 ++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/dto/RelayQueryDTO.java

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java
index a69ffd0..cfebea7 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvDeviceDeployController.java
@@ -16,6 +16,7 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.IotConstants;
 import org.jeecg.common.constant.PollutionConstants;
 import org.jeecg.common.dto.DeviceFilterDTO;
+import org.jeecg.common.dto.RelayQueryDTO;
 import org.jeecg.common.entity.*;
 import org.jeecg.common.iot.common.DTOCamControl;
 import org.jeecg.common.iot.common.IotDeviceCtlResult;
@@ -459,14 +460,17 @@ public class SurvDeviceDeployController extends JeecgController<SurvDeviceDeploy
 		 return Result.OK(deviceRelayVo);
 	 }
 
-//	@GetMapping(value = "/queryRelay")
-//	public Result<Boolean> queryRelay(@RequestParam String deployId) {
-//		SurvDeviceDeploy deploy = deviceDeployService.getById(deployId);
-//		Assert.notNull(deploy,"无效设备");
-//
-//
-//		p3Service.sendMqttDeviceQuery(deploy, fianlVariables);
-//	}
+	@PostMapping(value = "/queryRelay")
+	public Result<Boolean> queryRelay(@RequestBody RelayQueryDTO relayQueryDTO) {
+		SurvDeviceDeploy deploy = deviceDeployService.getById(relayQueryDTO.getDeployId());
+		Assert.notNull(deploy,"无效设备");
+		List<String> fianlVariables = new ArrayList<>();
+		if(!relayQueryDTO.getRelayKeys().isEmpty()){
+			fianlVariables.addAll(relayQueryDTO.getRelayKeys());
+		}
+		p3Service.sendMqttDeviceQuery(deploy, fianlVariables);
+		return Result.OK(true);
+	}
 
 
 
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/dto/RelayQueryDTO.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/dto/RelayQueryDTO.java
new file mode 100644
index 0000000..77a4f0b
--- /dev/null
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/dto/RelayQueryDTO.java
@@ -0,0 +1,11 @@
+package org.jeecg.common.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RelayQueryDTO {
+    private List<String> relayKeys;
+    private String deployId;
+}