Commit 2a47b6b5 2a47b6b5f21cfde481bfef408726c79c5a1e4fc4 by xianghan

init1

1 parent 7fbec8e7
...@@ -194,12 +194,18 @@ public class ActivityBtnClickPvUcCalculateTask { ...@@ -194,12 +194,18 @@ public class ActivityBtnClickPvUcCalculateTask {
194 log.info("hourPv ==>> {}", hourPv); 194 log.info("hourPv ==>> {}", hourPv);
195 log.info("hourUv ==>> {}", hourUv); 195 log.info("hourUv ==>> {}", hourUv);
196 196
197 if (hourPv != 0 && hourUv != 0) { 197 if (activityBtnPvUvHour_.getPv() >= hourPv) {
198 hourPv = activityBtnPvUvHour_.getPv();
199 }
200
201 if (activityBtnPvUvHour_.getUv() >= hourUv) {
202 hourUv = activityBtnPvUvHour_.getUv();
203 }
204
198 activityBtnPvUvHour_.setPv(hourPv); 205 activityBtnPvUvHour_.setPv(hourPv);
199 activityBtnPvUvHour_.setUv(hourUv); 206 activityBtnPvUvHour_.setUv(hourUv);
200 activityBtnPvUvHour_.setUpdateTime(TimestampUtil.now()); 207 activityBtnPvUvHour_.setUpdateTime(TimestampUtil.now());
201 this.activityBtnPvUvHourService.update(activityBtnPvUvHour_); 208 this.activityBtnPvUvHourService.update(activityBtnPvUvHour_);
202 }
203 209
204 } 210 }
205 211
...@@ -230,15 +236,21 @@ public class ActivityBtnClickPvUcCalculateTask { ...@@ -230,15 +236,21 @@ public class ActivityBtnClickPvUcCalculateTask {
230 Integer dayUv = this.getDayUV(marktingActivityCode, activityCode, paramValueId); 236 Integer dayUv = this.getDayUV(marktingActivityCode, activityCode, paramValueId);
231 log.info("dayPv ==>> {}", dayPv); 237 log.info("dayPv ==>> {}", dayPv);
232 log.info("dayUv ==>> {}", dayUv); 238 log.info("dayUv ==>> {}", dayUv);
233 if (dayPv != 0 && dayUv != 0) { 239
240 if (pvUvDay1.getPv() >= dayPv) {
241 dayPv = pvUvDay1.getPv();
242 }
243
244 if (pvUvDay1.getUv() >= dayUv) {
245 dayUv = pvUvDay1.getUv();
246 }
247
234 pvUvDay1.setPv(dayPv); 248 pvUvDay1.setPv(dayPv);
235 pvUvDay1.setUv(dayUv); 249 pvUvDay1.setUv(dayUv);
236 pvUvDay1.setUpdateTime(TimestampUtil.now()); 250 pvUvDay1.setUpdateTime(TimestampUtil.now());
237 this.activityBtnPvUvDayService.update(pvUvDay1); 251 this.activityBtnPvUvDayService.update(pvUvDay1);
238 } 252 }
239 253
240 }
241
242 // all 254 // all
243 ActTplParamClick pvUv1 = this.activityBtnPvUvService. 255 ActTplParamClick pvUv1 = this.activityBtnPvUvService.
244 findByMarketingActivityIdAndActivityIdAndTemplateParamValueId(marktingActivityId, 256 findByMarketingActivityIdAndActivityIdAndTemplateParamValueId(marktingActivityId,
...@@ -267,13 +279,19 @@ public class ActivityBtnClickPvUcCalculateTask { ...@@ -267,13 +279,19 @@ public class ActivityBtnClickPvUcCalculateTask {
267 log.info("allPV ==>> {}", allPV); 279 log.info("allPV ==>> {}", allPV);
268 log.info("allUv ==>> {}", allUv); 280 log.info("allUv ==>> {}", allUv);
269 281
270 if (allPV != 0 && allUv != 0) { 282 if (pvUv1.getPv() >= allPV) {
283 allPV = pvUv1.getPv();
284 }
285
286 if (pvUv1.getUv() >= allUv) {
287 allUv = pvUv1.getUv();
288 }
289
271 pvUv1.setPv(allPV); 290 pvUv1.setPv(allPV);
272 pvUv1.setUv(allUv); 291 pvUv1.setUv(allUv);
273 pvUv1.setUpdateTime(TimestampUtil.now()); 292 pvUv1.setUpdateTime(TimestampUtil.now());
274 this.activityBtnPvUvService.update(pvUv1); 293 this.activityBtnPvUvService.update(pvUv1);
275 } 294 }
276 }
277 295
278 } 296 }
279 297
......
...@@ -110,12 +110,19 @@ public class PvUvCalculateTask { ...@@ -110,12 +110,19 @@ public class PvUvCalculateTask {
110 Integer hourUv = this.getHourUV(code); 110 Integer hourUv = this.getHourUV(code);
111 log.info("hourPv ==>> {}", hourPv); 111 log.info("hourPv ==>> {}", hourPv);
112 log.info("hourUv ==>> {}", hourUv); 112 log.info("hourUv ==>> {}", hourUv);
113 if (hourPv != 0 && hourUv != 0) { 113
114 if (pvUvHour1.getPv() >= hourPv) {
115 hourPv = pvUvHour1.getPv();
116 }
117
118 if (pvUvHour1.getUv() >= hourUv) {
119 hourUv = pvUvHour1.getUv();
120 }
121
114 pvUvHour1.setPv(hourPv); 122 pvUvHour1.setPv(hourPv);
115 pvUvHour1.setUv(hourUv); 123 pvUvHour1.setUv(hourUv);
116 pvUvHour1.setUpdateTime(TimestampUtil.now()); 124 pvUvHour1.setUpdateTime(TimestampUtil.now());
117 this.pvUvHourService.updateByMarketingActivityCodeAndDayAndHour(pvUvHour1); 125 this.pvUvHourService.updateByMarketingActivityCodeAndDayAndHour(pvUvHour1);
118 }
119 126
120 } 127 }
121 128
...@@ -143,13 +150,19 @@ public class PvUvCalculateTask { ...@@ -143,13 +150,19 @@ public class PvUvCalculateTask {
143 log.info("dayPv ==>> {}", dayPv); 150 log.info("dayPv ==>> {}", dayPv);
144 log.info("dayUv ==>> {}", dayUv); 151 log.info("dayUv ==>> {}", dayUv);
145 152
146 if (dayPv != 0 && dayUv != 0) { 153 if (pvUvDay1.getPv() >= dayPv) {
154 dayPv = pvUvDay1.getPv();
155 }
156
157 if (pvUvDay1.getUv() >= dayUv) {
158 dayUv = pvUvDay1.getUv();
159 }
160
147 pvUvDay1.setPv(dayPv); 161 pvUvDay1.setPv(dayPv);
148 pvUvDay1.setUv(dayUv); 162 pvUvDay1.setUv(dayUv);
149 pvUvDay1.setUpdateTime(TimestampUtil.now()); 163 pvUvDay1.setUpdateTime(TimestampUtil.now());
150 this.pvUvDayService.update(pvUvDay1); 164 this.pvUvDayService.update(pvUvDay1);
151 } 165 }
152 }
153 166
154 // all 167 // all
155 PvUv pvUv1 = this.pvUvService.findByMarketingActivityId(Long.parseLong(id)); 168 PvUv pvUv1 = this.pvUvService.findByMarketingActivityId(Long.parseLong(id));
...@@ -174,14 +187,20 @@ public class PvUvCalculateTask { ...@@ -174,14 +187,20 @@ public class PvUvCalculateTask {
174 log.info("allPV ==>> {}", allPV); 187 log.info("allPV ==>> {}", allPV);
175 log.info("allUv ==>> {}", allUv); 188 log.info("allUv ==>> {}", allUv);
176 189
177 if (allPV != 0 && allUv != 0) { 190 if (pvUv1.getPv() >= allPV) {
191 allPV = pvUvDay1.getPv();
192 }
193
194 if (pvUv1.getUv() >= allUv) {
195 allUv = pvUvDay1.getUv();
196 }
197
178 pvUv1.setPv(allPV); 198 pvUv1.setPv(allPV);
179 pvUv1.setUv(allUv); 199 pvUv1.setUv(allUv);
180 pvUv1.setUpdateTime(TimestampUtil.now()); 200 pvUv1.setUpdateTime(TimestampUtil.now());
181 this.pvUvService.update(pvUv1); 201 this.pvUvService.update(pvUv1);
182 } 202 }
183 } 203 }
184 }
185 204
186 } 205 }
187 206
......
...@@ -288,14 +288,22 @@ public class SubscribeCalculateTask { ...@@ -288,14 +288,22 @@ public class SubscribeCalculateTask {
288 Long hourBtnClickUV = this.getHourBtnClickUV(code, packageId); 288 Long hourBtnClickUV = this.getHourBtnClickUV(code, packageId);
289 log.info("subscribe ==>> hourBtnClickUV ==>> {}", hourBtnClickUV); 289 log.info("subscribe ==>> hourBtnClickUV ==>> {}", hourBtnClickUV);
290 290
291 if (hourBtnClickPV != 0 && hourBtnClickUV != 0) { 291
292 if (subscribePvUvHour.getBtnClickPv() >= hourBtnClickPV) {
293 hourBtnClickPV = subscribePvUvHour.getBtnClickPv();
294 }
295
296 if (subscribePvUvHour.getBtnClickUv() >= hourBtnClickUV) {
297 hourBtnClickUV = subscribePvUvHour.getBtnClickUv();
298 }
299
292 subscribePvUvHour.setBtnClickUv(hourBtnClickUV); 300 subscribePvUvHour.setBtnClickUv(hourBtnClickUV);
293 subscribePvUvHour.setBtnClickPv(hourBtnClickPV); 301 subscribePvUvHour.setBtnClickPv(hourBtnClickPV);
294 subscribePvUvHour.setSubscribeNum(hourSubscribeNum); 302 subscribePvUvHour.setSubscribeNum(hourSubscribeNum);
295 subscribePvUvHour.setUpdateTime(TimestampUtil.now()); 303 subscribePvUvHour.setUpdateTime(TimestampUtil.now());
296 log.info("subscribe ==>> subscribePvUvHour ==>> {}", subscribePvUvHour); 304 log.info("subscribe ==>> subscribePvUvHour ==>> {}", subscribePvUvHour);
297 this.subscribePvUvHourService.update(subscribePvUvHour); 305 this.subscribePvUvHourService.update(subscribePvUvHour);
298 } 306
299 307
300 } 308 }
301 309
...@@ -340,14 +348,21 @@ public class SubscribeCalculateTask { ...@@ -340,14 +348,21 @@ public class SubscribeCalculateTask {
340 Long dayBtnClickUV = this.getDayBtnClickUV(code, packageId); 348 Long dayBtnClickUV = this.getDayBtnClickUV(code, packageId);
341 log.info("subscribe ==>> dayBtnClickUV ==>> {}", dayBtnClickUV); 349 log.info("subscribe ==>> dayBtnClickUV ==>> {}", dayBtnClickUV);
342 350
343 if (dayBtnClickUV != 0 && dayBtnClickPV != 0) { 351 if (subscribePvUvDay.getBtnClickPv() >= dayBtnClickPV) {
352 dayBtnClickPV = subscribePvUvDay.getBtnClickPv();
353 }
354
355 if (subscribePvUvDay.getBtnClickUv() >= dayBtnClickUV) {
356 dayBtnClickUV = subscribePvUvDay.getBtnClickUv();
357 }
358
344 subscribePvUvDay.setSubscribeNum(daySubscribeNum); 359 subscribePvUvDay.setSubscribeNum(daySubscribeNum);
345 subscribePvUvDay.setBtnClickUv(dayBtnClickUV); 360 subscribePvUvDay.setBtnClickUv(dayBtnClickUV);
346 subscribePvUvDay.setBtnClickPv(dayBtnClickPV); 361 subscribePvUvDay.setBtnClickPv(dayBtnClickPV);
347 subscribePvUvDay.setUpdateTime(TimestampUtil.now()); 362 subscribePvUvDay.setUpdateTime(TimestampUtil.now());
348 log.info("subscribe ==>> subscribePvUvDay ==>> {}", subscribePvUvDay); 363 log.info("subscribe ==>> subscribePvUvDay ==>> {}", subscribePvUvDay);
349 this.subscribePvUvDayService.update(subscribePvUvDay); 364 this.subscribePvUvDayService.update(subscribePvUvDay);
350 } 365
351 366
352 } 367 }
353 368
...@@ -389,14 +404,21 @@ public class SubscribeCalculateTask { ...@@ -389,14 +404,21 @@ public class SubscribeCalculateTask {
389 Long allBtnClickUV = this.getAllBtnClickUV(code, packageId); 404 Long allBtnClickUV = this.getAllBtnClickUV(code, packageId);
390 log.info("subscribe ==>> allBtnClickUV ==>> {}", allBtnClickUV); 405 log.info("subscribe ==>> allBtnClickUV ==>> {}", allBtnClickUV);
391 406
392 if (allBtnClickUV != 0 && allBtnClickPV != 0) { 407
408 if (subscribePvUv.getBtnClickPv() >= allBtnClickPV) {
409 allBtnClickPV = subscribePvUv.getBtnClickPv();
410 }
411
412 if (subscribePvUv.getBtnClickUv() >= allBtnClickUV) {
413 allBtnClickUV = subscribePvUv.getBtnClickUv();
414 }
415
393 subscribePvUv.setBtnClickUv(allBtnClickUV); 416 subscribePvUv.setBtnClickUv(allBtnClickUV);
394 subscribePvUv.setSubscribeNum(allSubscribeNum); 417 subscribePvUv.setSubscribeNum(allSubscribeNum);
395 subscribePvUv.setBtnClickPv(allBtnClickPV); 418 subscribePvUv.setBtnClickPv(allBtnClickPV);
396 subscribePvUv.setUpdateTime(TimestampUtil.now()); 419 subscribePvUv.setUpdateTime(TimestampUtil.now());
397 log.info("subscribe ==>> subscribePvUv ==>> {}", subscribePvUv); 420 log.info("subscribe ==>> subscribePvUv ==>> {}", subscribePvUv);
398 this.subscribePvUvService.update(subscribePvUv); 421 this.subscribePvUvService.update(subscribePvUv);
399 }
400 422
401 } 423 }
402 424
......