From a0bad0f31e875a646acd3bbce45284f6971e0368 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Wed, 26 Nov 2025 18:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=B5=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8D=95=E4=B8=AA=E8=AE=BE=E5=A4=87=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appmana/controller/BigScreenControllerP2.java | 15 +++++++++++++--
 .../org/jeecg/common/vo/VOBigScreenSurvQ.java     |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java
index 9b2372c..21c70c5 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java
@@ -59,9 +59,20 @@ public class BigScreenControllerP2 {
     @PostMapping(value = "/survItemSummary")
     public Result<VOHisResult> survItemSummary(@RequestBody VOBigScreenSurvQ voBigScreenSurvQ) {
         PollutionEnum pollutionEnum =  PollutionEnum.catchPollution(voBigScreenSurvQ.getSurvItem());
+        SurvDeviceDeploy deploy = null;
+        if(StringUtils.isNotBlank(voBigScreenSurvQ.getStationCode())){
+            deploy = survDeviceDeployService.getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()
+                    .eq(SurvDeviceDeploy::getStationCode,voBigScreenSurvQ.getStationCode())
+                    .like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType())
+                    .last("limit 1"));
+        } else if (StringUtils.isNotBlank(voBigScreenSurvQ.getDeployId())) {
+            deploy = survDeviceDeployService.getById(voBigScreenSurvQ.getDeployId());
+        }else {
+            deploy = survDeviceDeployService.getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()
+                    .like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType())
+                    .last("limit 1"));
+        }
 
-        SurvDeviceDeploy deploy = survDeviceDeployService.getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()
-                .eq(SurvDeviceDeploy::getStationCode,voBigScreenSurvQ.getStationCode()).like(SurvDeviceDeploy::getDeployType,pollutionEnum.getType()).last("limit 1"));
         Assert.notNull(deploy, "无效的设备");
         LocalDateTime startDateTime = null;
         LocalDateTime endDateTime = null;
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java
index e26b24d..2e63c24 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/VOBigScreenSurvQ.java
@@ -7,6 +7,8 @@ import lombok.Data;
 public class VOBigScreenSurvQ {
     @ApiModelProperty("站点编号")
     private String stationCode;
+    @ApiModelProperty("设备ID")
+    private String deployId;
     @ApiModelProperty("检测项的变量名")
     private String survItem;
     @ApiModelProperty("开始时间")