Commit cc15ba006295f3f40b5a59c7650a4a371934212d

Authored by 王富生
1 parent fc7a82c0

优化时间查询问题

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java
@@ -55,7 +55,7 @@ public class RoadSaveReqVO { @@ -55,7 +55,7 @@ public class RoadSaveReqVO {
55 55
56 @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED) 56 @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED)
57 @NotEmpty(message = "行道树(棵)面积不能为空") 57 @NotEmpty(message = "行道树(棵)面积不能为空")
58 - @Size(min=2, max = 50) 58 + @Size(min=1, max = 50, message = "行道树(棵)面积长度1-50")
59 private String treeArea; 59 private String treeArea;
60 60
61 @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED) 61 @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED)
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadUpdateReqVO.java
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.road.vo; @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.road.vo;
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import jakarta.validation.constraints.NotEmpty; 4 import jakarta.validation.constraints.NotEmpty;
5 import jakarta.validation.constraints.NotNull; 5 import jakarta.validation.constraints.NotNull;
  6 +import jakarta.validation.constraints.Size;
6 import lombok.Data; 7 import lombok.Data;
7 8
8 @Schema(description = "管理后台 - 道路管理新增/修改 Request VO") 9 @Schema(description = "管理后台 - 道路管理新增/修改 Request VO")
@@ -15,6 +16,7 @@ public class RoadUpdateReqVO { @@ -15,6 +16,7 @@ public class RoadUpdateReqVO {
15 16
16 @Schema(description = "道路名称", example = "赵六") 17 @Schema(description = "道路名称", example = "赵六")
17 @NotEmpty(message = "道路名称不能为空") 18 @NotEmpty(message = "道路名称不能为空")
  19 + @Size(min=2, max = 128, message = "道路名称长度")
18 private String roadName; 20 private String roadName;
19 21
20 @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11139") 22 @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11139")
@@ -42,18 +44,22 @@ public class RoadUpdateReqVO { @@ -42,18 +44,22 @@ public class RoadUpdateReqVO {
42 44
43 @Schema(description = "行道树绿化面积", requiredMode = Schema.RequiredMode.REQUIRED) 45 @Schema(description = "行道树绿化面积", requiredMode = Schema.RequiredMode.REQUIRED)
44 @NotEmpty(message = "行道树绿化面积不能为空") 46 @NotEmpty(message = "行道树绿化面积不能为空")
  47 + @Size(min=1, max = 200000, message = "行道树绿化面积长度")
45 private String greenBeltTreeArea; 48 private String greenBeltTreeArea;
46 49
47 @Schema(description = "绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) 50 @Schema(description = "绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED)
48 @NotEmpty(message = "绿化带面积不能为空") 51 @NotEmpty(message = "绿化带面积不能为空")
  52 + @Size(min=1, max = 200000, message = "绿化带面积长度")
49 private String greenBeltArea; 53 private String greenBeltArea;
50 54
51 @Schema(description = "总绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) 55 @Schema(description = "总绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED)
52 @NotEmpty(message = "总绿化带面积不能为空") 56 @NotEmpty(message = "总绿化带面积不能为空")
  57 + @Size(min=1, max = 200000, message = "总绿化带面积长度")
53 private String totalArea; 58 private String totalArea;
54 59
55 @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED) 60 @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED)
56 @NotEmpty(message = "行道树(棵)面积不能为空") 61 @NotEmpty(message = "行道树(棵)面积不能为空")
  62 + @Size(min=1, max = 50, message = "行道树(棵)面积长度")
57 private String treeArea; 63 private String treeArea;
58 64
59 @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED) 65 @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -66,6 +72,7 @@ public class RoadUpdateReqVO { @@ -66,6 +72,7 @@ public class RoadUpdateReqVO {
66 72
67 @Schema(description = "起点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") 73 @Schema(description = "起点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
68 @NotEmpty(message = "起点描述不能为空") 74 @NotEmpty(message = "起点描述不能为空")
  75 + @Size(min=1, max = 64, message = "起点描述最大64")
69 private String startingRemark; 76 private String startingRemark;
70 77
71 @Schema(description = "终点经度", requiredMode = Schema.RequiredMode.REQUIRED) 78 @Schema(description = "终点经度", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -78,10 +85,12 @@ public class RoadUpdateReqVO { @@ -78,10 +85,12 @@ public class RoadUpdateReqVO {
78 85
79 @Schema(description = "终点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") 86 @Schema(description = "终点描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
80 @NotEmpty(message = "终点描述不能为空") 87 @NotEmpty(message = "终点描述不能为空")
  88 + @Size(min=1, max = 64, message = "起点经度长度最大64")
81 private String endRemark; 89 private String endRemark;
82 90
83 @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") 91 @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
84 @NotEmpty(message = "备注不能为空") 92 @NotEmpty(message = "备注不能为空")
  93 + @Size(max = 500, message = "备注不能为空")
85 private String remark; 94 private String remark;
86 95
87 @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323") 96 @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323")
@@ -93,11 +102,9 @@ public class RoadUpdateReqVO { @@ -93,11 +102,9 @@ public class RoadUpdateReqVO {
93 private Long deptId; 102 private Long deptId;
94 103
95 @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") 104 @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
96 - @NotEmpty(message = "创建者不能为空")  
97 private String creatorName; 105 private String creatorName;
98 106
99 @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") 107 @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
100 - @NotEmpty(message = "更新者不能为空")  
101 private String updaterName; 108 private String updaterName;
102 109
103 } 110 }
104 \ No newline at end of file 111 \ No newline at end of file