Merge branch 'master' of https://git.zanxiangnet.com/cxyu/DataMonitoring

flink-ad-monitoring/src/main/java/flink/zanxiangnet/ad/monitoring/pojo/entity/PlanStatOfDayDWD.java

@@ -1137,9 +1137,9 @@ public class PlanStatOfDayDWD implements Serializable {
             result.setAdGroupMap(value1.getAdGroupMap());
             result.setAdIds(value1.getAdIds());
             result.getAdGroupMap().computeIfAbsent(value2.getAdgroupId(), key -> new HashSet<>(3)).add(value2.getAdId());
-            result.setAdGroupMapStr(PlanUtil.adGroupMapStr(value1.getAdGroupMap()));
+            result.setAdGroupMapStr(PlanUtil.adGroupMapStr(result.getAdGroupMap()));
             result.getAdIds().add(value2.getAdId());
-            result.setAdIdsStr(PlanUtil.adIdsStr(value1.getAdIds()));
+            result.setAdIdsStr(PlanUtil.adIdsStr(result.getAdIds()));
 
             result.setCostDeviationRateTotal(value1.getCostDeviationRateTotal() + value2.getCostDeviationRate());
             result.setCostDeviationRateDay(value2.getCostDeviationRate());

flink-ad-monitoring/src/main/java/flink/zanxiangnet/ad/monitoring/pojo/entity/PlanStatOfHourDWD.java

@@ -1420,10 +1420,12 @@ public class PlanStatOfHourDWD {
             result.setNoInterestCountDay(value2.getNoInterestCount());
             result.setNoInterestCountHour(value2.getNoInterestCount());
         } else {
-            value1.getAdGroupMap().computeIfAbsent(value2.getAdgroupId(), key -> new HashSet<>(3)).add(value2.getAdId());
-            value1.setAdGroupMapStr(PlanUtil.adGroupMapStr(value1.getAdGroupMap()));
-            value1.getAdIds().add(value2.getAdId());
-            value1.setAdIdsStr(PlanUtil.adIdsStr(value1.getAdIds()));
+            result.setAdGroupMap(value1.getAdGroupMap());
+            result.setAdIds(value1.getAdIds());
+            result.getAdGroupMap().computeIfAbsent(value2.getAdgroupId(), key -> new HashSet<>(3)).add(value2.getAdId());
+            result.setAdGroupMapStr(PlanUtil.adGroupMapStr(result.getAdGroupMap()));
+            result.getAdIds().add(value2.getAdId());
+            result.setAdIdsStr(PlanUtil.adIdsStr(result.getAdIds()));
 
             // 是否是同一天
             boolean isUnSameDay = !value1.getStatDay().equals(value2.getStatDay());