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 queryRelay(@RequestParam String deployId) { -// SurvDeviceDeploy deploy = deviceDeployService.getById(deployId); -// Assert.notNull(deploy,"无效设备"); -// -// -// p3Service.sendMqttDeviceQuery(deploy, fianlVariables); -// } + @PostMapping(value = "/queryRelay") + public Result queryRelay(@RequestBody RelayQueryDTO relayQueryDTO) { + SurvDeviceDeploy deploy = deviceDeployService.getById(relayQueryDTO.getDeployId()); + Assert.notNull(deploy,"无效设备"); + List 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 relayKeys; + private String deployId; +}