diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
index dc44ef2..ce9791c 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
@@ -505,10 +505,15 @@ public class WxAppletController {
 
     @ApiOperation("按设备查询监测数据")
     @GetMapping("/getSurvDataByDevice")
-    public R getSurvDataByDevice(@RequestParam("deployCode") String deployCode){
+    public R getSurvDataByDevice(@RequestParam("deployCode") String deployCode,@RequestParam("deployId") String deployId){
+        SurvDeviceDeploy survDeviceDeploy = null;
+        if(StringUtils.isNotBlank(deployId)){
+            survDeviceDeploy = deviceDeployService.getById(deployId);
+        }
+        if(StringUtils.isNotBlank(deployCode)){
+            survDeviceDeploy = deviceDeployService.getDeviceByCode(deployCode);
+        }
 
-
-        SurvDeviceDeploy survDeviceDeploy = deviceDeployService.getDeviceByCode(deployCode);
         if(survDeviceDeploy==null){
             return R.failed("无效的设备");
         }