Commit be3e59b0 authored by 许润龙's avatar 许润龙

修改:活动视频、直播数据详情数据接口

parent 5684616e
...@@ -145,7 +145,7 @@ public class FawOpenController extends BaseController { ...@@ -145,7 +145,7 @@ public class FawOpenController extends BaseController {
@ApiOperation(value = "抖音活动视频数据信息", notes = "抖音活动视频数据", produces = "application/json") @ApiOperation(value = "抖音活动视频数据信息", notes = "抖音活动视频数据", produces = "application/json")
@PostMapping("/activity/douyin/aweme/list") @PostMapping("/activity/douyin/aweme/list")
public BaseResponse<BasePageVO<HongqiActivityAwemeVO>> getDouyinActivityAwemeData(@RequestBody @Validated FawActivityDTO dto) { public BaseResponse<BasePageVO<HongqiActivityAwemeVO>> getDouyinActivityAwemeData(@RequestBody @Validated FawActivityDTO dto) {
BaseResponse check = baseService.baseLimit(dataType, limit, limitPeriod); BaseResponse check = baseService.pageApiLimit(dataType, limit, limitPeriod);
if (check != null) { if (check != null) {
return check; return check;
} }
...@@ -159,7 +159,7 @@ public class FawOpenController extends BaseController { ...@@ -159,7 +159,7 @@ public class FawOpenController extends BaseController {
@ApiOperation(value = "抖音活动直播数据信息", notes = "抖音活动直播数据", produces = "application/json") @ApiOperation(value = "抖音活动直播数据信息", notes = "抖音活动直播数据", produces = "application/json")
@PostMapping("/activity/douyin/live/list") @PostMapping("/activity/douyin/live/list")
public BaseResponse<BasePageVO<HongqiActivityLiveVO>> getDouyinActivityLiveData(@RequestBody @Validated FawActivityDTO dto) { public BaseResponse<BasePageVO<HongqiActivityLiveVO>> getDouyinActivityLiveData(@RequestBody @Validated FawActivityDTO dto) {
BaseResponse check = baseService.baseLimit(dataType, limit, limitPeriod); BaseResponse check = baseService.pageApiLimit(dataType, limit, limitPeriod);
if (check != null) { if (check != null) {
return check; return check;
} }
...@@ -173,7 +173,7 @@ public class FawOpenController extends BaseController { ...@@ -173,7 +173,7 @@ public class FawOpenController extends BaseController {
@ApiOperation(value = "快手活动视频数据信息", notes = "快手活动视频数据", produces = "application/json") @ApiOperation(value = "快手活动视频数据信息", notes = "快手活动视频数据", produces = "application/json")
@PostMapping("/activity/kuaishou/aweme/list") @PostMapping("/activity/kuaishou/aweme/list")
public BaseResponse<BasePageVO<HongqiActivityAwemeVO>> getKuaishouActivityAwemeData(@RequestBody @Validated FawActivityDTO dto) { public BaseResponse<BasePageVO<HongqiActivityAwemeVO>> getKuaishouActivityAwemeData(@RequestBody @Validated FawActivityDTO dto) {
BaseResponse check = baseService.baseLimit(dataType, limit, limitPeriod); BaseResponse check = baseService.pageApiLimit(dataType, limit, limitPeriod);
if (check != null) { if (check != null) {
return check; return check;
} }
...@@ -187,7 +187,7 @@ public class FawOpenController extends BaseController { ...@@ -187,7 +187,7 @@ public class FawOpenController extends BaseController {
@ApiOperation(value = "快手活动直播数据信息", notes = "快手活动直播数据", produces = "application/json") @ApiOperation(value = "快手活动直播数据信息", notes = "快手活动直播数据", produces = "application/json")
@PostMapping("/activity/kuaishou/live/list") @PostMapping("/activity/kuaishou/live/list")
public BaseResponse<BasePageVO<HongqiActivityLiveVO>> getKuaishouActivityLiveData(@RequestBody @Validated FawActivityDTO dto) { public BaseResponse<BasePageVO<HongqiActivityLiveVO>> getKuaishouActivityLiveData(@RequestBody @Validated FawActivityDTO dto) {
BaseResponse check = baseService.baseLimit(dataType, limit, limitPeriod); BaseResponse check = baseService.pageApiLimit(dataType, limit, limitPeriod);
if (check != null) { if (check != null) {
return check; return check;
} }
......
...@@ -42,11 +42,26 @@ public class BaseService { ...@@ -42,11 +42,26 @@ public class BaseService {
String header = "token"; String header = "token";
String fawKey = String.format("%s:%s:limit", dataType, header); String fawKey = String.format("%s:%s:limit", dataType, header);
RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey); RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey);
rateLimiter.trySetRate(RateType.OVERALL, limit,limitPeriod, RateIntervalUnit.SECONDS); rateLimiter.trySetRate(RateType.OVERALL, limit, limitPeriod, RateIntervalUnit.SECONDS);
if (!rateLimiter.tryAcquire(1, waiting, TimeUnit.MILLISECONDS)) { if (!rateLimiter.tryAcquire(1, waiting, TimeUnit.MILLISECONDS)) {
return BaseController.error("10010", "您的请求太过频繁,请稍后再试!"); return BaseController.error("10010", "您的请求太过频繁,请稍后再试!");
} }
return null; return null;
} }
public BaseResponse pageApiLimit(String dataType, Integer limit, Integer limitPeriod) {
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// String header = "token";
// String fawKey = String.format("%s:%s:limit", dataType, header);
// RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey);
// rateLimiter.trySetRate(RateType.OVERALL, limit, limitPeriod, RateIntervalUnit.SECONDS);
// if (!rateLimiter.tryAcquire(1, waiting, TimeUnit.MILLISECONDS)) {
// return BaseController.error("10010", "您的请求太过频繁,请稍后再试!");
// }
return null;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment