From 2116abd606ea41d8804cb671099948aafe464a05 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Fri, 28 Nov 2025 10:21:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=95=BF=E6=9C=9F=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/applet/controller/WxAppletController.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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("无效的设备"); }