From f495b3389331dac4f5c66a9383a8a0c7ff82e37d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 28 五月 2021 18:14:15 +0800
Subject: [PATCH] none

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
similarity index 74%
copy from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
copy to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
index 831a625..6da1191 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
@@ -8,6 +8,7 @@
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import java.util.Date;
 
 
@@ -20,21 +21,22 @@
  * @date 2021-05-26
  * */
 @Data
-@ApiModel("突发事件编辑请求参数")
-public class EmergenciesEventEditDTO {
+@ApiModel("事件请求参数")
+public class CommonEventAddDTO {
 
-    @Max(9223372036854775807L)
-    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
-    private Long id;
+    @Max(127)
+    @ApiModelProperty(value = "事件分类:1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
+    @NotNull(message = "事件分类不能为空")
+    private Integer eventType;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
-    @NotNull
+    @NotNull(message = "发生时间不能为空")
     private Date happenTime;
 
     @Length(max=255)
     @ApiModelProperty(value = "发生的精度纬度信息(逗号隔开)", hidden = false, example = "41.40338,2.17403", required = true)
-    @NotNull
+    @NotNull(message = "发生的精度纬度信息不能为空")
     private String happentLatLng;
 
     @Length(max=255)
@@ -44,40 +46,40 @@
     //位置备注
     @Max(9223372036854775807L)
     @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
-    @NotNull
+    @NotNull(message = "发生区域-网格ID不能为空")
     private Long gridId;
 
     @Length(max=255)
     @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
-    @NotNull
+    @NotNull(message = "事件描述不能为空")
     private String eventDes;
 
     @Length(max=255)
     @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
-    @NotNull
+    @NotNull(message = "事件类型不能为空")
     private String eventClazz;
 
     @Max(127)
-    @ApiModelProperty(value = "危险级别", hidden = false, example = "1", required = true)
-    @NotNull
+    @ApiModelProperty(value = "危险级别:1(特别重大)、2(重大)、3(较大)、4(一般)", hidden = false, example = "1", required = true)
+    @NotNull(message = "危险级别不能为空")
     private Integer dangerLevel;
 
     @Max(9999999999L)
     @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
-    @NotNull
+    @NotNull(message = "死亡人数不能为空")
     private Integer deathsNumber;
 
     @Max(9999999999L)
     @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
-    @NotNull
+    @NotNull(message = "受伤人数不能为空")
     private Integer injuriesNumber;
 
     @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
-    @NotNull
+    @NotNull(message = "是否紧急不能为空")
     private Boolean urgent;
 
     @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
-    @NotNull
+    @NotNull(message = "是否重大不能为空")
     private Boolean major;
 
     @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")

--
Gitblit v1.7.1