Commit 20c72e29 authored by suhuiguang's avatar suhuiguang

1.三库建设大屏接口自测,性能优化

parent 79ea13d8
...@@ -3695,22 +3695,34 @@ public class JGDPStatisticsServiceImpl { ...@@ -3695,22 +3695,34 @@ public class JGDPStatisticsServiceImpl {
} }
public Map<String, Object> querySkjsDetail(DPFilterParamDto dpFilterParamDto) { public Map<String, Object> querySkjsDetail(DPFilterParamDto dpFilterParamDto) {
String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamDto);
List<RegionModel> regionModels = stCommonService.setRegionIfRootParentAndNoAccessIf3Level(dpFilterParamDto);
if (orgCodeP == null || regionModels.isEmpty()) {
return this.getDefaultSkjsDetail();
}
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
// 设备上线情况 // 设备上线情况
result.put("equipOnLineInfo", this.getEquipOnLineInfo(dpFilterParamDto)); result.put("equipOnLineInfo", this.getEquipOnLineInfo(regionModels));
// 企业上线情况 // 企业上线情况
result.put("companyOnLineInfo", this.getCompanyOnLineInfo(dpFilterParamDto)); result.put("companyOnLineInfo", this.getCompanyOnLineInfo(regionModels));
// 人员上线情况 // 人员上线情况
result.put("userOnLineInfo", this.getUserOnLineInfo(dpFilterParamDto)); result.put("userOnLineInfo", this.getUserOnLineInfo(regionModels));
return result; return result;
} }
private Object getEquipOnLineInfo(DPFilterParamDto dpFilterParamDto) { private Map<String, Object> getDefaultSkjsDetail() {
List<RegionModel> regionModels = stCommonService.setRegionIfRootParentAndNoAccessIf3Level(dpFilterParamDto); Map<String, Object> result = new HashMap<>();
String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamDto); // 设备上线情况
if (orgCodeP == null) { result.put("equipOnLineInfo", new ArrayList<>());
return new ArrayList<>(); // 企业上线情况
} result.put("companyOnLineInfo", new ArrayList<>());
// 人员上线情况
result.put("userOnLineInfo", new ArrayList<>());
return result;
}
private Object getEquipOnLineInfo(List<RegionModel> regionModels) {
// 多线程处理 // 多线程处理
Map<String, SkjsEquipCountItemDto> countItemMap = regionModels.parallelStream().map(r -> { Map<String, SkjsEquipCountItemDto> countItemMap = regionModels.parallelStream().map(r -> {
String regionCode = r.getRegionCode().toString(); String regionCode = r.getRegionCode().toString();
...@@ -3746,12 +3758,7 @@ public class JGDPStatisticsServiceImpl { ...@@ -3746,12 +3758,7 @@ public class JGDPStatisticsServiceImpl {
return countItemDtos; return countItemDtos;
} }
private Object getCompanyOnLineInfo(DPFilterParamDto dpFilterParamDto) { private Object getCompanyOnLineInfo(List<RegionModel> regionModels) {
List<RegionModel> regionModels = stCommonService.setRegionIfRootParentAndNoAccessIf3Level(dpFilterParamDto);
String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamDto);
if (orgCodeP == null) {
return new ArrayList<>();
}
// 多线程处理 // 多线程处理
Map<String, SkjsCompanyCountItemDto> companyCountItemDtoMap = regionModels.parallelStream().map(r -> { Map<String, SkjsCompanyCountItemDto> companyCountItemDtoMap = regionModels.parallelStream().map(r -> {
String regionCode = r.getRegionCode().toString(); String regionCode = r.getRegionCode().toString();
...@@ -3786,12 +3793,7 @@ public class JGDPStatisticsServiceImpl { ...@@ -3786,12 +3793,7 @@ public class JGDPStatisticsServiceImpl {
} }
private Object getUserOnLineInfo(DPFilterParamDto dpFilterParamDto) { private Object getUserOnLineInfo(List<RegionModel> regionModels) {
List<RegionModel> regionModels = stCommonService.setRegionIfRootParentAndNoAccessIf3Level(dpFilterParamDto);
String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamDto);
if (orgCodeP == null) {
return new ArrayList<>();
}
// 多线程处理 // 多线程处理
Map<String, SkjsUserCountItemDto> userCountItemDtoMap = regionModels.parallelStream().map(r -> { Map<String, SkjsUserCountItemDto> userCountItemDtoMap = regionModels.parallelStream().map(r -> {
String regionCode = r.getRegionCode().toString(); String regionCode = r.getRegionCode().toString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment