diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java index 0496dd785..f2b3da647 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java @@ -54,6 +54,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -131,8 +132,8 @@ public class CarryCapacityServiceImpl implements CarryCapacityService { CollectionUtil.isEmpty(dataHarmPowerQ2List) || CollectionUtil.isEmpty(dataHarmPowerU2List)) { CarryCapacityDataPO one = carryCapacityDataPOService.lambdaQuery().eq(CarryCapacityDataPO::getLineId, lineId) - .eq(CarryCapacityDataPO::getStartTime, startTime) - .eq(CarryCapacityDataPO::getEndTime, endTime).one(); + .eq(CarryCapacityDataPO::getStartTime, queryParam.getStartTime()) + .eq(CarryCapacityDataPO::getEndTime, queryParam.getEndTime()).one(); if (Objects.nonNull(one)) { //todo 调用查询文件 InputStream fileStream = fileStorageUtil.getFileStream(one.getDateList()); @@ -389,6 +390,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService { List iList = dataI.stream().map(temp -> { CarryCapcityData carryCapcityData = new CarryCapcityData(); BeanUtils.copyProperties(temp, carryCapcityData); + carryCapcityData.setTime(temp.getTime().plusMillis(TimeUnit.HOURS.toMillis(8))); carryCapcityData.setValue(temp.getI2()); return carryCapcityData; }).collect(Collectors.toList()); @@ -407,6 +409,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService { List iList = dataI.stream().map(temp -> { CarryCapcityData carryCapcityData = new CarryCapcityData(); BeanUtils.copyProperties(temp, carryCapcityData); + carryCapcityData.setTime(temp.getTime().plusMillis(TimeUnit.HOURS.toMillis(8))); carryCapcityData.setValue(Utils.getAttributeValueByPropertyName(temp, "i" + queryParam.getTime())); return carryCapcityData; }).collect(Collectors.toList());