From a182acff739a19d203cb3239b41da24d65f96ef2 Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Fri, 31 Jul 2026 12:20:43 +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

---
 .../service/impl/IotCommonP2ServiceImpl.java  | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 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 5164914..3030265 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
@@ -251,32 +251,38 @@ public class IotCommonP2ServiceImpl {
 
                 todayDataCounts = nowDay.getDayOfMonth();
                 yesterDataCounts = todayDataCounts;
-                String newTimes = yesterMonth.format(monthdtf);
-                voSurvIntegrateParam.setStartTime(newTimes);
-                voSurvIntegrateParam.setEndTime(newTimes);
-                VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam);
-                LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
-                List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTemp.getCode());
-                if(y1!=null){
-                    tempDatas.addAll(y1.subList(yesterDataCounts,y1.size()));
+
+                int lastDayOfMonth = yesterMonth.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
+
+                if(todayDataCounts < lastDayOfMonth) {//查询的日期大于上个月的总天数时，不需要截取
+
+                    String newTimes = yesterMonth.format(monthdtf);
+                    voSurvIntegrateParam.setStartTime(newTimes);
+                    voSurvIntegrateParam.setEndTime(newTimes);
+                    VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam);
+                    LinkedHashMap<String, List<String>> yesterResult = yesterData.getSurvResult();
+                    List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTemp.getCode());
+                    if (y1 != null) {
+                        tempDatas.addAll(y1.subList(yesterDataCounts, y1.size()));
+                    }
+                    List<String> y2 = yesterResult.get(PollutionEnum.dataWaterPh.getCode());
+                    if (y2 != null) {
+                        phDatas.addAll(y2.subList(yesterDataCounts, y2.size()));
+                    }
+                    List<String> y3 = yesterResult.get(PollutionEnum.dataWaterDdl.getCode());
+                    if (y3 != null) {
+                        ddlDatas.addAll(y3.subList(yesterDataCounts, y3.size()));
+                    }
+                    List<String> y4 = yesterResult.get(PollutionEnum.dataWaterNtu.getCode());
+                    if (y4 != null) {
+                        ntuDatas.addAll(y4.subList(yesterDataCounts, y4.size()));
+                    }
+                    List<String> y5 = yesterResult.get(PollutionEnum.dataWaterDo.getCode());
+                    if (y5 != null) {
+                        doDatas.addAll(y5.subList(yesterDataCounts, y5.size()));
+                    }
+                    timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts, yesterData.getIndexs().size()));
                 }
-                List<String> y2= yesterResult.get(PollutionEnum.dataWaterPh.getCode());
-                if(y2!=null){
-                    phDatas.addAll(y2.subList(yesterDataCounts,y2.size()));
-                }
-                List<String> y3 = yesterResult.get(PollutionEnum.dataWaterDdl.getCode());
-                if(y3!=null){
-                    ddlDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
-                }
-                List<String> y4 = yesterResult.get(PollutionEnum.dataWaterNtu.getCode());
-                if(y4!=null) {
-                    ntuDatas.addAll(y4.subList(yesterDataCounts,y4.size()));
-                }
-                List<String> y5 =  yesterResult.get(PollutionEnum.dataWaterDo.getCode());
-                if(y5!=null){
-                    doDatas.addAll(y5.subList(yesterDataCounts,y5.size()));
-                }
-                timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts,yesterData.getIndexs().size()));
             }
         } else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())){//检查是否是本年
             if(nowDay.format(yeardtf).equals(startTime)){//如果查询是本年，再查询一次去年，拼接为12个月