From b8c8df1c425dcf2ff7a677647d3039073bde17f4 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 13:36:18 +0800
Subject: [PATCH] Merge branch 'master' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java
index f5b553b..a2a8e1f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java
@@ -1,16 +1,15 @@
package com.panzhihua.common.model.dtos.grid;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
import com.google.common.base.CaseFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.util.Date;
/**
* 分页查询表单
@@ -19,7 +18,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("查询事件请求参数")
public class PageEventGridNearbyDTO {
@@ -31,26 +30,24 @@
private Long pageSize = 10L;
@ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
- private String sortAttr="createAt";
+ private String sortAttr = "createAt";
@ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
@Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
- private String sortType="desc";
+ private String sortType = "desc";
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开'经度,维度'）", hidden = false, example = "104.060748,30.65769",
+ required = true)
+ @NotNull
+ private String happentLatLng;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userName;
- public String getSortColumns(){
+ public String getSortColumns() {
String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
return dbColumn;
}
-
- @Length(max=255)
- @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "", required = true)
- @NotNull
- private String happentLatLng;
-
- @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
- private Long userId;
-
- @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
- private Long userName;
}
--
Gitblit v1.7.1