Merge branch 'dev-8.9.0' into 'master'

🎨 更改时间请求格式

See merge request !23

src/main/java/com/afanticar/afantiopenapi/controller/FawOpenController.java

 package com.afanticar.afantiopenapi.controller;
 
+import cn.hutool.core.date.DateException;
+import cn.hutool.core.date.DateUtil;
 import com.afanticar.afantiopenapi.model.BaseResponse;
 import com.afanticar.afantiopenapi.model.vo.BasePageVO;
 import com.afanticar.afantiopenapi.model.vo.HongqiAwemeIncentiveVO;
@@ -13,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -53,10 +55,12 @@ public class FawOpenController extends BaseController {
 
     static String dataType = "faw";
 
+    static String monthly = "monthly", quarter = "quarter";
+
     @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,10 +68,18 @@ 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 = "type") String type) {
+                                                                         @NotNull(message = "publish_date_start不能为空") @RequestParam(name = "publish_date_start", required = false) String publishDateStartStr,
+                                                                         @NotNull(message = "publish_date_end不能为空") @RequestParam(name = "publish_date_end", required = false) String publishDateEndStr,
+                                                                         @NotNull(message = "type不能为空") @RequestParam(name = "type", required = false) String type) {
+        Date publishDateEnd = parseDate(publishDateEndStr), publishDateStart = parseDate(publishDateStartStr);
+        if (publishDateEnd == null || publishDateStart == null) {
+            return error("90001", "publish_date_end或publish_date_start时间格式不合法");
+        }
         log.info("AAAAAAAAA:" + limit);
+        publishDateEnd = endTime(publishDateEnd);
+        if (!type.equals(quarter) && !type.equals(monthly)) {
+            return error("90001", "type传参异常，未开放数据类型");
+        }
         BaseResponse check = baseService.baseValidator(request,client, dataType,  limit, limitPeriod);
         if (check != null) {
             return check;
@@ -86,9 +98,17 @@ 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 = "type") String type) {
+                                                                       @NotNull(message = "publish_date_start不能为空") @RequestParam(name = "publish_date_start", required = false) String publishDateStartStr,
+                                                                       @NotNull(message = "publish_date_end不能为空") @RequestParam(name = "publish_date_end", required = false) String publishDateEndStr,
+                                                                       @NotNull(message = "type不能为空") @RequestParam(name = "type", required = false) String type) {
+        Date publishDateEnd = parseDate(publishDateEndStr), publishDateStart = parseDate(publishDateStartStr);
+        if (publishDateEnd == null || publishDateStart == null) {
+            return error("90001", "publish_date_end或者publish_date_start时间格式不合法");
+        }
+        publishDateEnd = endTime(publishDateEnd);
+        if (!type.equals(quarter) && !type.equals(monthly)) {
+            return error("90001", "type传参异常，未开放数据类型！");
+        }
         BaseResponse check = baseService.baseValidator(request, client, dataType, limit, limitPeriod);
         if (check != null) {
             return check;
@@ -96,4 +116,17 @@ public class FawOpenController extends BaseController {
         return success(fawOpenService.lives(publishDateStart, publishDateEnd, type, pageNum, pageSize));
     }
 
+    private static Date parseDate(String publishDateStr) {
+        Date publishDate = null;
+        try {
+            publishDate = DateUtil.parse(publishDateStr, "yyyy-MM-dd");
+        } catch (DateException ignore) {
+        }
+        return publishDate;
+    }
+
+    private Date endTime(Date endDate) {
+        return DateUtil.endOfDay(endDate);
+    }
+
 }