From cecf99b359caa946a27b71962ad64b8df4975e07 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 26 七月 2021 15:18:37 +0800
Subject: [PATCH] 防火防汛巡查记录分页查询
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
index 43a8d8a..c931bac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
@@ -7,9 +7,11 @@
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.Date;
+import java.util.List;
/**
@@ -25,7 +27,7 @@
public class CommonEventAddDTO {
@Max(127)
- @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报", hidden = false, example = "1", required = true)
@NotNull(message = "事件分类不能为空")
private Integer eventType;
@@ -47,13 +49,13 @@
@ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
private String happenAddress;
- //位置备注
@Max(9223372036854775807L)
@ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
@NotNull(message = "发生区域-网格ID不能为空")
private Long gridId;
- @Length(max=255)
+
+ @Length(max=500, message = "事件描述长度不能超过500")
@ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
@NotNull(message = "事件描述不能为空")
private String eventDes;
@@ -64,16 +66,18 @@
private String eventClazz;
@Max(127)
- @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
@NotNull(message = "危险级别不能为空")
private Integer dangerLevel;
@Max(9999999999L)
+ @Min(value = 0, message = "死亡人数不能为负数")
@ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
@NotNull(message = "死亡人数不能为空")
private Integer deathsNumber;
@Max(9999999999L)
+ @Min(value = 0, message = "受伤人数不能为负数")
@ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
@NotNull(message = "受伤人数不能为空")
private Integer injuriesNumber;
@@ -89,8 +93,14 @@
@ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
@@ -104,4 +114,7 @@
@Length(max = 11)
private String phone;
+ @ApiModelProperty(value = "上报人口id列表,当事件类型为特殊人群上报时此字段不为空", hidden = false)
+ private List<Long> populationIds;
+
}
--
Gitblit v1.7.1