From a7d002c6795752d8b5bb4a8fa229c75be47c49e1 Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Thu, 7 May 2026 11:32:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=86=B7=E9=87=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=90=E4=BA=94=E5=88=86=E9=92=9F=E5=AD=98=E5=82=A8=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=EF=BC=9B=202=E3=80=81=E5=A4=A9=E6=B0=94=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9C=80=E9=AB=98=E6=B9=BF=E5=BA=A6=E6=9C=80=E4=BD=8E?= =?UTF-8?q?=E6=B9=BF=E5=BA=A6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mh/common/core/domain/dto/WeatherDataDTO.java | 9 +++++++++ .../framework/dealdata/impl/DataProcessServiceImpl.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mh-common/src/main/java/com/mh/common/core/domain/dto/WeatherDataDTO.java b/mh-common/src/main/java/com/mh/common/core/domain/dto/WeatherDataDTO.java index 589f442..2138bbb 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/dto/WeatherDataDTO.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/dto/WeatherDataDTO.java @@ -33,6 +33,15 @@ public class WeatherDataDTO { */ private String minTemp; + /** + * 最高湿度 + */ + private String maxHumidity; + /** + * 最低湿度 + */ + private String minHumidity; + /** * 天气 */ diff --git a/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java b/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java index 3269b1d..b181f86 100644 --- a/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java +++ b/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java @@ -570,7 +570,7 @@ public class DataProcessServiceImpl implements DataProcessService { private Map> dealAndInsertChillers(List dataList, String mtType) { // 格式化时间点，然后取同样时间点的最大值 Map> collect = dataList.stream() - .peek(val -> val.setCurTime(DateUtils.stringToDate(DateUtils.getTimeMin(val.getCurTime(), 1), "yyyy-MM-dd HH:mm:ss"))) + .peek(val -> val.setCurTime(DateUtils.stringToDate(DateUtils.getTimeMin(val.getCurTime(), 5), "yyyy-MM-dd HH:mm:ss"))) .collect( Collectors.groupingBy( CollectionParamsManage::getCurTime,