elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev

dev_shibei_match
jianjun 5 years ago
parent
9f31710670 722987fa2b
commit
641bd6b7e9
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
View File

@ -465,7 +465,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//构建机关自己的数据 //构建机关自己的数据
FactArticlePublishedAgencyDailyEntity selfDaily = ConvertUtils.sourceToTarget(dimIdBean, FactArticlePublishedAgencyDailyEntity.class); FactArticlePublishedAgencyDailyEntity selfDaily = ConvertUtils.sourceToTarget(dimIdBean, FactArticlePublishedAgencyDailyEntity.class);
selfDaily.setCustomerId(gridDailyEntities.getCustomerId()); selfDaily.setCustomerId(gridDailyEntities.getCustomerId());
selfDaily.setPid(gridDailyEntities.getPid()); selfDaily.setPid(summaryDTO.getAgencyId());
selfDaily.setAgencyId(summaryDTO.getAgencyId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX)); selfDaily.setAgencyId(summaryDTO.getAgencyId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX));
selfDaily.setArticleTotalCount(summaryDTO.getArticleTotalCount()); selfDaily.setArticleTotalCount(summaryDTO.getArticleTotalCount());
selfDaily.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); selfDaily.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
@ -571,7 +571,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
convertTagUsedDepartmentDailyEntity(tagUsedDeptDailyMap, articleEntity, tagEntity, dimIdBean); convertTagUsedDepartmentDailyEntity(tagUsedDeptDailyMap, articleEntity, tagEntity, dimIdBean);
break; break;
case ProjectConstant.PUBLISHER_TYPE_AGENCY: case ProjectConstant.PUBLISHER_TYPE_AGENCY:
convertTagUsedAgencyDailySelfEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean); convertTagUsedAgencyDailySelfEntity( tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean);
break; break;
} }
} }
@ -1048,14 +1048,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
} }
} }
private void convertTagUsedAgencyDailySelfEntity(String pid, Map<String, FactTagUsedAgencyDailyEntity> result, ArticleEntity articleEntity, ArticleTagsEntity tagEntity, DimIdGenerator.DimIdBean dimIdBean) { private void convertTagUsedAgencyDailySelfEntity(Map<String, FactTagUsedAgencyDailyEntity> result, ArticleEntity articleEntity, ArticleTagsEntity tagEntity, DimIdGenerator.DimIdBean dimIdBean) {
String agencyId = articleEntity.getOrgId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX); String agencyId = articleEntity.getOrgId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX);
String tagId = tagEntity.getTagId(); String tagId = tagEntity.getTagId();
String key = agencyId.concat(StrConstant.UNDER_LINE).concat(tagId); String key = agencyId.concat(StrConstant.UNDER_LINE).concat(tagId);
FactTagUsedAgencyDailyEntity entity = result.get(key); FactTagUsedAgencyDailyEntity entity = result.get(key);
if (entity == null) { if (entity == null) {
entity = ConvertUtils.sourceToTarget(dimIdBean, FactTagUsedAgencyDailyEntity.class); entity = ConvertUtils.sourceToTarget(dimIdBean, FactTagUsedAgencyDailyEntity.class);
entity.setPid(pid); entity.setPid(articleEntity.getOrgId());
entity.setCustomerId(articleEntity.getCustomerId()); entity.setCustomerId(articleEntity.getCustomerId());
entity.setAgencyId(agencyId); entity.setAgencyId(agencyId);
entity.setTagId(tagId); entity.setTagId(tagId);
@ -1118,7 +1118,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
FactTagViewedAgencyDailyEntity entity = result.get(key); FactTagViewedAgencyDailyEntity entity = result.get(key);
if (entity == null) { if (entity == null) {
entity = ConvertUtils.sourceToTarget(dimIdBean, FactTagViewedAgencyDailyEntity.class); entity = ConvertUtils.sourceToTarget(dimIdBean, FactTagViewedAgencyDailyEntity.class);
entity.setPid(dimAgencyEntity.getPid()); entity.setPid(dimAgencyEntity.getId());
entity.setCustomerId(tagEntity.getCustomerId()); entity.setCustomerId(tagEntity.getCustomerId());
entity.setAgencyId(agencyId); entity.setAgencyId(agencyId);
entity.setTagId(tagId); entity.setTagId(tagId);

Write Preview
Loading…
Cancel
Save