From eb0e151648a8d78e7db92a982094c8da77a44c60 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Wed, 26 Nov 2025 17:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applet/controller/WxAppletController.java      | 14 +++++++++++---
 .../applet/mapper/xml/SurvAlertRecordMapper.xml    |  4 ++--
 2 files changed, 13 insertions(+), 5 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 8a81302..44423ab 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
@@ -363,14 +363,22 @@ public class WxAppletController {
     @ApiOperation("获取预警数据")
     public R getAlertRecord(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                            @RequestParam(value = "stationCode",required = false)String stationCode, @RequestParam(value = "yearStr",required = false)String yearStr){
+                            @RequestParam(value = "stationCode",required = false)String stationCode,
+                            @RequestParam(value = "deployId",required = false)String deployId,
+                            @RequestParam(value = "yearStr",required = false)String yearStr){
         JSONObject jsonObject = new JSONObject();
         //效果评价
         Page<SurvAlertRecord> page = new Page<SurvAlertRecord>(pageNo, pageSize);
         //查询站点里的所有设备
-        List<SurvDeviceDeploy> dList = deviceDeployService.getDeviceByStation(stationCode,"");
         List<String> allList =new ArrayList<>();
-         dList.forEach(item->allList.add(item.getDeployCode()));
+        if(StringUtils.isNotBlank(stationCode)){
+            List<SurvDeviceDeploy> dList = deviceDeployService.getDeviceByStation(stationCode,"");
+            dList.forEach(item->allList.add(item.getId()));
+        } else if (StringUtils.isNotBlank(deployId)) {
+            allList.add(deployId);
+        }
+
+
         IPage<SurvAlertRecord> pageList = alertRecordService.pages(page, allList,yearStr);
         return R.ok(pageList);
     }
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
index e26b016..3ed0112 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
@@ -46,8 +46,8 @@
     <select id="pages" resultMap="baseResultMap">
         select <include refid="baseSql"/>
         from surv_alert_record where 1=1
-        <if test="deviceList!=null">
-            and DEPLOY_CODE IN
+        <if test="deviceList!=null and deviceList.size()>0">
+            and DEPLOY_ID IN
             <foreach collection="deviceList" index="index" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>