|
@@ -76,6 +76,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<ProjectEERDataVo> getProjectEERDataList(List<String> pjIdList, String groupCode, Date reportDate) {
|
|
public List<ProjectEERDataVo> getProjectEERDataList(List<String> pjIdList, String groupCode, Date reportDate) {
|
|
|
|
+ log.info("项目列表:"+pjIdList+"查询EER数据开始");
|
|
if (CollectionUtils.isEmpty(pjIdList) || StringUtils.isEmpty(groupCode) || null == reportDate) {
|
|
if (CollectionUtils.isEmpty(pjIdList) || StringUtils.isEmpty(groupCode) || null == reportDate) {
|
|
log.info("查询ProjectEERDataVo时参数为空,故不进行查询");
|
|
log.info("查询ProjectEERDataVo时参数为空,故不进行查询");
|
|
return new ArrayList<>();
|
|
return new ArrayList<>();
|
|
@@ -131,6 +132,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.error("计算ProjectEERDataVo异常:", e);
|
|
log.error("计算ProjectEERDataVo异常:", e);
|
|
}
|
|
}
|
|
|
|
+ log.info("项目列表:"+pjIdList+"查询EER数据结束"+"结果列表:"+resultList);
|
|
return resultList;
|
|
return resultList;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -156,6 +158,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
|
|
|
|
|
|
private TreeMap<Date, Double> getDayCountData(String pjId, String groupCode, Date reportDate, String infoCode, List<String> classCodeList, List<Date> dateList) {
|
|
private TreeMap<Date, Double> getDayCountData(String pjId, String groupCode, Date reportDate, String infoCode, List<String> classCodeList, List<Date> dateList) {
|
|
List<String> objectIdList = getObjectIdList(pjId, groupCode, classCodeList);
|
|
List<String> objectIdList = getObjectIdList(pjId, groupCode, classCodeList);
|
|
|
|
+ log.info("项目:"+pjId+"对象id:"+objectIdList);
|
|
if (!CollectionUtils.isEmpty(objectIdList)) {
|
|
if (!CollectionUtils.isEmpty(objectIdList)) {
|
|
return getInfoCodePeriodDataCountMap(pjId, groupCode, objectIdList, reportDate, infoCode, "1d",dateList);
|
|
return getInfoCodePeriodDataCountMap(pjId, groupCode, objectIdList, reportDate, infoCode, "1d",dateList);
|
|
}
|
|
}
|
|
@@ -189,6 +192,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
|
|
}
|
|
}
|
|
|
|
|
|
private TreeMap<Date, Double> getInfoCodePeriodDataCountMap(String pjId, String groupCode, List<String> objectIdList, Date reportDate, String infoCode, String period, List<Date> dateList) {
|
|
private TreeMap<Date, Double> getInfoCodePeriodDataCountMap(String pjId, String groupCode, List<String> objectIdList, Date reportDate, String infoCode, String period, List<Date> dateList) {
|
|
|
|
+ log.info("项目:"+pjId+"infoCod:"+infoCode+"查询数据列表开始");
|
|
if (StringUtils.isEmpty(pjId) || StringUtils.isEmpty(groupCode) || CollectionUtils.isEmpty(objectIdList) || null == reportDate) {
|
|
if (StringUtils.isEmpty(pjId) || StringUtils.isEmpty(groupCode) || CollectionUtils.isEmpty(objectIdList) || null == reportDate) {
|
|
log.info("查询历史数据时参数为空,故不进行查询");
|
|
log.info("查询历史数据时参数为空,故不进行查询");
|
|
return new TreeMap<>();
|
|
return new TreeMap<>();
|
|
@@ -216,6 +220,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
|
|
batchQueryPeriodDataDTO.setCriterias(criteriasObjDTOList);
|
|
batchQueryPeriodDataDTO.setCriterias(criteriasObjDTOList);
|
|
PoemsFeignResponse<PoemsFeignResponse<PeriodDataInfoVO>> response = centerMiddlewareWebClient.getPeriodDataInfo(batchQueryPeriodDataDTO);
|
|
PoemsFeignResponse<PoemsFeignResponse<PeriodDataInfoVO>> response = centerMiddlewareWebClient.getPeriodDataInfo(batchQueryPeriodDataDTO);
|
|
List<PoemsFeignResponse<PeriodDataInfoVO>> responseList = response.getContent();
|
|
List<PoemsFeignResponse<PeriodDataInfoVO>> responseList = response.getContent();
|
|
|
|
+ log.info("项目:"+pjId+"infoCod:"+infoCode+"数据列表:"+responseList);
|
|
if (!CollectionUtils.isEmpty(responseList)) {
|
|
if (!CollectionUtils.isEmpty(responseList)) {
|
|
for (PoemsFeignResponse<PeriodDataInfoVO> responseVo : responseList) {
|
|
for (PoemsFeignResponse<PeriodDataInfoVO> responseVo : responseList) {
|
|
List<PeriodDataInfoVO> periodDataInfoVOList = responseVo.getContent();
|
|
List<PeriodDataInfoVO> periodDataInfoVOList = responseVo.getContent();
|
|
@@ -249,6 +254,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.error("查询中台对象信息时异常:", e);
|
|
log.error("查询中台对象信息时异常:", e);
|
|
}
|
|
}
|
|
|
|
+ log.info("项目:"+pjId+"infoCod:"+infoCode+"查询数据列表结束"+"结果:"+dataMap);
|
|
return dataMap;
|
|
return dataMap;
|
|
}
|
|
}
|
|
|
|
|