Skip to content

张云鹏 / moss-statistic

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 9d6228fa 9d6228fad4c056a93b252ea8480b2d7afe9be3d8 by 张云鹏
Options

活动结束时间30天后删除活动code对应的所有key； 

活动全量pvuv统计bug修复
1 parent 2a47b6b5
Inline Side-by-side
Showing 1 changed file with 14 additions and 10 deletions
...@@ -67,8 +67,8 @@ public class PvUvCalculateTask { ...@@ -67,8 +67,8 @@ public class PvUvCalculateTask {
67 log.info("活动结束时间-->>{}",endTime); 67 log.info("活动结束时间-->>{}",endTime);
68 // 活动结束删除所有的对应的key 68 // 活动结束删除所有的对应的key
69 if (endTime.compareTo(LocalDateTime.now()) <= 0) { 69 if (endTime.compareTo(LocalDateTime.now()) <= 0) {
70 log.info("活动结束，活动结束时间两天后删除活动code对应的所有key"); 70 log.info("活动结束，活动结束时间30天后删除活动code对应的所有key");
71 if (endTime.plusDays(2).compareTo(LocalDateTime.now()) <= 0) { 71 if (endTime.plusDays(30).compareTo(LocalDateTime.now()) <= 0) {
72 72
73 Set<Object> keys = this.redisUtils.keys("*|"+code+"*"); 73 Set<Object> keys = this.redisUtils.keys("*|"+code+"*");
74 if (CollectionUtils.isNotEmpty(keys)) { 74 if (CollectionUtils.isNotEmpty(keys)) {
...@@ -102,9 +102,11 @@ public class PvUvCalculateTask { ...@@ -102,9 +102,11 @@ public class PvUvCalculateTask {
102 pvUvHour.setHour(LocalDateTime.now().getHour()); 102 pvUvHour.setHour(LocalDateTime.now().getHour());
103 pvUvHour.setPv(hourPv); 103 pvUvHour.setPv(hourPv);
104 pvUvHour.setUv(hourUv); 104 pvUvHour.setUv(hourUv);
105 log.info("PvUvHour不存在，创建PvUvHour: {}", pvUvHour);
105 this.pvUvHourService.create(pvUvHour); 106 this.pvUvHourService.create(pvUvHour);
106 107
107 } else { 108 }
109 else {
108 110
109 Integer hourPv = this.getHourPV(code); 111 Integer hourPv = this.getHourPV(code);
110 Integer hourUv = this.getHourUV(code); 112 Integer hourUv = this.getHourUV(code);
...@@ -128,8 +130,8 @@ public class PvUvCalculateTask { ...@@ -128,8 +130,8 @@ public class PvUvCalculateTask {
128 130
129 // day pv、uv值 131 // day pv、uv值
130 PvUvDay pvUvDay1 = this.pvUvDayService.findByMarketingActivityIdAndDay(Long.parseLong(id), LocalDate.now().toString()); 132 PvUvDay pvUvDay1 = this.pvUvDayService.findByMarketingActivityIdAndDay(Long.parseLong(id), LocalDate.now().toString());
131 if(Objects.isNull(pvUvDay1.getId())){
132 133
134 if(Objects.isNull(pvUvDay1.getId())){
133 PvUvDay pvUvDay = new PvUvDay(); 135 PvUvDay pvUvDay = new PvUvDay();
134 pvUvDay.setMarketingActivityId(Long.parseLong(id)); 136 pvUvDay.setMarketingActivityId(Long.parseLong(id));
135 pvUvDay.setMarketingActivityCode(code); 137 pvUvDay.setMarketingActivityCode(code);
...@@ -141,9 +143,10 @@ public class PvUvCalculateTask { ...@@ -141,9 +143,10 @@ public class PvUvCalculateTask {
141 log.info("dayUv ==>> {}", dayUv); 143 log.info("dayUv ==>> {}", dayUv);
142 pvUvDay.setPv(dayPv); 144 pvUvDay.setPv(dayPv);
143 pvUvDay.setUv(dayUv); 145 pvUvDay.setUv(dayUv);
146 log.info("PvUvDay不存在，创建PvUvDay: {}", pvUvDay);
144 this.pvUvDayService.create(pvUvDay); 147 this.pvUvDayService.create(pvUvDay);
145 148 }
146 } else { 149 else {
147 150
148 Integer dayPv = this.getDayPV(code); 151 Integer dayPv = this.getDayPV(code);
149 Integer dayUv = this.getDayUV(code); 152 Integer dayUv = this.getDayUV(code);
...@@ -177,10 +180,11 @@ public class PvUvCalculateTask { ...@@ -177,10 +180,11 @@ public class PvUvCalculateTask {
177 log.info("allUv ==>> {}", allUv); 180 log.info("allUv ==>> {}", allUv);
178 pvUv.setPv(allPV); 181 pvUv.setPv(allPV);
179 pvUv.setUv(allUv); 182 pvUv.setUv(allUv);
180 183 log.info("PvUv不存在，创建PvUvALL: {}", pvUv);
181 this.pvUvService.create(pvUv); 184 this.pvUvService.create(pvUv);
182 185
183 } else { 186 }
187 else {
184 188
185 Integer allPV = this.getAllPV(code); 189 Integer allPV = this.getAllPV(code);
186 Integer allUv = this.getAllUV(code); 190 Integer allUv = this.getAllUV(code);
...@@ -188,11 +192,11 @@ public class PvUvCalculateTask { ...@@ -188,11 +192,11 @@ public class PvUvCalculateTask {
188 log.info("allUv ==>> {}", allUv); 192 log.info("allUv ==>> {}", allUv);
189 193
190 if (pvUv1.getPv() >= allPV) { 194 if (pvUv1.getPv() >= allPV) {
191 allPV = pvUvDay1.getPv(); 195 allPV = pvUv1.getPv();
192 } 196 }
193 197
194 if (pvUv1.getUv() >= allUv) { 198 if (pvUv1.getUv() >= allUv) {
195 allUv = pvUvDay1.getUv(); 199 allUv = pvUv1.getUv();
196 } 200 }
197 201
198 pvUv1.setPv(allPV); 202 pvUv1.setPv(allPV);
......