Merge branch 'feat/reportData' into 'master'

feat: 完善时间校验的规则

See merge request !73

src/main/java/com/afanticar/afantiopenapi/config/GlobalExceptionHandler.java

@@ -3,9 +3,12 @@ package com.afanticar.afantiopenapi.config;
 import com.afanticar.afantiopenapi.constant.ExceptionEnum;
 import com.afanticar.afantiopenapi.controller.BaseController;
 import com.afanticar.afantiopenapi.model.BaseResponse;
+import com.afanticar.common.core.api.ResultCodeEnum;
+import com.afanticar.common.core.exception.ApiException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -32,6 +35,18 @@ public class GlobalExceptionHandler {
         return handleError(ExceptionEnum.ERROR, e);
     }
 
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public BaseResponse processHttpMessageNotReadableException(HttpMessageNotReadableException e) {
+        LOGGER.error("HttpMessageNotReadableException 调用异常 => :{}", ExceptionUtils.getStackTrace(e));
+        return BaseController.error(ResultCodeEnum.VALIDATE_FAILED.getCode().toString(), e.getMessage());
+    }
+
+    @ExceptionHandler(ApiException.class)
+    public BaseResponse processApiException(ApiException e) {
+        LOGGER.error("api 调用异常 => :{}", ExceptionUtils.getStackTrace(e));
+        return BaseController.error(e.getCode().toString(), e.getMessage());
+    }
+
     private BaseResponse<Object> handleError(int code, String message, Exception ex) {
         return BaseController.error(code + "", message);
     }

src/main/java/com/afanticar/afantiopenapi/model/dto/DataReportRequestDTO.java

@@ -6,8 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -20,12 +20,10 @@ import java.util.List;
 public class DataReportRequestDTO {
 
     @ApiModelProperty("开始时间。格式为：yyyy-MM-dd。例如2024-01-01")
-    @NotBlank(message = "开始时间不可为空")
-    private String startTime;
+    private LocalDate startTime;
 
     @ApiModelProperty("结束时间。格式为：yyyy-MM-dd。例如2024-01-01")
-    @NotBlank(message = "结束时间不可为空")
-    private String endTime;
+    private LocalDate endTime;
     
     @ApiModelProperty("平台类型 public-公共数据 douyin-抖音 kuaishou-快手xiaohongshu-小红书 shipinhao-视频号")
     @NotEmpty(message = "平台类型不可为空，可选类型 public-公共数据 douyin-抖音 kuaishou-快手xiaohongshu-小红书 shipinhao-视频号 ")