Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改

Browse Source
This commit is contained in:
hzj
2024-12-10 13:31:28 +08:00
parent a122df4763
commit 840c48e136
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java
View File

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