From 6f67ad062f8ac08b2a361d62dbc1f8c2c0c939e7 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Fri, 31 Jul 2026 14:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A7=9F=E6=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appmana/service/impl/IotCommonP2ServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java index 3030265..51f9455 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java @@ -534,13 +534,17 @@ public class IotCommonP2ServiceImpl { for (String s : datas.keySet()) { List survData = datas.get(s); if(survData!=null && !survData.isEmpty()){ - List yesterData = survData.subList(yesterDataCounts,survData.size()); + List finalData = new ArrayList<>(); + if(survData.size() > yesterDataCounts){ + finalData = survData.subList(yesterDataCounts,survData.size()); + } + //拼接新旧数据 if(curDatas!=null) { List itemCurData = curDatas.get(s); - yesterData.addAll(itemCurData); + finalData.addAll(itemCurData); } - newData.put(s,yesterData); + newData.put(s,finalData); } } }