|
|
@ -63,7 +63,7 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon |
|
|
|
//1.查询用户与党员数据,判断dimId是否为昨天,如果根据这个dimId没有查询出结果,则取前天的数据
|
|
|
|
//如果还是查不出数据,继续向下执行,这部分数据设置默认值
|
|
|
|
|
|
|
|
//注册用户数
|
|
|
|
//注册用户数 fact_reg_user_grid_daily 或 fact_reg_user_agency_daily agency级别
|
|
|
|
List<ScreenUserTotalDataEntity> result = |
|
|
|
factRegUserGridDailyDao.selectUserAndPartymemberByOrgLevel(ORG_LEVEL_AGENCY,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(result)){ |
|
|
@ -72,6 +72,7 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon |
|
|
|
} |
|
|
|
if(null == result) result = new LinkedList<>(); |
|
|
|
} |
|
|
|
// 网格级别
|
|
|
|
List<ScreenUserTotalDataEntity> gridUserResult = |
|
|
|
factRegUserGridDailyDao.selectUserAndPartymemberByOrgLevel(ORG_LEVEL_GRID,customerId,dimId); |
|
|
|
|
|
|
@ -84,13 +85,14 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon |
|
|
|
result.addAll(gridUserResult); |
|
|
|
} |
|
|
|
|
|
|
|
//2.组
|
|
|
|
//2.组 fact_group_grid_daily 或 fact_group_agency_daily
|
|
|
|
List<ScreenUserTotalDataEntity> agencyGroup = factGroupGridDailyDao.selectGroupCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(agencyGroup)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
|
agencyGroup = factGroupGridDailyDao.selectGroupCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,DateUtils.getBeforeNDay(NumConstant.TWO)); |
|
|
|
} |
|
|
|
} |
|
|
|
// 网格级别
|
|
|
|
List<ScreenUserTotalDataEntity> gridGroup = factGroupGridDailyDao.selectGroupCountByOrgLevel(ORG_LEVEL_GRID,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(gridGroup)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
@ -101,13 +103,14 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon |
|
|
|
groupMap.putAll(gridGroup.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getGroupTotal))); |
|
|
|
|
|
|
|
|
|
|
|
//3.话题
|
|
|
|
//3.话题 fact_topic_total_grid_daily或fact_topic_total_agency_daily
|
|
|
|
List<ScreenUserTotalDataEntity> agencyTopic = factTopicTotalGridDailyDao.selectTopicCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(agencyTopic)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
|
agencyTopic = factTopicTotalGridDailyDao.selectTopicCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,DateUtils.getBeforeNDay(NumConstant.TWO)); |
|
|
|
} |
|
|
|
} |
|
|
|
// 网格级别
|
|
|
|
List<ScreenUserTotalDataEntity> gridTopic = factTopicTotalGridDailyDao.selectTopicCountByOrgLevel(ORG_LEVEL_GRID,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(gridTopic)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
@ -117,13 +120,14 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon |
|
|
|
Map<String,Integer> topicMap = agencyTopic.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getTopicTotal)); |
|
|
|
topicMap.putAll(gridTopic.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getTopicTotal))); |
|
|
|
|
|
|
|
//4.议题
|
|
|
|
//4.议题 fact_issue_grid_daily 或 fact_issue_agency_daily
|
|
|
|
List<ScreenUserTotalDataEntity> agencyIssue = factIssueGridDailyDao.selectIssueCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(agencyIssue)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
|
agencyIssue = factIssueGridDailyDao.selectIssueCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,DateUtils.getBeforeNDay(NumConstant.TWO)); |
|
|
|
} |
|
|
|
} |
|
|
|
// 网格级别
|
|
|
|
List<ScreenUserTotalDataEntity> gridIssue = factIssueGridDailyDao.selectIssueCountByOrgLevel(ORG_LEVEL_GRID,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(gridIssue)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
@ -133,13 +137,14 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon |
|
|
|
Map<String,Integer> issueMap = agencyIssue.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getIssueTotal)); |
|
|
|
issueMap.putAll(gridIssue.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getIssueTotal))); |
|
|
|
|
|
|
|
//5.项目
|
|
|
|
//5.项目 fact_grid_project_daily 或 fact_agency_project_daily
|
|
|
|
List<ScreenUserTotalDataEntity> agencyProject = factAgencyProjectDailyDao.selectProjectCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(agencyProject)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
|
agencyProject = factAgencyProjectDailyDao.selectProjectCountByOrgLevel(ORG_LEVEL_AGENCY,customerId,DateUtils.getBeforeNDay(NumConstant.TWO)); |
|
|
|
} |
|
|
|
} |
|
|
|
// 网格级别
|
|
|
|
List<ScreenUserTotalDataEntity> gridProject = factAgencyProjectDailyDao.selectProjectCountByOrgLevel(ORG_LEVEL_GRID,customerId,dimId); |
|
|
|
if(CollectionUtils.isEmpty(gridProject)){ |
|
|
|
if(DateUtils.getBeforeNDay(NumConstant.ONE).equals(dimId)){ |
|
|
|