From 7d16a1da2ab2bfdabf247af19b516a84a459bb32 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期一, 28 六月 2021 09:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
index 1811f32..ebb1278 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
@@ -21,8 +21,11 @@
* @date 2021-05-26
* */
@Data
-@ApiModel("特殊人气事件请求参数")
+@ApiModel("特殊人群事件请求参数")
public class SpecialEventEditDTO {
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
+ private Long id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
@@ -43,7 +46,7 @@
@NotNull(message = "发生区域-网格ID不能为空")
private Long gridId;
- @Length(max=255)
+ @Length(max=500)
@ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
@NotNull(message = "事件描述不能为空")
private String eventDes;
@@ -54,7 +57,7 @@
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;
@@ -77,15 +80,21 @@
private Boolean major;
@ApiModelProperty(value = "特殊人群", hidden = false, required = true)
- @NotNull(message = "特殊人群不能为空")
+ @NotNull(message = "特殊人员信息不能为空")
private List<SpecialPopulationDTO> specialPopulation;
@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")
private String pics;
--
Gitblit v1.7.1