Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug调整

Browse Source
This commit is contained in:
xy
2024-08-28 16:19:43 +08:00
parent be0d133d47
commit eeb9c787c6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java
View File

@@ -17,10 +17,8 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.time.Instant;
import java.util.List; import java.util.*;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -50,12 +48,16 @@ public class TemperatureServiceImpl implements TemperatureService {
throw new BusinessException("不存在输出侧监测点，无温度信息"); throw new BusinessException("不存在输出侧监测点，无温度信息");
} }
List<StatisticalDataDTO> topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env",data1.get(0).getProcess()+""); List<StatisticalDataDTO> topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env",data1.get(0).getProcess()+"");
Instant time = topTemperature.stream().max(Comparator.comparing(StatisticalDataDTO::getTime)).get().getTime();
List<StatisticalDataDTO> result = new ArrayList<>(); List<StatisticalDataDTO> result = new ArrayList<>();
for(int i = 0; i <=moduleNumber; i++){ for(int i = 0; i <=moduleNumber; i++){
StatisticalDataDTO statisticalData = new StatisticalDataDTO(); StatisticalDataDTO statisticalData = new StatisticalDataDTO();
int finalI = i; int finalI = i;
StatisticalDataDTO statisticalDataDTO = topTemperature.stream().filter(tem -> Objects.equals(tem.getClDid(), finalI + "")).findFirst().orElse(new StatisticalDataDTO()); StatisticalDataDTO statisticalDataDTO = topTemperature.stream().filter(tem -> Objects.equals(tem.getClDid(), finalI + "")).findFirst().orElse(new StatisticalDataDTO());
statisticalDataDTO.setClDid(finalI+""); statisticalDataDTO.setClDid(finalI+"");
if (!Objects.equals(time,statisticalDataDTO.getTime())) {
statisticalDataDTO.setValue(null);
}
result.add(statisticalDataDTO); result.add(statisticalDataDTO);
} }
return result; return result;