From 0e9265080483b8943a053837e726b1009264a084 Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Mon, 27 Jul 2026 15:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=94=B9=E4=B8=BA=E4=BB=A5=E7=AB=99=E7=82=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SurvAlertRecordServiceImpl.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java
index 16b32d5..1fd6560 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java
@@ -60,6 +60,11 @@ public class SurvAlertRecordServiceImpl extends ServiceImpl<SurvAlertRecordMappe
     @Override
     public AlertSummaryVo getSummary(AlertSummaryDTO alertSummaryDTO) {
         AlertSummaryVo alertSummaryVo = new AlertSummaryVo();
+        Map<String,SurvItemInfo> itemInfo = new HashMap<>();
+        List<SurvItemInfo> itemList = new ArrayList<>();
+        List<String> timeList = new ArrayList<>();
+        Map<String,List<String>> dataMap = new HashMap<>();
+
        if(StringUtils.isNotBlank(alertSummaryDTO.getStationCode())){
            //获取站点下的所有设备
            List<String> deployTypes = new ArrayList<>();
@@ -74,8 +79,17 @@ public class SurvAlertRecordServiceImpl extends ServiceImpl<SurvAlertRecordMappe
            if(deviceList!=null && !deviceList.isEmpty()){
                for (SurvDeviceDeploy deploy : deviceList) {
                    alertSummaryDTO.setDeployId(deploy.getId());
-                   alertSummaryVo = getDeviceSummary(alertSummaryDTO);
+                   AlertSummaryVo  temp = getDeviceSummary(alertSummaryDTO);
+                   itemInfo.putAll(temp.getItemInfo());
+                   itemList.addAll(temp.getItemList());
+                   dataMap.putAll(temp.getDataMap());
+
+                   timeList = temp.getTimeList();
                }
+               alertSummaryVo.setItemInfo(itemInfo);
+               alertSummaryVo.setItemList(itemList);
+               alertSummaryVo.setDataMap(dataMap);
+               alertSummaryVo.setTimeList(timeList);
            }
 
        }else{