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

暂降事件查询

Browse Source
This commit is contained in:
huangzj
2023-08-31 13:58:57 +08:00
parent b9af2a4e85
commit 338735b132
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
View File

@@ -262,9 +262,10 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
// } // }
/*如何为空前端没传，查询所有*/ /*如何为空前端没传，查询所有*/
List<String> device = new ArrayList<>(); List<String> device = new ArrayList<>();
device = roleEngineerDevService.getDevice();
if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){ if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){
List<String> roleengineer = roleEngineerDevService.getRoleengineer(); List<String> roleengineer = roleEngineerDevService.getRoleengineer();
device = roleEngineerDevService.getDevice();
appProjectQueryParm.setEngineeringIds(roleengineer); appProjectQueryParm.setEngineeringIds(roleengineer);
if(CollectionUtils.isEmpty(roleengineer)){ if(CollectionUtils.isEmpty(roleengineer)){

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

@@ -51,7 +51,7 @@ public class TemperatureServiceImpl implements TemperatureService {
} }
List<StatisticalDataDTO> topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env"); List<StatisticalDataDTO> topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env");
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());