From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 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 f09b579..7c5c656 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
@@ -1,16 +1,19 @@
package com.panzhihua.common.model.dtos.grid;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
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,13 +22,14 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("事件请求参数")
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;
@@ -34,16 +38,16 @@
@NotNull(message = "发生时间不能为空")
private Date happenTime;
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
@NotNull(message = "发生的精度纬度信息不能为空")
private String happentLatLng;
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
private String happentAddress;
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
private String happenAddress;
@@ -52,28 +56,29 @@
@NotNull(message = "发生区域-网格ID不能为空")
private Long gridId;
-
- @Length(max=500, message = "事件描述长度不能超过500")
+ @Length(max = 500, message = "事件描述长度不能超过500")
@ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
@NotNull(message = "事件描述不能为空")
private String eventDes;
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
@NotNull(message = "事件类型不能为空")
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;
@@ -86,20 +91,22 @@
@NotNull(message = "是否重大不能为空")
private Boolean major;
- @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ @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")
+ @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")
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
@@ -110,4 +117,7 @@
@Length(max = 11)
private String phone;
+ @ApiModelProperty(value = "上报人口id列表,当事件类型为特殊人群上报时此字段不为空", hidden = false)
+ private List<Long> populationIds;
+
}
--
Gitblit v1.7.1