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,