Merge branch 'dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -137,11 +137,14 @@ public class DataReportingServiceImpl implements DataReportingService {
 	public List<EventInfoResultDTO> getEventInfo(EventInfoFormDTO formDTO) {
 		List<EventInfoResultDTO> list;
 		//根据入参，获取项目
+		long start = System.currentTimeMillis();
 		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
+		log.error("事件上报-查询项目列表耗时:{}ms",System.currentTimeMillis()-start + "\n项目数:" + formDTO.getProjectId().size());
 		//项目列表为空，返回空数组
 		if(CollectionUtils.isEmpty(projectList)) {
 			return Collections.emptyList();
 		}
+		start = System.currentTimeMillis();
 		Map<String, CustomerProjectCategoryDictEntity> epmetCodeMap = new HashMap<>();
 		Result<String> parentCustomer =  operCrmOpenFeignClient.getExternalAndParentCustomerId(formDTO.getCustomerId());
 		if (StringUtils.isNotBlank(parentCustomer.getData())) {
@@ -194,6 +197,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 				return dto;
 			}).collect(Collectors.toList());
 		}
+		log.error("事件上报-组装数据耗时:{}ms",System.currentTimeMillis()-start);
 		return list.stream().collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(EventInfoResultDTO::getId))), ArrayList::new));
 	}