统计次数修改

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

@@ -592,19 +592,21 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//向上级机关递归添加 数据
 		Map<String, FactTagUsedAgencyDailyEntity> finalTagUsedAgencyDailyMap = new HashMap<>();
 		finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailyMap);
-		for (Map.Entry<String, FactTagUsedAgencyDailyEntity> entry : tagUsedAgencyDailyMap.entrySet()) {
-			String agencyId = entry.getKey().split(StrConstant.UNDER_LINE)[0];
-			FactTagUsedAgencyDailyEntity currentEntity = entry.getValue();
-			DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(currentEntity.getAgencyId());
+		List<FactTagUsedAgencyDailyEntity> agencyDailyEntities = tagUsedAgencyDailyMap.values().stream().filter(uesedTag -> uesedTag.getUsedCount() > 0).collect(Collectors.toList());
+		log.debug("===tagUsedAgencyDailyMap:"+JSON.toJSONString(tagUsedAgencyDailyMap.values().stream().filter(o->o.getUsedCount()>0).collect(Collectors.toList())));
+		for (FactTagUsedAgencyDailyEntity entry : agencyDailyEntities) {
+			DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(entry.getAgencyId());
 			if (dimAgencyEntity == null) {
-				log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", agencyId);
+				log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", entry.getAgencyId());
 				continue;
 			}
-			setTagUsedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, currentEntity, dimIdBean);
+			setTagUsedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, entry, dimIdBean);
 		}
+		log.debug("===finalTagUsedAgencyDailyMap:"+JSON.toJSONString(finalTagUsedAgencyDailyMap.values().stream().filter(o->o.getUsedCount()>0).collect(Collectors.toList())));
 		if (!CollectionUtils.isEmpty(tagUsedAgencyDailySelfMap)) {
 			finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailySelfMap);
 		}
+		log.debug("===finalTagUsedAgencyDailyMap:"+JSON.toJSONString(finalTagUsedAgencyDailyMap.values().stream().filter(o->o.getUsedCount()>0).collect(Collectors.toList())));
 		factTagUsedAgencyDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), finalTagUsedAgencyDailyMap.values());
 
 	}
@@ -745,15 +747,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//向上级机关递归添加 数据
 		Map<String, FactTagViewedAgencyDailyEntity> finalTagUsedAgencyDailyMap = new HashMap<>();
 		finalTagUsedAgencyDailyMap.putAll(tagViewedAgencyDailyMap);
-		for (Map.Entry<String, FactTagViewedAgencyDailyEntity> entry : tagViewedAgencyDailyMap.entrySet()) {
-			String agencyId = entry.getKey();
-			FactTagViewedAgencyDailyEntity currentEntity = entry.getValue();
-			DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(currentEntity.getAgencyId());
+		List<FactTagViewedAgencyDailyEntity> tagViewedList = tagViewedAgencyDailyMap.values().stream().filter(tagViewed -> tagViewed.getTagReadCount() > 0).collect(Collectors.toList());
+		for (FactTagViewedAgencyDailyEntity entry : tagViewedList) {
+			DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(entry.getAgencyId());
 			if (dimAgencyEntity == null) {
-				log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", agencyId);
+				log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", entry.getAgencyId());
 				continue;
 			}
-			setTagViewedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, currentEntity, dimIdBean);
+			setTagViewedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, entry, dimIdBean);
 		}
 		if (!CollectionUtils.isEmpty(tagViewedAgencyDailySelfMap)) {
 			finalTagUsedAgencyDailyMap.putAll(tagViewedAgencyDailySelfMap);