ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

北京暂降平台调整

Browse Source
This commit is contained in:
cdf
2025-08-13 11:02:03 +08:00
parent c91b3bdc51
commit a35ee521b6
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java
View File

@@ -46,4 +46,6 @@ public class LargeScreenCountParam extends BaseParam {
private List<String> eventIds; private List<String> eventIds;
private Integer gdIndex; private Integer gdIndex;
private String devName;
} }

24
event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
View File

@@ -1190,8 +1190,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
if(StrUtil.isNotBlank(largeScreenCountParam.getState())){ if(StrUtil.isNotBlank(largeScreenCountParam.getState())){
lambdaQueryWrapper.eq(PqDevice::getStatus,Integer.valueOf(largeScreenCountParam.getState())); lambdaQueryWrapper.eq(PqDevice::getStatus,Integer.valueOf(largeScreenCountParam.getState()));
} }
if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){ if(StrUtil.isNotBlank(largeScreenCountParam.getDevName())){
lambdaQueryWrapper.eq(StrUtil.isNotEmpty(largeScreenCountParam.getSearchValue()),PqDevice::getName,largeScreenCountParam.getSearchValue()); lambdaQueryWrapper.like(StrUtil.isNotEmpty(largeScreenCountParam.getDevName()),PqDevice::getName,largeScreenCountParam.getDevName());
} }
lambdaQueryWrapper.in(PqDevice::getDevIndex, devIndexs); lambdaQueryWrapper.in(PqDevice::getDevIndex, devIndexs);
@@ -1199,24 +1199,20 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
log.info("完成设备查询sql："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); log.info("完成设备查询sql："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s");
List<Integer> runDevList = pqDeviceList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList()); List<Integer> runDevList = pqDeviceList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList());
if(CollUtil.isEmpty(runDevList)){
return new Page<>();
}
List<PqsDicData> pqsDicDataList = pqsDicDataMapper.selectList(new LambdaQueryWrapper<PqsDicData>().eq(PqsDicData::getDicType,"cbb2de8a-87da-4ae9-a35c-aaab999c7bc7")); List<PqsDicData> pqsDicDataList = pqsDicDataMapper.selectList(new LambdaQueryWrapper<PqsDicData>().eq(PqsDicData::getDicType,"cbb2de8a-87da-4ae9-a35c-aaab999c7bc7"));
Map<String,PqsDicData> pqsDicDataMap = pqsDicDataList.stream().collect(Collectors.toMap(PqsDicData::getDicIndex,Function.identity())); Map<String,PqsDicData> pqsDicDataMap = pqsDicDataList.stream().collect(Collectors.toMap(PqsDicData::getDicIndex,Function.identity()));
List<Long> gdList = new ArrayList<>();
List<Integer> bdList = new ArrayList<>(); List<Integer> bdList = new ArrayList<>();
if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){ if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){
List<PqGdCompany> pqGdCompanyList = pqGdCompanyMapper.selectList(new LambdaQueryWrapper<PqGdCompany>().like(PqGdCompany::getName,largeScreenCountParam.getSearchValue()));
gdList = pqGdCompanyList.stream().map(PqGdCompany::getGdIndex).collect(Collectors.toList());
List<PqSubstation> substationList = pqSubstationMapper.selectList(new LambdaQueryWrapper<PqSubstation>().like(PqSubstation::getName,largeScreenCountParam.getSearchValue())); List<PqSubstation> substationList = pqSubstationMapper.selectList(new LambdaQueryWrapper<PqSubstation>().like(PqSubstation::getName,largeScreenCountParam.getSearchValue()));
bdList = substationList.stream().map(PqSubstation::getSubIndex).collect(Collectors.toList()); bdList = substationList.stream().map(PqSubstation::getSubIndex).collect(Collectors.toList());
} }
if(CollUtil.isNotEmpty(runDevList)||CollUtil.isNotEmpty(gdList)||CollUtil.isNotEmpty(bdList)){
return new Page<>(); Page<PqDevice> page = pqDeviceService.lambdaQuery().in(CollUtil.isNotEmpty(bdList),PqDevice::getSubIndex,bdList)
}
Page<PqDevice> page = pqDeviceService.lambdaQuery().in(PqDevice::getGdIndex,gdList).in(PqDevice::getSubIndex,bdList)
.in(PqDevice::getDevIndex,runDevList).page(new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam))); .in(PqDevice::getDevIndex,runDevList).page(new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam)));
log.info("完成设备部门查询："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s"); log.info("完成设备部门查询："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s");
// pqsEventdetailPage = pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),runDevList); // pqsEventdetailPage = pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),runDevList);
@@ -1293,7 +1289,9 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
dto.setLogonTime(pqDevice.getLogontime()); dto.setLogonTime(pqDevice.getLogontime());
dto.setDeptName(pqLineMap.get(pqDevice.getDevIndex()).get(0).getDeptName()); dto.setDeptName(pqLineMap.get(pqDevice.getDevIndex()).get(0).getDeptName());
dto.setManufacturerName(pqsDicDataMap.get(pqDeviceDetail.getManufacturer()).getDicName()); if(pqsDicDataMap.containsKey(pqDeviceDetail.getManufacturer())){
dto.setManufacturerName(pqsDicDataMap.get(pqDeviceDetail.getManufacturer()).getDicName());
}
result.add(dto); result.add(dto);
} }