Skip to content

A
afanti-open-api
Commit 6e0508f9 authored by 陈炎's avatar 陈炎
Browse files
Options

Merge branch 'dev-8.9.0' into 'uat' 

Dev 8.9.0

See merge request !24
parents d0f0d3a4 bdc4eab3
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
Dockerfile
View file @ 6e0508f9
FROM registry-vpc.cn-hangzhou.aliyuncs.com/afanticar/base:ppjava8
VOLUME /tmp
ENV PROJECT="afanti-open-api"
......
src/main/java/com/afanticar/afantiopenapi/controller/FawOpenController.java
View file @ 6e0508f9
......@@ -55,8 +55,8 @@ public class FawOpenController extends BaseController {
@ApiOperation(value = "视频数据信息", notes = "视频数据", produces = "application/json")
@ApiImplicitParams({
@ApiImplicitParam(name = "publish_date_start", value = "开始时间，格式：2023-02-01", required = true, paramType = "path", dataType = "Date"),
@ApiImplicitParam(name = "publish_date_end", value = "结束时间，格式：2023-03-01", required = true, paramType = "path", dataType = "Date"),
@ApiImplicitParam(name = "publish_date_start", value = "开始时间，格式：2023-02-01 00:00:00", required = true, paramType = "path", dataType = "Date"),
@ApiImplicitParam(name = "publish_date_end", value = "结束时间，格式：2023-03-01 00:00:00", required = true, paramType = "path", dataType = "Date"),
@ApiImplicitParam(name = "type", value = "数据类型，monthly-月度表，quarter-季度表", required = true, paramType = "path", dataType = "String"),
@ApiImplicitParam(name = "current_page", value = "页码", paramType = "path", dataType = "Integer"),
@ApiImplicitParam(name = "page_size", value = "页数", paramType = "path", dataType = "Integer"),
......@@ -64,8 +64,8 @@ public class FawOpenController extends BaseController {
@GetMapping("/aweme")
public BaseResponse<BasePageVO<HongqiAwemeIncentiveVO>> getAwemeData(HttpServletRequest request, @Max(value = 500,message = "单页数据page_size过大") @RequestParam(name = "page_size", defaultValue = "100", required = false) Integer pageSize,
@RequestParam(name = "current_page", defaultValue = "1", required = false) Integer pageNum,
@RequestParam(name = "publish_date_start") @DateTimeFormat(pattern = "yyyy-MM-dd") Date publishDateStart,
@RequestParam(name = "publish_date_end") @DateTimeFormat(pattern = "yyyy-MM-dd") Date publishDateEnd,
@RequestParam(name = "publish_date_start") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date publishDateStart,
@RequestParam(name = "publish_date_end") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date publishDateEnd,
@RequestParam(name = "type") String type) {
log.info("AAAAAAAAA:" + limit);
BaseResponse check = baseService.baseValidator(request,client, dataType, limit, limitPeriod);
......@@ -86,8 +86,8 @@ public class FawOpenController extends BaseController {
@GetMapping("/live")
public BaseResponse<BasePageVO<HongqiLiveIncentiveVO>> getLiveData(HttpServletRequest request, @Max(value = 500,message = "单页数据page_size过大") @RequestParam(name = "page_size", defaultValue = "100", required = false) Integer pageSize,
@RequestParam(name = "current_page", defaultValue = "1", required = false) Integer pageNum,
@RequestParam(name = "publish_date_start") @DateTimeFormat(pattern = "yyyy-MM-dd") Date publishDateStart,
@RequestParam(name = "publish_date_end") @DateTimeFormat(pattern = "yyyy-MM-dd") Date publishDateEnd,
@RequestParam(name = "publish_date_start") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date publishDateStart,
@RequestParam(name = "publish_date_end") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date publishDateEnd,
@RequestParam(name = "type") String type) {
BaseResponse check = baseService.baseValidator(request, client, dataType, limit, limitPeriod);
if (check != 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