From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java | 73 ++++++++++++++----------------------
1 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java
index 546a7c9..b11d026 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java
@@ -1,18 +1,20 @@
package com.panzhihua.common.model.dtos.grid;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 分页查询表单
@@ -21,7 +23,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("查询网格员定时上报地理信息请求参数")
public class PageEventGridMemberGpsLogDTO {
@@ -33,72 +35,55 @@
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")
- private String sortType="desc";
-
- public String getSortColumns(){
- String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
- return dbColumn;
- }
-
-
+ private String sortType = "desc";
@Max(9223372036854775807L)
@ApiModelProperty(value = "主键ID", hidden = false, example = "1")
private Long id;
-
-
- @NotNull() @Max(9223372036854775807L)
+ @NotNull()
+ @Max(9223372036854775807L)
@ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
private Long gridStreetId;
-
-
- @NotNull() @Max(9223372036854775807L)
+ @NotNull()
+ @Max(9223372036854775807L)
@ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
private Long gridCommunityId;
-
-
- @NotNull() @Max(9223372036854775807L)
+ @NotNull()
+ @Max(9223372036854775807L)
@ApiModelProperty(value = "网格ID", hidden = false, example = "1")
private Long gridId;
-
-
- @NotBlank() @Length(max=100)
+ @NotBlank()
+ @Length(max = 100)
@ApiModelProperty(value = "网格名称", hidden = false, example = "")
private String gridName;
-
-
- @NotNull() @Max(9223372036854775807L)
+ @NotNull()
+ @Max(9223372036854775807L)
@ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
private Long gridMemberId;
-
-
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
private String lngLat;
-
-
@Max(127)
@ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）", hidden = false, example = "1")
private Integer positionStation;
-
-
@Max(9223372036854775807L)
@ApiModelProperty(value = "创建人", hidden = false, example = "1")
private Long createBy;
-
-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
private Date createAtBegin;
@ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAtEnd;
-
-
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long userId;
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
}
--
Gitblit v1.7.1